Clean up header layout (fixes #136).