Expanded uniqueness of EnumValues to type.