Simplified the crazy faile waitings by rolling them into a deferred.