consolidate simplifyExpressions to one pass that happens before closure, where simplifyNotComps is guaranteed to be valid