Minor header cleanups