Minor edits made to code generator.