Remove dependency on WaitableFlag