Fix another iterator invalidation that caused a *really* nasty miscompilation in...