more consistent use/avoidance of HeaderHash