Minor cleaning of the generated code.