Rework wrap iterator to track mirrors