Delay filtering synonyms to decide if #matches() is needed.
Some clean-up.