MX-166 Remove HeaderSize / HeaderSizeV1 which ended up being
over-abstractions.