Can you split up the patch "windowscodecs/metadata: Split up query parsing into helpers according to the query grammar"? I feel that a lot of the rework could be done while keeping the `get_token` interface intact, even if it doesn't survive to the end.