Further cleanup evaluate()