Merge "Refactor arithmetic code.  More symbolic result tracking." into ub-calculator-calculus