Fix a few whitespace and coding style issues.