gutter: small clean-up in the headers