minor style cleanups
Merge pull request #3650

2b45345 minor style cleanups (Philip Kaufmann)