Added more special cases to simplifyExpr