Migrate to iterator interface.