Fix bad expansions of list comprehensions.
fix generated module name