Tidy up the header. Fixes #2110