am b13daf10: Evaluator.java and CalculatorExpr.java cleanup

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