Update for @huonw's comments -- in particular, remove `Iterator` impl