To @nacx's comment about delays...what precisely are we waiting on here? Is there some way we can poll for the necessary condition rather than simply wait?