Behavior of ExpressionContext::resolveValue() is now consistent with old
behavior.