enable more parts of simplifyExpressions