Improve header parsing

Authored by bcooksley on Jan 15 2019, 9:02 AM.