Small tweaks to support really complex datasets

sleep(0) is perfectly legal and equivalent if you want to omit the `unless`