Fix ExtraUtils cobble, work on generators.