Bug fixes after some rearrangement of query combining (for LUX-53);
all tests pass now, and we optimize OR predicates