Made simplifyExpr a little smarter