Doing some clean-ups of imports. Also, in the last check-in, I removed
support for with(). It is theoretically needed if you want to use entire
sets of data in a query (e.g. check if this entry is part of this set of
numbers), but it's a bit of a mess to use, and that sort of query is
rare.