Unify then/waitFor