Whitespace cleanup

Removes trailing whitespace on blank lines that would make future
merges confusing.