Use new iterator macros