Remove scope parameter from ExpandPromise, ExpandPromiseAndDo