Extracted primitive clauses for PrimitiveType Enum factory and cleanup