Adjusted to upcoming change in ExpressionAccessInterface.