Further polish of generated code.