Close #19156: add tests and fix for Enum helper edge cases.  Patch from CliffM.