Tweaks throughout; finish up with iterators.