From generator (with Channel) to iterator

Fixing this is precisely what the iteration protocol change mentioned here is about.