Fully remove old NameMatcher constructor; diminutives now load
conditionally (currently always since there's no option, although a test
with hardcoded false was performed and there are no issues).