Ensure the empty collection restriction applies via a separate subclause

Otherwise the id=0 limit can be OR'd with another limit leading to a
non-empty collection.  This commit should have been part of fbf575d.