[cvs-nhc98] Distinguish toplevel identifiers from locally defined iden