Fix rewritten _evaluate - this is starting to look pretty ugly...