Fixing an old (but hopefully rare) iteration/mutation bug.