Sorry, I just noticed this one last thing.  `default=header_start+1` is only strictly true for 3 of 13 readers.  So I think this should be reverted to the original.