r7121: More subcontext fixes. A subcontext does not always imply internally deferred