Fix nasty list comprehension with a worse one