Query handling without CNF.

The code is much simpler than I thought.