EnumUtil minor cleanup