Extracted primitive clauses for PrimitiveType Enum factory and cleanup
Merge remote-tracking branch 'danielsoro/a-bit-cleaner'