Consider the possibility to programmatically enforce passing a boost::optional<VersionContext> when spawning an alternative client or operation context e.g. when calling cc().makeOperationContext(). This way callers will always be "invited" to think about the possible implications of missing the version context potentially present on the parent client/opCtx.