Correct a glitch in r194424 which may invalidate iterator.