Merge operator pairs (*,/) and (+,-) into same function.

* Also get tests to pass within a tolerance

* Remove some old cruft