am 492d496d: am b13daf10: Evaluator.java and CalculatorExpr.java cleanup

* commit '492d496dc01b452973b05ffd3c11a33d2e86bd5b':
  Evaluator.java and CalculatorExpr.java cleanup