Some header style fixes.