Expand the generator to produce lists as well.