Trivial cleanup: use enum_is_univariant; no functional change intended.