Move the generator cod to be more consistent.