CDI-293, remove injection into enums