Don't use real iterators; we don't have them yet.

This reverts part of commit 23f54f7b34e94a687cc6f525d978ba37cb596e6a.