Clean up headers a little bit.