Move aliases out of ```EvaluationContext``` so that they don't interfere with our caching strategy.

Clean up the overall diff.