Reduce use of waitFutureSuccess utility