Further improved default enum matcher - ignoring missing numbers