[cvs-nhc98] patch applied (hat): Distinguish toplevel identifiers from locally defined identifiers in