diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs
index d03b80dc..23c2906d 100644
--- a/src/Generator/Generators/CLI/CLIMarshal.cs
+++ b/src/Generator/Generators/CLI/CLIMarshal.cs
@@ -13,15 +13,14 @@ namespace Cxxi.Generators.CLI
     {
         public TextGenerator Return;
 
-        Library Library { get; set; }
+        Driver Driver { get; set; }
         ITypeMapDatabase TypeMapDatabase { get; set; }
         MarshalContext Context { get; set; }
 
-        public CLIMarshalNativeToManagedPrinter(ITypeMapDatabase database,
-            Library library, MarshalContext marshalContext)
+        public CLIMarshalNativeToManagedPrinter(Driver driver, MarshalContext marshalContext)
         {
-            Library = library;
-            TypeMapDatabase = database;
+            Driver = driver;
+            TypeMapDatabase = driver.TypeDatabase;
             Context = marshalContext;
 
             Return = new TextGenerator();
@@ -227,7 +226,7 @@ namespace Cxxi.Generators.CLI
 
         private string ToCLITypeName(Declaration decl)
         {
-            var typePrinter = new CLITypePrinter(TypeMapDatabase, Library);
+            var typePrinter = new CLITypePrinter(Driver.TypeDatabase, Driver.Library);
             return typePrinter.VisitDeclaration(decl);
         }
 
diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
index b16ec203..7b14f98d 100644
--- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs
+++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
@@ -237,9 +237,7 @@ namespace Cxxi.Generators.CLI
                         ReturnType = param.Type
                     };
 
-                var marshal = new CLIMarshalNativeToManagedPrinter(
-                    Driver.TypeDatabase, Library, ctx);
-
+                var marshal = new CLIMarshalNativeToManagedPrinter(Driver, ctx);
                 param.Visit(marshal);
 
                 returns.Add(marshal.Return);
@@ -301,9 +299,7 @@ namespace Cxxi.Generators.CLI
                     ReturnType = field.Type
                 };
 
-                var marshal = new CLIMarshalNativeToManagedPrinter(
-                    Driver.TypeDatabase, Library, ctx);
-
+                var marshal = new CLIMarshalNativeToManagedPrinter(Driver, ctx);
                 field.Visit(marshal);
 
                 WriteLine("{0} = {1};", field.Name, marshal.Return);
@@ -448,8 +444,7 @@ namespace Cxxi.Generators.CLI
                         ReturnType = retType
                     };
 
-                var marshal = new CLIMarshalNativeToManagedPrinter(Driver.TypeDatabase,
-                    Library, ctx);
+                var marshal = new CLIMarshalNativeToManagedPrinter(Driver, ctx);
                 function.ReturnType.Visit(marshal);
 
                 WriteLine("{0};", marshal.Return);