Some code cleanup on the HeaderConverter module.