Fix cppcheck warnings, iterators in different containers (in any case, this condition can no longer happen)