Remove some usage of Iterator, #90