Clean up headers a bit.