Header refactoring: hash - unify and remove from catchall.
5 files changed