Updated generated code and fixed initialization list ordering.