Fixed remaining iterating-related stuff.