Switch iterator tracking in production code. Reformat.