am 3666e639: Evaluator.java and CalculatorExpr.java cleanup

* commit '3666e6390cea89085f65ba507f6eac346abbf009':
  Evaluator.java and CalculatorExpr.java cleanup