undo merging referenced :river query

This is more complicated than I originally assumed (and that the tests
would specify).  The parsed query should actually encode logical
operators instead of just group the terms into three categories.  These
simple categories will not work when a sub-query is included.