Version with trivial, single token fix attached. I'm not sure if you just forgot to mark this "ready for committer" in the commitfest app, but if not you'll want to do so now.
I defer to the judgement of a committer here -- my hope is that the queryid-exposing patch will be committed soon, and so it becomes a simple matter of "rebasing" (a term I use loosely) what I've done here on top of the then master branch. I felt that I had an up-front responsibility to not regress the aggressive-snapshot-aggregating use case, which is why I haven't simply waited for the queryid patch to be committed so that I could only then submit a new patch (a *separate* patch that allows query texts to not be returned when unneeded).
