Coding style fixes.

Suggested by @cpeterso