More improvements to the async query pipeline.

Are there tests for this?