Forgot to commit all the restructuring that I did for the C# generator.