Fix spurious newlines being emitted, breaking published values.
Also, remove unneeded whitespace trimming on "else" statement.