Replace doHdr() in favour of a better lexer rule