Final changes in the generator.