They now only differ in the way we handle waiting, so let's unify.
Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>