The method PlanExecutorImpl::restoreStateWithoutRetrying currently receives 2 input parameters, a RestoreContext and a Yieldable* input parameter.
In all cases, the yieldable parameter is either a pointer to a CollectionPtr (which is derived from Yieldable) or a nullptr.
However, a RestoreContext also contains a CollectionPtr* member, so passing the CollectionPtr via the RestoreContext and the separate Yieldable* arguments seems redundant.
The restoreWithoutRetrying method API could be simplified so that we do not need to pass a separate Yieldable* pointer into it, but simply retrieve the CollectionPtr from its RestoreContext argument.