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