Made DefaultEnumMatcher also look for secondary matches. fixes #100.