Change listener iteration semantics