Improves enumerated type helpers, not that it matters :(