Improve the fix in 366701c0

Now both x+(-y) and (-x)+y are simplified using a minus operator.

Also simplify some code using std::swap().