Cosmetics: apply misc style fixes.