Updated CallableWaiter to allow for extra context to be passed to the callable.