More improvements to the async query pipeline.