Header cleanup, including header length in header to facilitate custom
header information.