Fix bug with comprehensions / generator expressions in generators