Cleaning up compute' code in expression evaluator