Some coding style fixes.