Switch to real iterators. No perf loss.