Expose condition, desugar queries to be relaxed about whether condition is called in the last parameter.