Remove some usage of Iterator, kyoshino/bzdeck#90