Some clean-up refactoring of HeaderParser module.