Slightly tweak header-count semantics