Clean up evaluators. Add '+' and '*' operators.