More uses of Iterator in Direct tests (via REST not YAML) that need to use the careful portable form.
Another tweak for Nashorn.