diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
index a10a9b7e..0b2625a4 100644
--- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
+++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
@@ -283,13 +283,7 @@ namespace Cxxi.Generators.CLI
             else
                 Write("{0} {1}(", method.ReturnType, SafeIdentifier(method.Name));
 
-            for (var i = 0; i < method.Parameters.Count; ++i)
-            {
-                var param = method.Parameters[i];
-                Write("{0}", TypeSig.GetArgumentString(param));
-                if (i < method.Parameters.Count - 1)
-                    Write(", ");
-            }
+            GenerateMethodParameters(method);
 
             WriteLine(");");
         }
diff --git a/src/Generator/Generators/CLI/CLIHelpers.cs b/src/Generator/Generators/CLI/CLIHelpers.cs
index 773ae2d6..231f2237 100644
--- a/src/Generator/Generators/CLI/CLIHelpers.cs
+++ b/src/Generator/Generators/CLI/CLIHelpers.cs
@@ -434,6 +434,17 @@ namespace Cxxi.Generators.CLI
             WriteLine("/// <summary> {0} </summary>", comment);
         }
 
+        public void GenerateMethodParameters(Method method)
+        {
+            for (var i = 0; i < method.Parameters.Count; ++i)
+            {
+                var param = method.Parameters[i];
+                Write("{0}", TypeSig.GetArgumentString(param));
+                if (i < method.Parameters.Count - 1)
+                    Write(", ");
+            }
+        }
+
         public static bool CheckIgnoreMethod(Class @class, Method method)
         {
             if (method.Ignore) return true;
diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
index 48139ecc..1d43268f 100644
--- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs
+++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
@@ -154,13 +154,7 @@ namespace Cxxi.Generators.CLI
                 Write("{0} {1}::{2}(", method.ReturnType, QualifiedIdentifier(@class),
                       SafeIdentifier(method.Name));
 
-            for (var i = 0; i < method.Parameters.Count; ++i)
-            {
-                var param = method.Parameters[i];
-                Write("{0}", TypeSig.GetArgumentString(param));
-                if (i < method.Parameters.Count - 1)
-                    Write(", ");
-            }
+            GenerateMethodParameters(method);
 
             WriteLine(")");
             WriteLine("{");