(fix) Remove iterators and update for latest rustc.