Reduce primitives during simplification
Merge branch 'maint-2.4.0'