Query is a distinct component, but the serializer did not know it yet.

Fixes https://www.w3.org/Bugs/Public/show_bug.cgi?id=21179 (Also
clarify popping behavior.)