Support for singular/plurals, refactored definition finding.