[cvs-nhc98] Fix the detection of top-level identifiers in hat-check, h