More minor style fixes.