am abe2862b: (-s ours) Evaluator.java and CalculatorExpr.java cleanup

* commit 'abe2862bc936dd083b5ba19b68c68ea4cc44b2f6':
  Evaluator.java and CalculatorExpr.java cleanup