Convert header_lines into a map

Couple of things - 
* Not sure if this approach is better than overloading the comparator with a case insensitive version. 
* Maybe we  should refactor all the *_header_line() into a separate class