ExpressionResolver optimizations