Made the list comprehension simpler in multiline form

Includes simplification of the 2to3-generated for x in [for x] which is
not necessary.