Factor out non-queries

For discussion purposes only.
Please do *NOT* merge.

The idea is described in the comment above the `sendQuery` binding
at line 286.