diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
index eeb355fb..a7f800ba 100644
--- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
+++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
@@ -502,13 +502,7 @@ namespace Cxxi.Generators.CLI
             var retType = function.ReturnType.ToString();
             Write("static {0} {1}(", retType, SafeIdentifier(function.Name));
 
-            for (int i = 0; i < function.Parameters.Count; ++i)
-            {
-                var param = function.Parameters[i];
-                Write("{0}", TypePrinter.VisitParameter(param));
-                if (i < function.Parameters.Count - 1)
-                    Write(", ");
-            }
+            Write(GenerateParametersList(function.Parameters));
 
             WriteLine(");");
         }
diff --git a/src/Generator/Generators/CLI/CLITextTemplate.cs b/src/Generator/Generators/CLI/CLITextTemplate.cs
index 6cefb311..6ed5bc67 100644
--- a/src/Generator/Generators/CLI/CLITextTemplate.cs
+++ b/src/Generator/Generators/CLI/CLITextTemplate.cs
@@ -111,6 +111,14 @@ namespace Cxxi.Generators.CLI
             }
         }
 
+        public string GenerateParametersList(List<Parameter> parameters)
+        {
+            var types = new List<string>();
+            foreach (var param in parameters)
+                types.Add(TypePrinter.VisitParameter(param));
+            return string.Join(", ", types);
+        }
+
         public static bool CheckIgnoreMethod(Class @class, Method method)
         {
             if (method.Ignore) return true;