Convert unless-else to if-else.
Strip trailing whitespace in 2 files.