am 1a78db27: (-s ours) am 492d496d: am b13daf10: Evaluator.java and CalculatorExpr.java cleanup

* commit '1a78db27efd1814e00b3a1af620a3a6900f60287':
  Evaluator.java and CalculatorExpr.java cleanup