Trivial cleanup: use enum_is_univariant; no functional change intended.
Merge pull request #4357 from jld/constenum-bonus-fix

Trivial cleanup: use enum_is_univariant; no functional change intended.