Updated the code that generates the code to make the generated code slightly simpler.