Removed use of "global" iterator.