python3: improve smelly code which triggers pylint py3 compat

List-comprehension iteration variables used the same names as
non-comprehension variables, triggering py3 compat. The code worked
but looked shitty anyway.