Fixed iterator macros and legacy iterator accepts