Pass the current type when calling type maps.

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -126,6 +126,7 @@ namespace Cxxi.Generators.CLI
             TypeMap typeMap = null;
             if (TypeMapDatabase.FindTypeMap(decl, out typeMap))
             {
+                typeMap.Type = typedef;
                 typeMap.CLIMarshalToManaged(Context);
                 return typeMap.IsValueType;
             }

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -148,6 +148,7 @@ namespace Cxxi.Generators.CLI
             TypeMap typeMap = null;
             if (TypeMapDatabase.FindTypeMap(decl, out typeMap))
             {
+                typeMap.Type = typedef;
                 return typeMap.CLISignature();
             }