Horrible header-line skip logic in the old parser is hard to dodge

Passes junit tests, mod leaking a key?