Modified code generation to fit CML grammar.