Fixing Iterator Madness