Misc cleanup and a further attempt to separate Range objects from iterator ranges.
Remove all changes to the iterators chapter, and fix up uses.