Minor adjustments to code generation.