revised homonyms checking, again.