Fix bug where we'd fail to wait for cancellations to propagate.