Tidy up enum matching where classname is missing
Merge pull request #2707 from wilr/enums

Tidy up enum matching where classname is missing