[cvs-nhc98] More fixes to hat tools to recognise top-level identifiers