Lots of whitespace fixes from scrutinizer-ci.