More scope-safe term manipulation in evaluation
Implement more of elim