Some more simplification rules to fix recent performance regressions.