[CLEANUP] Investigate rewriting query parsing

[JaimeGensler]

This may be as good as it's going to get, I don't know, but it's worth looking into 🤷