This is harder to read than the former code.  Especially with the nested comprehensions.