Cleaned up a bunch of whitespace and other cruft found by @ruebot.