Fix serialization of whens with empty blocks (#2560) (#2561)

Also get rid of whitespace-only lines that were emitted after every when
block.

(cherry picked from commit 79c17c84

)

Co-authored-by: Jack Koenig <koenig@sifive.com>