#555 Coding style fixes.