Revert "Merge pull request #15 from SlikNL/and-where-in-empty"

This reverts BC break

This reverts commit 9f419b91cbc0421ccec0691fa22a8620d0e11093, reversing
changes made to b43bf2eead3e56e5b23aab65df0d24436443a376.