Minor style fixes. No functionality change.
Merge pull request #674 from nico/style

Minor style fixes. No functionality change.