We should look into tendermint/tendermint#10013.

In the short-term, we should just port this across. But iirc, the query.peg.go file was actually auto-generated. We should see if whatever auto-generates that code has been fixed.