Make the code of the generator-related code more in line with the rest of the codebase.
Make the code of the generator-related code more in line with the rest of the codebase.

hsorby/libcellml,MichaelClerx/libcellml,hsorby/libcellml,nickerso/libcellml,cellml/libcellml,hsorby/libcellml,nickerso/libcellml,cellml/libcellml,cellml/libcellml,nickerso/libcellml,cellml/libcellml,hsorby/libcellml,MichaelClerx/libcellml,MichaelClerx/libcellml,nickerso/libcellml