Everything is done.

After making these changes, I don't see warnings in the integration tests that `done` was not called.