From 56955d9ad3952070de3bb1718375b368437f7427 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 28 Apr 2020 18:33:30 -0500
Subject: [PATCH] [generator] Use custom delegates instead of Func/Action.
 (#632)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: https://github.com/xamarin/java.interop/issues/631

Context: https://github.com/dotnet/runtime/issues/32963
Context: https://github.com/dotnet/csharplang/blob/master/proposals/function-pointers.md

*Of `Delegate`s and JNI Callbacks…*

~~ Background ~~

In order for Java code to invoke Managed Code such as C#, several
things must happen:

 1. There must be a Java class which declares `native` methods.
 2. The Java class' `native` methods must be [*resolvable*][0]

Java `native` method resolution can be done by [C function name][1]
*or* by using [`JNIEnv::RegisterNatives()`][2]:

	// C++
	struct JNINativeMethod {
	    const char *name;
	    const char *signature;
	    const void *fnPtr;
	};

	/* partial */ struct JNIEnv {
	    jint RegisterNatives(jclass clazz, const JNINativeMethod *methods, jint nMethods);
	};

`JNINativeMethods::fnPtr` is a pointer to a *C callable function*
that accepts [JNI Native Method Arguments][3].

Java.Interop doesn't currently support resolution via C function name,
and instead binds the `JNINativeMethod` struct as
`JniNativeMethodRegistration`, and `JNIEnv::RegisterNatives()` as
`Java.Interop.JniEnvironment.Types.RegisterNatives()`:

	// C#
	public partial struct JniNativeMethodRegistration {
	    public  string    Name;
	    public  string    Signature;
	    public  Delegate  Marshaler;
	}
	public partial class JniEnvironment {
	    public partial class Types {
	        public static void RegisterNatives (JniObjectReference type, JniNativeMethodRegistration [] methods);
	    }
	}

Through the glory that is [Platform Invoke Delegate Marshaling][4]
and/or [`Marshal.GetFunctionPointerForDelegate()`][5], managed code
can provide a `Delegate` instance in
`JniNativeMethodRegistration.Marshaler` and have JNI invoke that
delegate when the corresponding Java `native` method is invoked.

`tools/generator` is responsible for emitting this glue code, e.g.
in order to support registering overrides of
[`java.lang.Object.equals()`][6]:

	// C# emitted by `tools/generator`:
	namespace Java.Lang {
	  partial class Object {
	    static Delegate cb_equals_Ljava_lang_Object_;
	    static Delegate GetEquals_Ljava_lang_Object_Handler ()
	    {
	      if (cb_equals_Ljava_lang_Object_ == null)
	        cb_equals_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, bool>) n_Equals_Ljava_lang_Object_);
	      return cb_equals_Ljava_lang_Object_;
	    }

	    static bool n_Equals_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_obj)
	    {
	      var __this = global::Java.Lang.Object.GetObject<Java.Lang.Object> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
	      var obj = global::Java.Lang.Object.GetObject<Java.Lang.Object> (native_obj, JniHandleOwnership.DoNotTransfer);
	      bool __ret = __this.Equals (obj);
	      return __ret;
	    }
	  }
	}

`Object.n_Equals_Ljava_lang_Object()` is stored in a
`Func<IntPtr, IntPtr, IntPtr, bool>` -- which conforms to JNI Native
Method Arguments -- and is then provided to
[`JNINativeWrapper.CreateDelegate()`][7], which uses
`System.Reflection.Emit` to "wrap" `n_Equals_Ljava_lang_Object()` for
exception propagation purposes.  Eventually and ultimately, when a C#
class overrides `Java.Lang.Object.Equals()`,
`Object.GetEquals_Ljava_lang_Object_Handler()` will be invoked at
runtime, and `Object.cb_equals_Ljava_lang_Object` will be stored into
`JniNativeMethodRegistration.Marshaler`.


~~ `Action<…>` and `Func<…>` ~~

There is one problem with the above approach: its use of the
`System.Action<…>` and `System.Func<…>` types used at the core of
registering native methods with JNI.  There are two problems with
using these sets of types:

 1. These delegate types only permit up to 16 parameters.  Given that
    *two* parameters are always "eaten" by the `JNIEnv*` pointer and
    a `jobject` to Java's `this` or a `jclass` to the declaring class,
    that means that we can only bind methods taking up to 14 methods.
    Java methods which take more than 14 methods are skipped.

 2. .NET Framework and CoreCLR don't support using generic types with
    the Platform Invoke marshaler and
    [`Marshal.GetFunctionPointerForDelegate()`][8].

(1) has been a longstanding problem, which we've been ignoring.

(2) isn't *yet* a problem, and is something @jonpryor has been keen
to address for awhile.


~~ C# Function Pointers? ~~

There is a proposal to [add Function Pointers to the C# language][9].
This would permit reduced overheads and improved efficiencies in
obtaining a function pointer to pass into Java code.

Unfortunately:

 1. The proposal is still ongoing, with no known release date.
 2. .NET Framework 4.x won't support them.
 3. They can't be used within the current Xamarin.Android architecture.

There doesn't appear to be a way to obtain a `Delegate` from a
`delegate*`, which means `JNINativeWrapper.CreateDelegate()` cannot
be used with Function Pointers.

In order to use Function Pointers, we would likely need to *require*
use of `tools/jnimarshalmethod-gen.exe` (176240d2) so that appropriate
JNI Native Method Argument-conforming methods with the
`NativeCallableAttribute` can be generated at app build time,
*avoiding* the current Reflection-heavy registration path which
involves e.g. `Object.GetEquals_Ljava_lang_Object_Handler()`.

Unfortunately, `jnimarshalmethod-gen.exe` isn't "done": it doesn't
work on Windows, and it's use of `AppDomain`s and
`System.Reflection.Emit` look to complicate a future .NET 5 port.


~~ Solution: Generate Delegates ~~

If `Action<…>` and `Func<…>` are to be avoided, and Function Pointers
are out, how do we support more than 14 parameters?

By updating `generator` to emit the required delegate types.

When `Action<…>` or `Func<…>` would previously have been generated,
instead emit *and record the name of* a delegate which follows the
pattern:

  * Type name prefix: `_JniMarshal_PP`
  * Parameter types, using JNI encoding, e.g. `Z` for boolean,
    `I` for int, etc.  *Reference types*, normally encoded as `L…;`
    and Arrays, encoded as `[`, are each encoded as `L`.
    Kotlin unsigned types are encoded as *lower-case* forms of the
    corresponding JNI types, e.g. `i` is an unsigned `I`.
  * Another `_`.
  * The above type encoding for the return type.

For example, `Object.n_Equals_Ljava_lang_Object()` used
`Func<IntPtr, IntPtr, IntPtr, bool>`.  This would become
`_JniMarshal_PPL_Z`.

After the initial binding stage is complete and all required delegate
types are recorded, the `_JniMarshal*` types are emitted into
`__NamespaceMapping__.cs`:

	internal delegate bool _JniMarshal_PPL_Z (IntPtr jnienv, IntPtr klass, IntPtr a);

The cost to declaring all these types is that a binding assembly
contains more types.  `Mono.Android.dll`, for example, grows ~20KB
in size from all the required delegate declarations, pre-linking.


~~ Other ~~

Remove `tools/generator/generator.sln` and replace it with a
`tools/generator/generator.slnf` solution filter file which makes it
easier to work with `generator` in Visual Studio by only loading
needed projects from `Java.Interop.sln`.


[0]: https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#compiling_loading_and_linking_native_methods
[1]: https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names
[2]: https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives
[3]: https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#native_method_arguments
[4]: https://docs.microsoft.com/en-us/dotnet/framework/interop/marshaling-a-delegate-as-a-callback-method
[5]: https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.marshal.getfunctionpointerfordelegate?view=netcore-3.1
[6]: https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#equals%28java.lang.Object%29
[7]: https://github.com/xamarin/xamarin-android/blob/42822e0488185cdf4bca7c0bd05b21ad03dfbd7e/src/Mono.Android/Android.Runtime/JNINativeWrapper.cs#L34-L97
[8]: https://github.com/dotnet/runtime/issues/32963
[9]: https://github.com/dotnet/csharplang/blob/master/proposals/function-pointers.md
---
 .../expected.cp/__NamespaceMapping__.cs       |  3 +
 .../expected.ji/Android.Text.ISpannable.cs    |  2 +-
 .../expected.ji/Android.Text.ISpanned.cs      |  2 +-
 .../Android.Text.SpannableString.cs           |  2 +-
 .../Android.Text.SpannableStringInternal.cs   |  2 +-
 .../expected.ji/Android.Views.View.cs         |  8 +--
 .../expected.ji/__NamespaceMapping__.cs       |  5 ++
 .../expected/Android.Text.ISpannable.cs       |  2 +-
 .../expected/Android.Text.ISpanned.cs         |  2 +-
 .../expected/Android.Text.SpannableString.cs  |  2 +-
 .../Android.Text.SpannableStringInternal.cs   |  2 +-
 .../Tests-Core/expected/Android.Views.View.cs |  8 +--
 .../expected/__NamespaceMapping__.cs          |  5 ++
 .../Common/WriteInterfaceMethodInvokers.txt   |  6 +-
 .../WriteInterfaceMethodInvokersWithSkips.txt |  6 +-
 .../Common/WriteInterfacePropertyInvokers.txt | 16 +++---
 ...riteInterfacePropertyInvokersWithSkips.txt | 12 ++--
 .../WritePropertyAbstractDeclaration.txt      |  4 +-
 .../Common/WritePropertyCallbacks.txt         |  4 +-
 .../Common/WritePropertyInvoker.txt           |  4 +-
 .../JavaInterop1/WriteClass.txt               | 18 +++---
 .../JavaInterop1/WriteClassMethods.txt        |  6 +-
 .../JavaInterop1/WriteClassProperties.txt     | 12 ++--
 .../WriteDefaultInterfaceMethodInvoker.txt    |  2 +-
 .../JavaInterop1/WriteInterface.txt           | 18 +++---
 .../WriteInterfaceDefaultMethod.txt           |  2 +-
 .../WriteInterfaceDefaultProperty.txt         |  4 +-
 ...riteInterfaceDefaultPropertyGetterOnly.txt |  2 +-
 .../JavaInterop1/WriteInterfaceInvoker.txt    | 18 +++---
 .../WriteMethodAbstractWithVoidReturn.txt     |  2 +-
 .../WriteMethodAsyncifiedWithIntReturn.txt    |  2 +-
 .../WriteMethodAsyncifiedWithVoidReturn.txt   |  2 +-
 .../JavaInterop1/WriteMethodProtected.txt     |  2 +-
 .../JavaInterop1/WriteMethodWithIntReturn.txt |  2 +-
 .../WriteMethodWithStringReturn.txt           |  2 +-
 .../WriteMethodWithVoidReturn.txt             |  2 +-
 .../WriteNestedInterfaceClass.txt             |  2 +-
 .../WriteNestedInterfaceTypes.txt             |  4 +-
 .../JavaInterop1/WriteProperty.txt            |  4 +-
 .../WriteUnnestedInterfaceTypes.txt           |  4 +-
 .../XAJavaInterop1-NRT/WriteClass.txt         | 18 +++---
 .../XAJavaInterop1-NRT/WriteClassMethods.txt  |  6 +-
 .../WriteClassProperties.txt                  | 12 ++--
 .../XAJavaInterop1-NRT/WriteInterface.txt     | 18 +++---
 .../WriteInterfaceInvoker.txt                 | 18 +++---
 .../WriteInterfaceMethodInvokers.txt          |  6 +-
 .../WriteInterfaceMethodInvokersWithSkips.txt |  6 +-
 .../WriteInterfacePropertyInvokers.txt        | 16 +++---
 ...riteInterfacePropertyInvokersWithSkips.txt | 12 ++--
 .../WriteMethodAbstractWithVoidReturn.txt     |  2 +-
 .../WriteMethodAsyncifiedWithIntReturn.txt    |  2 +-
 .../WriteMethodAsyncifiedWithVoidReturn.txt   |  2 +-
 .../WriteMethodProtected.txt                  |  2 +-
 .../WriteMethodWithIntReturn.txt              |  2 +-
 .../WriteMethodWithStringReturn.txt           |  2 +-
 .../WriteMethodWithVoidReturn.txt             |  2 +-
 .../XAJavaInterop1-NRT/WriteProperty.txt      |  4 +-
 .../WritePropertyAbstractDeclaration.txt      |  4 +-
 .../WritePropertyCallbacks.txt                |  4 +-
 .../WritePropertyInvoker.txt                  |  4 +-
 .../XAJavaInterop1/WriteClass.txt             | 18 +++---
 .../XAJavaInterop1/WriteClassMethods.txt      |  6 +-
 .../XAJavaInterop1/WriteClassProperties.txt   | 12 ++--
 .../WriteDefaultInterfaceMethodInvoker.txt    |  2 +-
 .../XAJavaInterop1/WriteInterface.txt         | 18 +++---
 .../WriteInterfaceDefaultMethod.txt           |  2 +-
 .../WriteInterfaceDefaultProperty.txt         |  4 +-
 ...riteInterfaceDefaultPropertyGetterOnly.txt |  2 +-
 .../XAJavaInterop1/WriteInterfaceInvoker.txt  | 18 +++---
 .../WriteMethodAbstractWithVoidReturn.txt     |  2 +-
 .../WriteMethodAsyncifiedWithIntReturn.txt    |  2 +-
 .../WriteMethodAsyncifiedWithVoidReturn.txt   |  2 +-
 .../XAJavaInterop1/WriteMethodProtected.txt   |  2 +-
 .../WriteMethodWithIntReturn.txt              |  2 +-
 .../WriteMethodWithStringReturn.txt           |  2 +-
 .../WriteMethodWithVoidReturn.txt             |  2 +-
 .../WriteNestedInterfaceClass.txt             |  2 +-
 .../WriteNestedInterfaceTypes.txt             |  4 +-
 .../XAJavaInterop1/WriteProperty.txt          |  4 +-
 .../WriteUnnestedInterfaceTypes.txt           |  4 +-
 .../XamarinAndroid/WriteClass.txt             | 18 +++---
 .../XamarinAndroid/WriteClassMethods.txt      |  6 +-
 .../XamarinAndroid/WriteClassProperties.txt   | 12 ++--
 .../XamarinAndroid/WriteInterface.txt         | 18 +++---
 .../XamarinAndroid/WriteInterfaceInvoker.txt  | 18 +++---
 .../WriteMethodAbstractWithVoidReturn.txt     |  2 +-
 .../WriteMethodAsyncifiedWithIntReturn.txt    |  2 +-
 .../WriteMethodAsyncifiedWithVoidReturn.txt   |  2 +-
 .../XamarinAndroid/WriteMethodProtected.txt   |  2 +-
 .../WriteMethodWithIntReturn.txt              |  2 +-
 .../WriteMethodWithStringReturn.txt           |  2 +-
 .../WriteMethodWithVoidReturn.txt             |  2 +-
 .../XamarinAndroid/WriteProperty.txt          |  4 +-
 .../Xamarin.Test.BasePublicClass.cs           |  2 +-
 .../Xamarin.Test.ExtendPublicClass.cs         |  2 +-
 .../Xamarin.Test.PublicClass.cs               |  4 +-
 .../Adapters/Xamarin.Test.AbsSpinner.cs       |  4 +-
 .../Adapters/Xamarin.Test.AdapterView.cs      |  4 +-
 .../Xamarin.Test.GenericReturnObject.cs       |  2 +-
 .../Adapters/__NamespaceMapping__.cs          |  5 ++
 .../Xamarin.Test.SomeObject.cs                |  4 +-
 .../__NamespaceMapping__.cs                   |  5 ++
 .../Arrays/__NamespaceMapping__.cs            |  3 +
 .../Xamarin.Test.CSharpKeywords.cs            |  2 +-
 .../Constructors/__NamespaceMapping__.cs      |  3 +
 ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs |  4 +-
 .../Xamarin.Test.II1.cs                       |  2 +-
 .../Xamarin.Test.II2.cs                       |  2 +-
 .../Xamarin.Test.SomeObject.cs                |  2 +-
 .../Xamarin.Test.SomeObject2.cs               |  4 +-
 .../__NamespaceMapping__.cs                   |  4 ++
 .../Xamarin.Test.NotificationCompatBase.cs    |  2 +-
 .../NestedTypes/__NamespaceMapping__.cs       |  4 ++
 .../NonStaticFields/__NamespaceMapping__.cs   |  3 +
 .../NormalMethods/Xamarin.Test.A.cs           |  4 +-
 .../NormalMethods/Xamarin.Test.C.cs           |  2 +-
 .../NormalMethods/Xamarin.Test.SomeObject.cs  | 18 +++---
 .../NormalMethods/__NamespaceMapping__.cs     | 10 ++++
 .../Xamarin.Test.SomeObject.cs                | 12 ++--
 .../NormalProperties/__NamespaceMapping__.cs  |  7 +++
 .../ParameterXPath/Xamarin.Test.A.cs          |  4 +-
 .../ParameterXPath/__NamespaceMapping__.cs    |  4 ++
 .../StaticFields/__NamespaceMapping__.cs      |  3 +
 .../StaticMethods/__NamespaceMapping__.cs     |  3 +
 .../StaticProperties/__NamespaceMapping__.cs  |  3 +
 .../Streams/Java.IO.FilterOutputStream.cs     |  2 +-
 .../Streams/Java.IO.IOException.cs            |  2 +-
 .../Streams/Java.IO.InputStream.cs            | 18 +++---
 .../Streams/Java.IO.OutputStream.cs           | 10 ++--
 .../Streams/Java.Lang.Throwable.cs            |  2 +-
 .../Streams/__NamespaceMapping__.cs           | 13 +++++
 .../Test.ME.GenericImplementation.cs          |  2 +-
 ....ME.GenericObjectPropertyImplementation.cs |  4 +-
 .../Test.ME.GenericStringImplementation.cs    |  2 +-
 ....ME.GenericStringPropertyImplementation.cs |  4 +-
 .../Test.ME.IGenericInterface.cs              |  2 +-
 .../Test.ME.IGenericPropertyInterface.cs      |  4 +-
 .../TestInterface/Test.ME.ITestInterface.cs   |  6 +-
 .../Test.ME.TestInterfaceImplementation.cs    |  6 +-
 .../TestInterface/__NamespaceMapping__.cs     |  8 +++
 .../java.lang.Enum/Java.Lang.IComparable.cs   |  2 +-
 .../java.lang.Enum/__NamespaceMapping__.cs    |  4 ++
 .../java.lang.Object/__NamespaceMapping__.cs  |  3 +
 .../java.util.List/__NamespaceMapping__.cs    |  3 +
 .../Xamarin.Test.BasePublicClass.cs           |  2 +-
 .../Xamarin.Test.ExtendPublicClass.cs         |  2 +-
 .../Xamarin.Test.IExtendedInterface.cs        |  4 +-
 .../Xamarin.Test.PublicClass.cs               |  4 +-
 .../AccessModifiers/Xamarin.Test.TestClass.cs |  2 +-
 .../Adapters/Xamarin.Test.AbsSpinner.cs       |  4 +-
 .../Adapters/Xamarin.Test.AdapterView.cs      |  4 +-
 .../Xamarin.Test.GenericReturnObject.cs       |  2 +-
 .../Xamarin.Test.SomeObject.cs                |  4 +-
 .../Xamarin.Test.CSharpKeywords.cs            |  2 +-
 .../Xamarin.Test.SomeObject.cs                |  4 +-
 .../Xamarin.Test.SomeObject2.cs               |  8 +--
 .../EnumerationFixup/__NamespaceMapping__.cs  |  7 +++
 ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs |  4 +-
 .../Xamarin.Test.II1.cs                       |  2 +-
 .../Xamarin.Test.II2.cs                       |  2 +-
 .../Xamarin.Test.SomeObject.cs                |  2 +-
 .../Xamarin.Test.SomeObject2.cs               |  4 +-
 .../__NamespaceMapping__.cs                   |  4 ++
 .../Xamarin.Test.NotificationCompatBase.cs    |  2 +-
 .../expected/NormalMethods/Xamarin.Test.A.cs  |  4 +-
 .../expected/NormalMethods/Xamarin.Test.C.cs  |  2 +-
 .../NormalMethods/Xamarin.Test.SomeObject.cs  | 18 +++---
 .../Xamarin.Test.SomeObject.cs                | 12 ++--
 .../expected/ParameterXPath/Xamarin.Test.A.cs |  4 +-
 .../Streams/Java.IO.FilterOutputStream.cs     |  2 +-
 .../expected/Streams/Java.IO.IOException.cs   |  2 +-
 .../expected/Streams/Java.IO.InputStream.cs   | 18 +++---
 .../expected/Streams/Java.IO.OutputStream.cs  | 10 ++--
 .../expected/Streams/Java.Lang.Throwable.cs   |  2 +-
 .../TestInterface/ClassWithoutNamespace.cs    |  2 +-
 .../IInterfaceWithoutNamespace.cs             |  2 +-
 .../Test.ME.GenericImplementation.cs          |  2 +-
 ....ME.GenericObjectPropertyImplementation.cs |  4 +-
 .../Test.ME.GenericStringImplementation.cs    |  2 +-
 ....ME.GenericStringPropertyImplementation.cs |  4 +-
 .../Test.ME.IGenericInterface.cs              |  2 +-
 .../Test.ME.IGenericPropertyInterface.cs      |  4 +-
 .../TestInterface/Test.ME.ITestInterface.cs   |  6 +-
 .../Test.ME.TestInterfaceImplementation.cs    |  6 +-
 .../java.lang.Enum/Java.Lang.IComparable.cs   |  2 +-
 .../java.lang.Object/__NamespaceMapping__.cs  |  3 +
 tools/generator/CodeGenerationOptions.cs      | 55 +++++++++++++++++++
 tools/generator/CodeGenerator.cs              |  4 +-
 .../CodeGenerator.cs                          |  2 +-
 .../Method.cs                                 | 10 +---
 .../MethodBase.cs                             |  5 +-
 .../NamespaceMapping.cs                       | 49 +++++++++++++++++
 tools/generator/generator.csproj              |  4 ++
 tools/generator/generator.sln                 | 23 --------
 tools/generator/generator.slnf                | 15 +++++
 195 files changed, 668 insertions(+), 464 deletions(-)
 delete mode 100644 tools/generator/generator.sln
 create mode 100644 tools/generator/generator.slnf

diff --git a/tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs b/tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs
index 2e1ecf614..a104ec40d 100644
--- a/tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test.invalidnames", Managed="Xamarin.Test.Invalidnames")]
+
diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs
index 2abaa032c..5c216cde5 100644
--- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs
+++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs
@@ -67,7 +67,7 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Va
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs
index a99b776cc..fde761a3e 100644
--- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs
+++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs
@@ -72,7 +72,7 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs
index eb7372bc1..445360660 100644
--- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs
+++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs
@@ -78,7 +78,7 @@ public unsafe SpannableString (string source)
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs
index c2fdff74e..780fd288d 100644
--- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs
+++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs
@@ -35,7 +35,7 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs
index 94d3230c7..b99da744a 100644
--- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs
+++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs
@@ -75,7 +75,7 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba
 			static Delegate GetOnClick_Landroid_view_View_Handler ()
 			{
 				if (cb_onClick_Landroid_view_View_ == null)
-					cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_OnClick_Landroid_view_View_);
+					cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnClick_Landroid_view_View_);
 				return cb_onClick_Landroid_view_View_;
 			}
 
@@ -154,7 +154,7 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR
 		static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler ()
 		{
 			if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null)
-				cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
+				cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
 			return cb_setOnClickListener_Landroid_view_View_OnClickListener_;
 		}
 
@@ -184,7 +184,7 @@ public virtual unsafe void SetOnClickListener (Android.Views.View.IOnClickListen
 		static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ()
 		{
 			if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null)
-				cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
+				cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
 			return cb_setOn123Listener_Landroid_view_View_OnClickListener_;
 		}
 
@@ -214,7 +214,7 @@ public virtual unsafe void SetOn123Listener (Android.Views.View.IOnClickListener
 		static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler ()
 		{
 			if (cb_addTouchables_Ljava_util_ArrayList_ == null)
-				cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_AddTouchables_Ljava_util_ArrayList_);
+				cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddTouchables_Ljava_util_ArrayList_);
 			return cb_addTouchables_Ljava_util_ArrayList_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs b/tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs
index b82231f6d..21f970897 100644
--- a/tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs
@@ -1,3 +1,8 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "android.view", Managed="Android.Views")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "android.text", Managed="Android.Text")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
+
+delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs
index b4a8154cd..d290d7309 100644
--- a/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs
+++ b/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs
@@ -58,7 +58,7 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Va
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs
index 9d385c1d0..f715d067d 100644
--- a/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs
+++ b/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs
@@ -63,7 +63,7 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs
index 9aa1a7300..90e925b97 100644
--- a/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs
+++ b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs
@@ -92,7 +92,7 @@ public unsafe SpannableString (string source)
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs
index 5893feeca..666ca9e9f 100644
--- a/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs
+++ b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs
@@ -30,7 +30,7 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs b/tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs
index 33245dcb4..69f693890 100644
--- a/tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs
+++ b/tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs
@@ -66,7 +66,7 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba
 			static Delegate GetOnClick_Landroid_view_View_Handler ()
 			{
 				if (cb_onClick_Landroid_view_View_ == null)
-					cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_OnClick_Landroid_view_View_);
+					cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnClick_Landroid_view_View_);
 				return cb_onClick_Landroid_view_View_;
 			}
 
@@ -141,7 +141,7 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR
 		static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler ()
 		{
 			if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null)
-				cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
+				cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
 			return cb_setOnClickListener_Landroid_view_View_OnClickListener_;
 		}
 
@@ -177,7 +177,7 @@ public virtual unsafe void SetOnClickListener (Android.Views.View.IOnClickListen
 		static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ()
 		{
 			if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null)
-				cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
+				cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
 			return cb_setOn123Listener_Landroid_view_View_OnClickListener_;
 		}
 
@@ -213,7 +213,7 @@ public virtual unsafe void SetOn123Listener (Android.Views.View.IOnClickListener
 		static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler ()
 		{
 			if (cb_addTouchables_Ljava_util_ArrayList_ == null)
-				cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_AddTouchables_Ljava_util_ArrayList_);
+				cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddTouchables_Ljava_util_ArrayList_);
 			return cb_addTouchables_Ljava_util_ArrayList_;
 		}
 
diff --git a/tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs b/tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs
index b82231f6d..21f970897 100644
--- a/tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs
@@ -1,3 +1,8 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "android.view", Managed="Android.Views")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "android.text", Managed="Android.Text")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
+
+delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt
index fe918f37a..c92bd44ff 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -34,7 +34,7 @@ static Delegate cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -58,7 +58,7 @@ static Delegate cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt
index fe918f37a..c92bd44ff 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -34,7 +34,7 @@ static Delegate cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -58,7 +58,7 @@ static Delegate cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt
index 78ca2cc54..a2d5a9f6e 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_Count;
 static Delegate Getget_CountHandler ()
 {
 	if (cb_get_Count == null)
-		cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+		cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 	return cb_get_Count;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_Count_I;
 static Delegate Getset_Count_IHandler ()
 {
 	if (cb_set_Count_I == null)
-		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 	return cb_set_Count_I;
 }
 
@@ -52,7 +52,7 @@ static Delegate cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -68,7 +68,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -104,7 +104,7 @@ static Delegate cb_get_StaticCount;
 static Delegate Getget_StaticCountHandler ()
 {
 	if (cb_get_StaticCount == null)
-		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
+		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
 	return cb_get_StaticCount;
 }
 
@@ -120,7 +120,7 @@ static Delegate cb_set_StaticCount_I;
 static Delegate Getset_StaticCount_IHandler ()
 {
 	if (cb_set_StaticCount_I == null)
-		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
+		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
 	return cb_set_StaticCount_I;
 }
 
@@ -153,7 +153,7 @@ static Delegate cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -169,7 +169,7 @@ static Delegate cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt
index bf56a20f1..f4c42e9d2 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -55,7 +55,7 @@ static Delegate cb_get_StaticCount;
 static Delegate Getget_StaticCountHandler ()
 {
 	if (cb_get_StaticCount == null)
-		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
+		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
 	return cb_get_StaticCount;
 }
 
@@ -71,7 +71,7 @@ static Delegate cb_set_StaticCount_I;
 static Delegate Getset_StaticCount_IHandler ()
 {
 	if (cb_set_StaticCount_I == null)
-		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
+		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
 	return cb_set_StaticCount_I;
 }
 
@@ -104,7 +104,7 @@ static Delegate cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -120,7 +120,7 @@ static Delegate cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt
index 930e4a308..ba0d8f006 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt
index b904abb0a..3ee57d568 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt
index 93ab534db..bb1e9939f 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt
index 4c7d4d3f8..972dc529c 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt
@@ -56,7 +56,7 @@ public partial class MyClass  {
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -72,7 +72,7 @@ public partial class MyClass  {
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -112,7 +112,7 @@ public partial class MyClass  {
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -128,7 +128,7 @@ public partial class MyClass  {
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -195,7 +195,7 @@ public partial class MyClass  {
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -211,7 +211,7 @@ public partial class MyClass  {
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -234,7 +234,7 @@ public partial class MyClass  {
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -268,7 +268,7 @@ public partial class MyClass  {
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -307,7 +307,7 @@ public partial class MyClass  {
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt
index 6535faf97..f054a3b81 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -37,7 +37,7 @@ static Delegate cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -76,7 +76,7 @@ static Delegate cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt
index 43a35eff5..6801b7f39 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_Count;
 static Delegate Getget_CountHandler ()
 {
 	if (cb_get_Count == null)
-		cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+		cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 	return cb_get_Count;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_Count_I;
 static Delegate Getset_Count_IHandler ()
 {
 	if (cb_set_Count_I == null)
-		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 	return cb_set_Count_I;
 }
 
@@ -59,7 +59,7 @@ static Delegate cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -75,7 +75,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -142,7 +142,7 @@ static Delegate cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -158,7 +158,7 @@ static Delegate cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt
index 6e2ada3f4..032a970c1 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt
@@ -54,7 +54,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetDoDeclarationHandler ()
 	{
 		if (cb_DoDeclaration == null)
-			cb_DoDeclaration = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_DoDeclaration);
+			cb_DoDeclaration = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_DoDeclaration);
 		return cb_DoDeclaration;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
index 45a770fb1..02a08304e 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
@@ -123,7 +123,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -139,7 +139,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -172,7 +172,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -188,7 +188,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -224,7 +224,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -240,7 +240,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -273,7 +273,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -304,7 +304,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -328,7 +328,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt
index 0f5a62ceb..478da40e8 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt
@@ -8,7 +8,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate GetDoSomethingHandler ()
 	{
 		if (cb_DoSomething == null)
-			cb_DoSomething = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_DoSomething);
+			cb_DoSomething = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_DoSomething);
 		return cb_DoSomething;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt
index 91a8e4df1..3410fecc4 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt
@@ -8,7 +8,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate Getget_ValueHandler ()
 	{
 		if (cb_get_Value == null)
-			cb_get_Value = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Value);
+			cb_get_Value = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Value);
 		return cb_get_Value;
 	}
 
@@ -24,7 +24,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate Getset_Value_IHandler ()
 	{
 		if (cb_set_Value_I == null)
-			cb_set_Value_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Value_I);
+			cb_set_Value_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Value_I);
 		return cb_set_Value_I;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
index a9ec1e593..07e773a27 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
@@ -8,7 +8,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate Getget_ValueHandler ()
 	{
 		if (cb_get_Value == null)
-			cb_get_Value = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Value);
+			cb_get_Value = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Value);
 		return cb_get_Value;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt
index 4aa6ee6d0..e17cd3378 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt
@@ -54,7 +54,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -70,7 +70,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -103,7 +103,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -119,7 +119,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -155,7 +155,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -171,7 +171,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -204,7 +204,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -235,7 +235,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -259,7 +259,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt
index b7d3c80f2..7b481c028 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt
index 0845b9d15..0f42c6004 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt
index 86ae0ee27..3f8ee287b 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt
index 61f3a2e44..d5025685d 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt
index 2b15c54a2..c28a01629 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt
index 189b1521e..6cc92638c 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt
index 9feb4f6f4..087d49757 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceClass.txt
index c0cb405fc..5c903d4b9 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceClass.txt
@@ -92,7 +92,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceTypes.txt
index 12978e6bd..8935c8c1b 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceTypes.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteNestedInterfaceTypes.txt
@@ -74,7 +74,7 @@ public partial interface IParent : IJavaObject, IJavaPeerable {
 		static Delegate GetGetBarHandler ()
 		{
 			if (cb_getBar == null)
-				cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+				cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 			return cb_getBar;
 		}
 
@@ -155,7 +155,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt
index b5b58733a..46d1747a5 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteUnnestedInterfaceTypes.txt
index 7ddbd9323..9a09c4b76 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteUnnestedInterfaceTypes.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteUnnestedInterfaceTypes.txt
@@ -65,7 +65,7 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
@@ -155,7 +155,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt
index fd438b72d..820ebdd66 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt
@@ -56,7 +56,7 @@ public partial class MyClass  {
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -72,7 +72,7 @@ public partial class MyClass  {
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -112,7 +112,7 @@ public partial class MyClass  {
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -128,7 +128,7 @@ public partial class MyClass  {
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -195,7 +195,7 @@ public partial class MyClass  {
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -211,7 +211,7 @@ public partial class MyClass  {
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -234,7 +234,7 @@ public partial class MyClass  {
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -268,7 +268,7 @@ public partial class MyClass  {
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -307,7 +307,7 @@ public partial class MyClass  {
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassMethods.txt
index 97d97f813..e5240d219 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassMethods.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassMethods.txt
@@ -3,7 +3,7 @@ static Delegate? cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -37,7 +37,7 @@ static Delegate? cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -76,7 +76,7 @@ static Delegate? cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassProperties.txt
index 8b1868591..e7efea768 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassProperties.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClassProperties.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_Count;
 static Delegate Getget_CountHandler ()
 {
 	if (cb_get_Count == null)
-		cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+		cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 	return cb_get_Count;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_Count_I;
 static Delegate Getset_Count_IHandler ()
 {
 	if (cb_set_Count_I == null)
-		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 	return cb_set_Count_I;
 }
 
@@ -59,7 +59,7 @@ static Delegate? cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -75,7 +75,7 @@ static Delegate? cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -142,7 +142,7 @@ static Delegate? cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -158,7 +158,7 @@ static Delegate? cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt
index 4e9e88940..aae91fbdb 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt
@@ -123,7 +123,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -139,7 +139,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -172,7 +172,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -188,7 +188,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -224,7 +224,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -240,7 +240,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -273,7 +273,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -304,7 +304,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -328,7 +328,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceInvoker.txt
index eea98acb4..106523c3b 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceInvoker.txt
@@ -54,7 +54,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -70,7 +70,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -103,7 +103,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -119,7 +119,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -155,7 +155,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -171,7 +171,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -204,7 +204,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -235,7 +235,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -259,7 +259,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokers.txt
index bd1a8b1a8..84eeec41f 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokers.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokers.txt
@@ -3,7 +3,7 @@ static Delegate? cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -34,7 +34,7 @@ static Delegate? cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -58,7 +58,7 @@ static Delegate? cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokersWithSkips.txt
index bd1a8b1a8..84eeec41f 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokersWithSkips.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfaceMethodInvokersWithSkips.txt
@@ -3,7 +3,7 @@ static Delegate? cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -34,7 +34,7 @@ static Delegate? cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -58,7 +58,7 @@ static Delegate? cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokers.txt
index 9acf4f6f0..292eeaeb7 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokers.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokers.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_Count;
 static Delegate Getget_CountHandler ()
 {
 	if (cb_get_Count == null)
-		cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+		cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 	return cb_get_Count;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_Count_I;
 static Delegate Getset_Count_IHandler ()
 {
 	if (cb_set_Count_I == null)
-		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 	return cb_set_Count_I;
 }
 
@@ -52,7 +52,7 @@ static Delegate? cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -68,7 +68,7 @@ static Delegate? cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -104,7 +104,7 @@ static Delegate? cb_get_StaticCount;
 static Delegate Getget_StaticCountHandler ()
 {
 	if (cb_get_StaticCount == null)
-		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
+		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
 	return cb_get_StaticCount;
 }
 
@@ -120,7 +120,7 @@ static Delegate? cb_set_StaticCount_I;
 static Delegate Getset_StaticCount_IHandler ()
 {
 	if (cb_set_StaticCount_I == null)
-		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
+		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
 	return cb_set_StaticCount_I;
 }
 
@@ -153,7 +153,7 @@ static Delegate? cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -169,7 +169,7 @@ static Delegate? cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokersWithSkips.txt
index b310fffd9..2b877dc6a 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokersWithSkips.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterfacePropertyInvokersWithSkips.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -55,7 +55,7 @@ static Delegate? cb_get_StaticCount;
 static Delegate Getget_StaticCountHandler ()
 {
 	if (cb_get_StaticCount == null)
-		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
+		cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
 	return cb_get_StaticCount;
 }
 
@@ -71,7 +71,7 @@ static Delegate? cb_set_StaticCount_I;
 static Delegate Getset_StaticCount_IHandler ()
 {
 	if (cb_set_StaticCount_I == null)
-		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
+		cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
 	return cb_set_StaticCount_I;
 }
 
@@ -104,7 +104,7 @@ static Delegate? cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -120,7 +120,7 @@ static Delegate? cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAbstractWithVoidReturn.txt
index 3db5f7776..be52828cc 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAbstractWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAbstractWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithIntReturn.txt
index 9bfecaea4..633ee44bf 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithVoidReturn.txt
index 46d511e7a..377f99787 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodAsyncifiedWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodProtected.txt
index 73dcfc51b..c2eb3b7db 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodProtected.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodProtected.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithIntReturn.txt
index df6cbf4ab..0eb4a9e84 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithStringReturn.txt
index 81279c403..6b3c37fa3 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithStringReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithStringReturn.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithVoidReturn.txt
index adaf55a1a..afcab8b5b 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate? cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteProperty.txt
index 3471e7696..cae422721 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteProperty.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteProperty.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyAbstractDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyAbstractDeclaration.txt
index 4b3c054db..b04f48c67 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyAbstractDeclaration.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyAbstractDeclaration.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyCallbacks.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyCallbacks.txt
index 7b980b89f..fc4f51432 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyCallbacks.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyCallbacks.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyInvoker.txt
index 5b1f0b725..e2f135044 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WritePropertyInvoker.txt
@@ -3,7 +3,7 @@ static Delegate? cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate? cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt
index cb6feb756..b8851c8ec 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt
@@ -56,7 +56,7 @@ public partial class MyClass  {
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -72,7 +72,7 @@ public partial class MyClass  {
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -112,7 +112,7 @@ public partial class MyClass  {
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -128,7 +128,7 @@ public partial class MyClass  {
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -195,7 +195,7 @@ public partial class MyClass  {
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -211,7 +211,7 @@ public partial class MyClass  {
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -234,7 +234,7 @@ public partial class MyClass  {
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -268,7 +268,7 @@ public partial class MyClass  {
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -307,7 +307,7 @@ public partial class MyClass  {
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt
index 6535faf97..f054a3b81 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -37,7 +37,7 @@ static Delegate cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -76,7 +76,7 @@ static Delegate cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt
index 43a35eff5..6801b7f39 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_Count;
 static Delegate Getget_CountHandler ()
 {
 	if (cb_get_Count == null)
-		cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+		cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 	return cb_get_Count;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_Count_I;
 static Delegate Getset_Count_IHandler ()
 {
 	if (cb_set_Count_I == null)
-		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 	return cb_set_Count_I;
 }
 
@@ -59,7 +59,7 @@ static Delegate cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -75,7 +75,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -142,7 +142,7 @@ static Delegate cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -158,7 +158,7 @@ static Delegate cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt
index c96fffa4b..832fd4f13 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt
@@ -54,7 +54,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetDoDeclarationHandler ()
 	{
 		if (cb_DoDeclaration == null)
-			cb_DoDeclaration = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_DoDeclaration);
+			cb_DoDeclaration = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_DoDeclaration);
 		return cb_DoDeclaration;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt
index a87fcc6ac..f6be0c68e 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt
@@ -123,7 +123,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -139,7 +139,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -172,7 +172,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -188,7 +188,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -224,7 +224,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -240,7 +240,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -273,7 +273,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -304,7 +304,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -328,7 +328,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt
index a9cef33d1..38aaec1f6 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt
@@ -8,7 +8,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate GetDoSomethingHandler ()
 	{
 		if (cb_DoSomething == null)
-			cb_DoSomething = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_DoSomething);
+			cb_DoSomething = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_DoSomething);
 		return cb_DoSomething;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt
index 52c27db01..d37539854 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt
@@ -8,7 +8,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate Getget_ValueHandler ()
 	{
 		if (cb_get_Value == null)
-			cb_get_Value = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Value);
+			cb_get_Value = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Value);
 		return cb_get_Value;
 	}
 
@@ -24,7 +24,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate Getset_Value_IHandler ()
 	{
 		if (cb_set_Value_I == null)
-			cb_set_Value_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Value_I);
+			cb_set_Value_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Value_I);
 		return cb_set_Value_I;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
index 51dc1bb95..9f49a9585 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
@@ -8,7 +8,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 	private static Delegate Getget_ValueHandler ()
 	{
 		if (cb_get_Value == null)
-			cb_get_Value = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Value);
+			cb_get_Value = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Value);
 		return cb_get_Value;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt
index 6a2ca98d8..32ccaa9ae 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt
@@ -54,7 +54,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -70,7 +70,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -103,7 +103,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -119,7 +119,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -155,7 +155,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -171,7 +171,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -204,7 +204,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -235,7 +235,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -259,7 +259,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt
index b7d3c80f2..7b481c028 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt
index 0845b9d15..0f42c6004 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt
index 86ae0ee27..3f8ee287b 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt
index 61f3a2e44..d5025685d 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt
index 2b15c54a2..c28a01629 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt
index 189b1521e..6cc92638c 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt
index 9feb4f6f4..087d49757 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt
index 13bdd7d3d..f4824a496 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt
@@ -92,7 +92,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt
index eec67a98b..51a3ecf24 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt
@@ -74,7 +74,7 @@ public partial interface IParent : IJavaObject, IJavaPeerable {
 		static Delegate GetGetBarHandler ()
 		{
 			if (cb_getBar == null)
-				cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+				cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 			return cb_getBar;
 		}
 
@@ -155,7 +155,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt
index b5b58733a..46d1747a5 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt
index bc3d31de6..00bed99ab 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt
@@ -65,7 +65,7 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
@@ -155,7 +155,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
 	static Delegate GetGetBarHandler ()
 	{
 		if (cb_getBar == null)
-			cb_getBar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetBar);
+			cb_getBar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetBar);
 		return cb_getBar;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt
index d0233db96..bbd7f7f5c 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt
@@ -76,7 +76,7 @@ public partial class MyClass  {
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -92,7 +92,7 @@ public partial class MyClass  {
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -143,7 +143,7 @@ public partial class MyClass  {
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -159,7 +159,7 @@ public partial class MyClass  {
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -240,7 +240,7 @@ public partial class MyClass  {
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -256,7 +256,7 @@ public partial class MyClass  {
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -279,7 +279,7 @@ public partial class MyClass  {
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -320,7 +320,7 @@ public partial class MyClass  {
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -366,7 +366,7 @@ public partial class MyClass  {
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt
index 076f01d4f..44dc56e05 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
 static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 {
 	if (cb_GetCountForKey_Ljava_lang_String_ == null)
-		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+		cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 	return cb_GetCountForKey_Ljava_lang_String_;
 }
 
@@ -44,7 +44,7 @@ static Delegate cb_Key;
 static Delegate GetKeyHandler ()
 {
 	if (cb_Key == null)
-		cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+		cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 	return cb_Key;
 }
 
@@ -90,7 +90,7 @@ static Delegate cb_AbstractMethod;
 static Delegate GetAbstractMethodHandler ()
 {
 	if (cb_AbstractMethod == null)
-		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+		cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 	return cb_AbstractMethod;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt
index a779e6207..a6b788727 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_Count;
 static Delegate Getget_CountHandler ()
 {
 	if (cb_get_Count == null)
-		cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+		cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 	return cb_get_Count;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_Count_I;
 static Delegate Getset_Count_IHandler ()
 {
 	if (cb_set_Count_I == null)
-		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+		cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 	return cb_set_Count_I;
 }
 
@@ -70,7 +70,7 @@ static Delegate cb_get_Key;
 static Delegate Getget_KeyHandler ()
 {
 	if (cb_get_Key == null)
-		cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+		cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 	return cb_get_Key;
 }
 
@@ -86,7 +86,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
 static Delegate Getset_Key_Ljava_lang_String_Handler ()
 {
 	if (cb_set_Key_Ljava_lang_String_ == null)
-		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+		cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 	return cb_set_Key_Ljava_lang_String_;
 }
 
@@ -167,7 +167,7 @@ static Delegate cb_get_AbstractCount;
 static Delegate Getget_AbstractCountHandler ()
 {
 	if (cb_get_AbstractCount == null)
-		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+		cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 	return cb_get_AbstractCount;
 }
 
@@ -183,7 +183,7 @@ static Delegate cb_set_AbstractCount_I;
 static Delegate Getset_AbstractCount_IHandler ()
 {
 	if (cb_set_AbstractCount_I == null)
-		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+		cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 	return cb_set_AbstractCount_I;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt
index 24dbc1929..6ec81e71e 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt
@@ -117,7 +117,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -133,7 +133,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -166,7 +166,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -182,7 +182,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -218,7 +218,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -234,7 +234,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -267,7 +267,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -298,7 +298,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -322,7 +322,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt
index 27557b9bf..3cfdf28f9 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt
@@ -46,7 +46,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_CountHandler ()
 	{
 		if (cb_get_Count == null)
-			cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
+			cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
 		return cb_get_Count;
 	}
 
@@ -62,7 +62,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Count_IHandler ()
 	{
 		if (cb_set_Count_I == null)
-			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
+			cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
 		return cb_set_Count_I;
 	}
 
@@ -95,7 +95,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_KeyHandler ()
 	{
 		if (cb_get_Key == null)
-			cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
+			cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
 		return cb_get_Key;
 	}
 
@@ -111,7 +111,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_Key_Ljava_lang_String_Handler ()
 	{
 		if (cb_set_Key_Ljava_lang_String_ == null)
-			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
+			cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
 		return cb_set_Key_Ljava_lang_String_;
 	}
 
@@ -147,7 +147,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getget_AbstractCountHandler ()
 	{
 		if (cb_get_AbstractCount == null)
-			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
+			cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
 		return cb_get_AbstractCount;
 	}
 
@@ -163,7 +163,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate Getset_AbstractCount_IHandler ()
 	{
 		if (cb_set_AbstractCount_I == null)
-			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
+			cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
 		return cb_set_AbstractCount_I;
 	}
 
@@ -196,7 +196,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
 	{
 		if (cb_GetCountForKey_Ljava_lang_String_ == null)
-			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
+			cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
 		return cb_GetCountForKey_Ljava_lang_String_;
 	}
 
@@ -227,7 +227,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetKeyHandler ()
 	{
 		if (cb_Key == null)
-			cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
+			cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
 		return cb_Key;
 	}
 
@@ -251,7 +251,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
 	static Delegate GetAbstractMethodHandler ()
 	{
 		if (cb_AbstractMethod == null)
-			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
+			cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
 		return cb_AbstractMethod;
 	}
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt
index 44104474e..cece31ea1 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt
index d56798718..0bbf890bb 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt
index 5363ab7a3..75007ea61 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt
index adb21722c..ea87148b8 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt
index 573280f0b..15de7ed1f 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt
index ca0d2aaf3..61a711b00 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt
index ae470c92b..ec83f3d74 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt
@@ -3,7 +3,7 @@ static Delegate cb_bar;
 static Delegate GetbarHandler ()
 {
 	if (cb_bar == null)
-		cb_bar = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_bar);
+		cb_bar = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_bar);
 	return cb_bar;
 }
 
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt
index f396c6c04..3d6fdb31e 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
 static Delegate Getget_MyPropertyHandler ()
 {
 	if (cb_get_MyProperty == null)
-		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
+		cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
 	return cb_get_MyProperty;
 }
 
@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
 static Delegate Getset_MyProperty_IHandler ()
 {
 	if (cb_set_MyProperty_I == null)
-		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
+		cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
 	return cb_set_MyProperty_I;
 }
 
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs
index 3e7409922..e9c4951e8 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs
@@ -35,7 +35,7 @@ protected BasePublicClass (IntPtr javaReference, JniHandleOwnership transfer) :
 		static Delegate GetBaseMethodHandler ()
 		{
 			if (cb_baseMethod == null)
-				cb_baseMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_BaseMethod);
+				cb_baseMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_BaseMethod);
 			return cb_baseMethod;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
index c22bc285a..0cc575bee 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
@@ -53,7 +53,7 @@ public unsafe ExtendPublicClass ()
 		static Delegate GetFooHandler ()
 		{
 			if (cb_foo == null)
-				cb_foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+				cb_foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 			return cb_foo;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs
index 650246adf..af2a0fae9 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs
@@ -75,7 +75,7 @@ public IProtectedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) :
 			static Delegate GetFooHandler ()
 			{
 				if (cb_foo == null)
-					cb_foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+					cb_foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 				return cb_foo;
 			}
 
@@ -141,7 +141,7 @@ public unsafe PublicClass ()
 		static Delegate GetFooHandler ()
 		{
 			if (cb_foo == null)
-				cb_foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+				cb_foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 			return cb_foo;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs
index b04c9d1cc..9af7c4cee 100644
--- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs
+++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs
@@ -35,7 +35,7 @@ protected AbsSpinner (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetAdapterHandler ()
 		{
 			if (cb_getAdapter == null)
-				cb_getAdapter = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetAdapter);
+				cb_getAdapter = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetAdapter);
 			return cb_getAdapter;
 		}
 
@@ -51,7 +51,7 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler ()
 		{
 			if (cb_setAdapter_Lxamarin_test_SpinnerAdapter_ == null)
-				cb_setAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetAdapter_Lxamarin_test_SpinnerAdapter_);
+				cb_setAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetAdapter_Lxamarin_test_SpinnerAdapter_);
 			return cb_setAdapter_Lxamarin_test_SpinnerAdapter_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs
index 919b5142d..0377b29fd 100644
--- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs
+++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs
@@ -36,7 +36,7 @@ protected AdapterView (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetAdapterHandler ()
 		{
 			if (cb_getAdapter == null)
-				cb_getAdapter = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetAdapter);
+				cb_getAdapter = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetAdapter);
 			return cb_getAdapter;
 		}
 
@@ -52,7 +52,7 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler ()
 		{
 			if (cb_setAdapter_Lxamarin_test_Adapter_ == null)
-				cb_setAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetAdapter_Lxamarin_test_Adapter_);
+				cb_setAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetAdapter_Lxamarin_test_Adapter_);
 			return cb_setAdapter_Lxamarin_test_Adapter_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs
index f1fda92ff..f0294f55d 100644
--- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs
+++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs
@@ -35,7 +35,7 @@ protected GenericReturnObject (IntPtr javaReference, JniHandleOwnership transfer
 		static Delegate GetGenericReturnHandler ()
 		{
 			if (cb_GenericReturn == null)
-				cb_GenericReturn = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GenericReturn);
+				cb_GenericReturn = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GenericReturn);
 			return cb_GenericReturn;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Adapters/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Adapters/__NamespaceMapping__.cs
index 03f5e975a..17938559b 100644
--- a/tests/generator-Tests/expected.ji/Adapters/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/Adapters/__NamespaceMapping__.cs
@@ -1,2 +1,7 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs
index 79f69fa5c..32cb9634b 100644
--- a/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs
@@ -55,7 +55,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetSomeColorHandler ()
 		{
 			if (cb_getSomeColor == null)
-				cb_getSomeColor = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetSomeColor);
+				cb_getSomeColor = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetSomeColor);
 			return cb_getSomeColor;
 		}
 
@@ -71,7 +71,7 @@ static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeColor_IHandler ()
 		{
 			if (cb_setSomeColor_I == null)
-				cb_setSomeColor_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_SetSomeColor_I);
+				cb_setSomeColor_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_SetSomeColor_I);
 			return cb_setSomeColor_I;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs
index 03f5e975a..c5083c6ff 100644
--- a/tests/generator-Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs
@@ -1,2 +1,7 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate int _JniMarshal_PP_I (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PPI_V (IntPtr jnienv, IntPtr klass, int p0);
diff --git a/tests/generator-Tests/expected.ji/Arrays/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Arrays/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/Arrays/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/Arrays/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
index 42c4931b8..f0c4c2d50 100644
--- a/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
+++ b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
@@ -35,7 +35,7 @@ protected CSharpKeywords (IntPtr javaReference, JniHandleOwnership transfer) : b
 		static Delegate GetUsePartial_IHandler ()
 		{
 			if (cb_usePartial_I == null)
-				cb_usePartial_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_UsePartial_I);
+				cb_usePartial_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_UsePartial_I);
 			return cb_usePartial_I;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Constructors/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Constructors/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/Constructors/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/Constructors/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
index 8af8eb372..eff177251 100644
--- a/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
+++ b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
@@ -72,7 +72,7 @@ public IExoMediaDrmOnEventListenerInvoker (IntPtr handle, JniHandleOwnership tra
 		static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayBHandler ()
 		{
 			if (cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB == null)
-				cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr, IntPtr, int, int, IntPtr>) n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB);
+				cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLLIIL_V) n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB);
 			return cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB;
 		}
 
@@ -253,7 +253,7 @@ public IExoMediaDrmInvoker (IntPtr handle, JniHandleOwnership transfer) : base (
 		static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_Handler ()
 		{
 			if (cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ == null)
-				cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_);
+				cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_);
 			return cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
index 34ce6354c..6c34ffcc6 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
@@ -71,7 +71,7 @@ public II1Invoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
index 004091bb5..47c112d5a 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
@@ -71,7 +71,7 @@ public II2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
index 02b194375..24aaabc4a 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
@@ -35,7 +35,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
index a5fbc5559..2356829f7 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
@@ -35,7 +35,7 @@ protected SomeObject2 (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetIrrelevantHandler ()
 		{
 			if (cb_irrelevant == null)
-				cb_irrelevant = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Irrelevant);
+				cb_irrelevant = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Irrelevant);
 			return cb_irrelevant;
 		}
 
@@ -62,7 +62,7 @@ public virtual unsafe void Irrelevant ()
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs
index 03f5e975a..85c43009a 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs
@@ -1,2 +1,6 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate void _JniMarshal_PP_V (IntPtr jnienv, IntPtr klass);
diff --git a/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
index fca51fcf2..e1d8ae2ee 100644
--- a/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
+++ b/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
@@ -79,7 +79,7 @@ public IFactoryInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
 				static Delegate GetBuild_IHandler ()
 				{
 					if (cb_build_I == null)
-						cb_build_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_Build_I);
+						cb_build_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_Build_I);
 					return cb_build_I;
 				}
 
diff --git a/tests/generator-Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs
index 03f5e975a..99e05f492 100644
--- a/tests/generator-Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs
@@ -1,2 +1,6 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate IntPtr _JniMarshal_PPI_L (IntPtr jnienv, IntPtr klass, int p0);
diff --git a/tests/generator-Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs
index 59039a267..de159ce98 100644
--- a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs
+++ b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs
@@ -40,7 +40,7 @@ protected B (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 			static Delegate GetSetCustomDimension_IHandler ()
 			{
 				if (cb_setCustomDimension_I == null)
-					cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_SetCustomDimension_I);
+					cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_SetCustomDimension_I);
 				return cb_setCustomDimension_I;
 			}
 
@@ -93,7 +93,7 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 		static Delegate GetGetHandleHandler ()
 		{
 			if (cb_getHandle == null)
-				cb_getHandle = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetHandle);
+				cb_getHandle = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetHandle);
 			return cb_getHandle;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs
index d2e61602f..67871a34c 100644
--- a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs
+++ b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs
@@ -36,7 +36,7 @@ protected C (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 		static Delegate GetSetCustomDimension_IHandler ()
 		{
 			if (cb_setCustomDimension_I == null)
-				cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_SetCustomDimension_I);
+				cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_SetCustomDimension_I);
 			return cb_setCustomDimension_I;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs
index a240909af..19cca3989 100644
--- a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs
@@ -55,7 +55,7 @@ public unsafe SomeObject (global::Java.Lang.Class c)
 		static Delegate GetGetTypeHandler ()
 		{
 			if (cb_getType == null)
-				cb_getType = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetType);
+				cb_getType = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetType);
 			return cb_getType;
 		}
 
@@ -83,7 +83,7 @@ static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler ()
 		{
 			if (cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ == null)
-				cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, IntPtr, int>) n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_);
+				cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLL_I) n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_);
 			return cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_;
 		}
 
@@ -117,7 +117,7 @@ static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntP
 		static Delegate GetIntegerMethodHandler ()
 		{
 			if (cb_IntegerMethod == null)
-				cb_IntegerMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_IntegerMethod);
+				cb_IntegerMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_IntegerMethod);
 			return cb_IntegerMethod;
 		}
 
@@ -145,7 +145,7 @@ public virtual unsafe int IntegerMethod ()
 		static Delegate GetVoidMethodHandler ()
 		{
 			if (cb_VoidMethod == null)
-				cb_VoidMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_VoidMethod);
+				cb_VoidMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_VoidMethod);
 			return cb_VoidMethod;
 		}
 
@@ -172,7 +172,7 @@ public virtual unsafe void VoidMethod ()
 		static Delegate GetStringMethodHandler ()
 		{
 			if (cb_StringMethod == null)
-				cb_StringMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_StringMethod);
+				cb_StringMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_StringMethod);
 			return cb_StringMethod;
 		}
 
@@ -200,7 +200,7 @@ public virtual unsafe string StringMethod ()
 		static Delegate GetObjectMethodHandler ()
 		{
 			if (cb_ObjectMethod == null)
-				cb_ObjectMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_ObjectMethod);
+				cb_ObjectMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_ObjectMethod);
 			return cb_ObjectMethod;
 		}
 
@@ -228,7 +228,7 @@ static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Handler ()
 		{
 			if (cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ == null)
-				cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr, int, IntPtr>) n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_);
+				cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLIL_V) n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_);
 			return cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_;
 		}
 
@@ -264,7 +264,7 @@ public virtual unsafe void VoidMethodWithParams (string astring, int anint, glob
 		static Delegate GetObsoleteMethodHandler ()
 		{
 			if (cb_ObsoleteMethod == null)
-				cb_ObsoleteMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_ObsoleteMethod);
+				cb_ObsoleteMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_ObsoleteMethod);
 			return cb_ObsoleteMethod;
 		}
 
@@ -294,7 +294,7 @@ public virtual unsafe int ObsoleteMethod ()
 		static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler ()
 		{
 			if (cb_ArrayListTest_Ljava_util_ArrayList_ == null)
-				cb_ArrayListTest_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_ArrayListTest_Ljava_util_ArrayList_);
+				cb_ArrayListTest_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_ArrayListTest_Ljava_util_ArrayList_);
 			return cb_ArrayListTest_Ljava_util_ArrayList_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs
index 03f5e975a..dea3cf429 100644
--- a/tests/generator-Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs
@@ -1,2 +1,12 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate int _JniMarshal_PP_I (IntPtr jnienv, IntPtr klass);
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PP_V (IntPtr jnienv, IntPtr klass);
+delegate IntPtr _JniMarshal_PPI_L (IntPtr jnienv, IntPtr klass, int p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate void _JniMarshal_PPLIL_V (IntPtr jnienv, IntPtr klass, IntPtr p0, int p1, IntPtr p2);
+delegate int _JniMarshal_PPLL_I (IntPtr jnienv, IntPtr klass, IntPtr p0, IntPtr p1);
diff --git a/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
index 9140a103f..fea7ba757 100644
--- a/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
@@ -35,7 +35,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetSomeIntegerHandler ()
 		{
 			if (cb_getSomeInteger == null)
-				cb_getSomeInteger = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetSomeInteger);
+				cb_getSomeInteger = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetSomeInteger);
 			return cb_getSomeInteger;
 		}
 
@@ -51,7 +51,7 @@ static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeInteger_IHandler ()
 		{
 			if (cb_setSomeInteger_I == null)
-				cb_setSomeInteger_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_SetSomeInteger_I);
+				cb_setSomeInteger_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_SetSomeInteger_I);
 			return cb_setSomeInteger_I;
 		}
 
@@ -74,7 +74,7 @@ public abstract int SomeInteger {
 		static Delegate GetGetSomeObjectPropertyHandler ()
 		{
 			if (cb_getSomeObjectProperty == null)
-				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetSomeObjectProperty);
+				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetSomeObjectProperty);
 			return cb_getSomeObjectProperty;
 		}
 
@@ -90,7 +90,7 @@ static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setSomeObjectProperty_Ljava_lang_Object_ == null)
-				cb_setSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetSomeObjectProperty_Ljava_lang_Object_);
+				cb_setSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetSomeObjectProperty_Ljava_lang_Object_);
 			return cb_setSomeObjectProperty_Ljava_lang_Object_;
 		}
 
@@ -114,7 +114,7 @@ static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na
 		static Delegate GetGetSomeStringHandler ()
 		{
 			if (cb_getSomeString == null)
-				cb_getSomeString = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetSomeString);
+				cb_getSomeString = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetSomeString);
 			return cb_getSomeString;
 		}
 
@@ -130,7 +130,7 @@ static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeString_Ljava_lang_String_Handler ()
 		{
 			if (cb_setSomeString_Ljava_lang_String_ == null)
-				cb_setSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetSomeString_Ljava_lang_String_);
+				cb_setSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetSomeString_Ljava_lang_String_);
 			return cb_setSomeString_Ljava_lang_String_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs
index 03f5e975a..223b17256 100644
--- a/tests/generator-Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs
@@ -1,2 +1,9 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate int _JniMarshal_PP_I (IntPtr jnienv, IntPtr klass);
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PPI_V (IntPtr jnienv, IntPtr klass, int p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs
index 285a8afa6..61c229d49 100644
--- a/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs
+++ b/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs
@@ -36,7 +36,7 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 		static Delegate GetSetA_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setA_Ljava_lang_Object_ == null)
-				cb_setA_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetA_Ljava_lang_Object_);
+				cb_setA_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetA_Ljava_lang_Object_);
 			return cb_setA_Ljava_lang_Object_;
 		}
 
@@ -68,7 +68,7 @@ public virtual unsafe void SetA (global::Java.Lang.Object adapter)
 		static Delegate GetListTest_Ljava_util_List_Handler ()
 		{
 			if (cb_listTest_Ljava_util_List_ == null)
-				cb_listTest_Ljava_util_List_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_ListTest_Ljava_util_List_);
+				cb_listTest_Ljava_util_List_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_ListTest_Ljava_util_List_);
 			return cb_listTest_Ljava_util_List_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs
index 03f5e975a..5825b394f 100644
--- a/tests/generator-Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs
@@ -1,2 +1,6 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/expected.ji/StaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/StaticFields/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/StaticFields/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/StaticFields/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
index 26387f106..98a29047e 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
@@ -57,7 +57,7 @@ public unsafe FilterOutputStream (global::System.IO.Stream @out)
 		static Delegate GetWrite_IHandler ()
 		{
 			if (cb_write_I == null)
-				cb_write_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_Write_I);
+				cb_write_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_Write_I);
 			return cb_write_I;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs
index ed04613c4..8318777fc 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs
@@ -35,7 +35,7 @@ protected IOException (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetPrintStackTraceHandler ()
 		{
 			if (cb_printStackTrace == null)
-				cb_printStackTrace = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_PrintStackTrace);
+				cb_printStackTrace = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_PrintStackTrace);
 			return cb_printStackTrace;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
index b3be61e79..3264fd92e 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
@@ -53,7 +53,7 @@ public unsafe InputStream ()
 		static Delegate GetAvailableHandler ()
 		{
 			if (cb_available == null)
-				cb_available = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_Available);
+				cb_available = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_Available);
 			return cb_available;
 		}
 
@@ -81,7 +81,7 @@ public virtual unsafe int Available ()
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
@@ -108,7 +108,7 @@ public virtual unsafe void Close ()
 		static Delegate GetMark_IHandler ()
 		{
 			if (cb_mark_I == null)
-				cb_mark_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_Mark_I);
+				cb_mark_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_Mark_I);
 			return cb_mark_I;
 		}
 
@@ -137,7 +137,7 @@ public virtual unsafe void Mark (int readlimit)
 		static Delegate GetMarkSupportedHandler ()
 		{
 			if (cb_markSupported == null)
-				cb_markSupported = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, bool>) n_MarkSupported);
+				cb_markSupported = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_Z) n_MarkSupported);
 			return cb_markSupported;
 		}
 
@@ -165,7 +165,7 @@ public virtual unsafe bool MarkSupported ()
 		static Delegate GetReadHandler ()
 		{
 			if (cb_read == null)
-				cb_read = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_Read);
+				cb_read = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_Read);
 			return cb_read;
 		}
 
@@ -185,7 +185,7 @@ static int n_Read (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetRead_arrayBHandler ()
 		{
 			if (cb_read_arrayB == null)
-				cb_read_arrayB = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_Read_arrayB);
+				cb_read_arrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_Read_arrayB);
 			return cb_read_arrayB;
 		}
 
@@ -224,7 +224,7 @@ public virtual unsafe int Read (byte[] buffer)
 		static Delegate GetRead_arrayBIIHandler ()
 		{
 			if (cb_read_arrayBII == null)
-				cb_read_arrayBII = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int, int, int>) n_Read_arrayBII);
+				cb_read_arrayBII = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLII_I) n_Read_arrayBII);
 			return cb_read_arrayBII;
 		}
 
@@ -265,7 +265,7 @@ public virtual unsafe int Read (byte[] buffer, int byteOffset, int byteCount)
 		static Delegate GetResetHandler ()
 		{
 			if (cb_reset == null)
-				cb_reset = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Reset);
+				cb_reset = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Reset);
 			return cb_reset;
 		}
 
@@ -292,7 +292,7 @@ public virtual unsafe void Reset ()
 		static Delegate GetSkip_JHandler ()
 		{
 			if (cb_skip_J == null)
-				cb_skip_J = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, long, long>) n_Skip_J);
+				cb_skip_J = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPJ_J) n_Skip_J);
 			return cb_skip_J;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
index 9ba0b8978..8282bf167 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
@@ -53,7 +53,7 @@ public unsafe OutputStream ()
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
@@ -80,7 +80,7 @@ public virtual unsafe void Close ()
 		static Delegate GetFlushHandler ()
 		{
 			if (cb_flush == null)
-				cb_flush = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Flush);
+				cb_flush = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Flush);
 			return cb_flush;
 		}
 
@@ -107,7 +107,7 @@ public virtual unsafe void Flush ()
 		static Delegate GetWrite_arrayBHandler ()
 		{
 			if (cb_write_arrayB == null)
-				cb_write_arrayB = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_Write_arrayB);
+				cb_write_arrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_Write_arrayB);
 			return cb_write_arrayB;
 		}
 
@@ -144,7 +144,7 @@ public virtual unsafe void Write (byte[] buffer)
 		static Delegate GetWrite_arrayBIIHandler ()
 		{
 			if (cb_write_arrayBII == null)
-				cb_write_arrayBII = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr, int, int>) n_Write_arrayBII);
+				cb_write_arrayBII = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLII_V) n_Write_arrayBII);
 			return cb_write_arrayBII;
 		}
 
@@ -183,7 +183,7 @@ public virtual unsafe void Write (byte[] buffer, int offset, int count)
 		static Delegate GetWrite_IHandler ()
 		{
 			if (cb_write_I == null)
-				cb_write_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_Write_I);
+				cb_write_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_Write_I);
 			return cb_write_I;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs
index 4098b942d..23d01ff3a 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs
@@ -21,7 +21,7 @@ internal static IntPtr class_ref {
 		static Delegate GetGetMessageHandler ()
 		{
 			if (cb_getMessage == null)
-				cb_getMessage = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetMessage);
+				cb_getMessage = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetMessage);
 			return cb_getMessage;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/Streams/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Streams/__NamespaceMapping__.cs
index 287d83550..3df5eaf1a 100644
--- a/tests/generator-Tests/expected.ji/Streams/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/Streams/__NamespaceMapping__.cs
@@ -1,2 +1,15 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.io", Managed="Java.IO")]
+
+delegate int _JniMarshal_PP_I (IntPtr jnienv, IntPtr klass);
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PP_V (IntPtr jnienv, IntPtr klass);
+delegate bool _JniMarshal_PP_Z (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PPI_V (IntPtr jnienv, IntPtr klass, int p0);
+delegate long _JniMarshal_PPJ_J (IntPtr jnienv, IntPtr klass, long p0);
+delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate int _JniMarshal_PPLII_I (IntPtr jnienv, IntPtr klass, IntPtr p0, int p1, int p2);
+delegate void _JniMarshal_PPLII_V (IntPtr jnienv, IntPtr klass, IntPtr p0, int p1, int p2);
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs
index 5541276bf..efacd156d 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs
@@ -53,7 +53,7 @@ public unsafe GenericImplementation ()
 		static Delegate GetSetObject_arrayBHandler ()
 		{
 			if (cb_SetObject_arrayB == null)
-				cb_SetObject_arrayB = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_arrayB);
+				cb_SetObject_arrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_arrayB);
 			return cb_SetObject_arrayB;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
index fb76f9b3f..09a76b6e1 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
@@ -53,7 +53,7 @@ public unsafe GenericObjectPropertyImplementation ()
 		static Delegate GetGetObjectHandler ()
 		{
 			if (cb_getObject == null)
-				cb_getObject = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetObject);
+				cb_getObject = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetObject);
 			return cb_getObject;
 		}
 
@@ -69,7 +69,7 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetObject_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setObject_Ljava_lang_Object_ == null)
-				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_Object_);
+				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_Object_);
 			return cb_setObject_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs
index 719ee72f7..d5d5f19c9 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs
@@ -53,7 +53,7 @@ public unsafe GenericStringImplementation ()
 		static Delegate GetSetObject_arrayLjava_lang_String_Handler ()
 		{
 			if (cb_SetObject_arrayLjava_lang_String_ == null)
-				cb_SetObject_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_arrayLjava_lang_String_);
+				cb_SetObject_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_arrayLjava_lang_String_);
 			return cb_SetObject_arrayLjava_lang_String_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs
index 48341d5b9..89c09ba93 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs
@@ -53,7 +53,7 @@ public unsafe GenericStringPropertyImplementation ()
 		static Delegate GetGetObjectHandler ()
 		{
 			if (cb_getObject == null)
-				cb_getObject = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetObject);
+				cb_getObject = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetObject);
 			return cb_getObject;
 		}
 
@@ -69,7 +69,7 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetObject_Ljava_lang_String_Handler ()
 		{
 			if (cb_SetObject_Ljava_lang_String_ == null)
-				cb_SetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_String_);
+				cb_SetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_String_);
 			return cb_SetObject_Ljava_lang_String_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs
index c1ba12a2e..16ce042d4 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs
@@ -72,7 +72,7 @@ public IGenericInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : b
 		static Delegate GetSetObject_Ljava_lang_Object_Handler ()
 		{
 			if (cb_SetObject_Ljava_lang_Object_ == null)
-				cb_SetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_Object_);
+				cb_SetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_Object_);
 			return cb_SetObject_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs
index 29f457db9..aaeed4cdd 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs
@@ -75,7 +75,7 @@ public IGenericPropertyInterfaceInvoker (IntPtr handle, JniHandleOwnership trans
 		static Delegate GetGetObjectHandler ()
 		{
 			if (cb_getObject == null)
-				cb_getObject = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetObject);
+				cb_getObject = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetObject);
 			return cb_getObject;
 		}
 
@@ -91,7 +91,7 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetObject_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setObject_Ljava_lang_Object_ == null)
-				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_Object_);
+				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_Object_);
 			return cb_setObject_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs
index f910a6a2a..b47eedc7e 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs
@@ -133,7 +133,7 @@ public ITestInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
@@ -162,7 +162,7 @@ public unsafe int GetSpanFlags (global::Java.Lang.Object tag)
 		static Delegate GetAppend_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_append_Ljava_lang_CharSequence_ == null)
-				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_Append_Ljava_lang_CharSequence_);
+				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_Append_Ljava_lang_CharSequence_);
 			return cb_append_Ljava_lang_CharSequence_;
 		}
 
@@ -191,7 +191,7 @@ public unsafe void Append (global::Java.Lang.ICharSequence value)
 		static Delegate GetIdentity_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_identity_Ljava_lang_CharSequence_ == null)
-				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, IntPtr>) n_Identity_Ljava_lang_CharSequence_);
+				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Identity_Ljava_lang_CharSequence_);
 			return cb_identity_Ljava_lang_CharSequence_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs
index 61b94b9df..dc175796e 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs
@@ -75,7 +75,7 @@ public unsafe TestInterfaceImplementation ()
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
@@ -97,7 +97,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this
 		static Delegate GetAppend_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_append_Ljava_lang_CharSequence_ == null)
-				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_Append_Ljava_lang_CharSequence_);
+				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_Append_Ljava_lang_CharSequence_);
 			return cb_append_Ljava_lang_CharSequence_;
 		}
 
@@ -125,7 +125,7 @@ public void Append (string value)
 		static Delegate GetIdentity_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_identity_Ljava_lang_CharSequence_ == null)
-				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, IntPtr>) n_Identity_Ljava_lang_CharSequence_);
+				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Identity_Ljava_lang_CharSequence_);
 			return cb_identity_Ljava_lang_CharSequence_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/TestInterface/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/TestInterface/__NamespaceMapping__.cs
index 2450609ca..f4ff95e01 100644
--- a/tests/generator-Tests/expected.ji/TestInterface/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/TestInterface/__NamespaceMapping__.cs
@@ -1,3 +1,11 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "test.me", Managed="Test.ME")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "", Managed="")]
+
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PP_V (IntPtr jnienv, IntPtr klass);
+delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate IntPtr _JniMarshal_PPL_L (IntPtr jnienv, IntPtr klass, IntPtr p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs
index 32925cf0f..b0dbf6f3d 100644
--- a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs
+++ b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs
@@ -72,7 +72,7 @@ public IComparableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (V
 		static Delegate GetCompareTo_Ljava_lang_Object_Handler ()
 		{
 			if (cb_compareTo_Ljava_lang_Object_ == null)
-				cb_compareTo_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_CompareTo_Ljava_lang_Object_);
+				cb_compareTo_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_CompareTo_Ljava_lang_Object_);
 			return cb_compareTo_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs
index de304907c..c2f92bdc5 100644
--- a/tests/generator-Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs
@@ -1 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
+
+delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs
index de304907c..01ebfbe27 100644
--- a/tests/generator-Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs
@@ -1 +1,4 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
+
diff --git a/tests/generator-Tests/expected.ji/java.util.List/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/java.util.List/__NamespaceMapping__.cs
index 03f5e975a..acb570f6c 100644
--- a/tests/generator-Tests/expected.ji/java.util.List/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.ji/java.util.List/__NamespaceMapping__.cs
@@ -1,2 +1,5 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
diff --git a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs
index 8bbca76b2..5eefa5d0e 100644
--- a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs
+++ b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs
@@ -30,7 +30,7 @@ protected BasePublicClass (IntPtr javaReference, JniHandleOwnership transfer) :
 		static Delegate GetBaseMethodHandler ()
 		{
 			if (cb_baseMethod == null)
-				cb_baseMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_BaseMethod);
+				cb_baseMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_BaseMethod);
 			return cb_baseMethod;
 		}
 
diff --git a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
index 319ed738e..b477e5c6e 100644
--- a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
+++ b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
@@ -58,7 +58,7 @@ public unsafe ExtendPublicClass ()
 		static Delegate GetFooHandler ()
 		{
 			if (cb_foo == null)
-				cb_foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+				cb_foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 			return cb_foo;
 		}
 
diff --git a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs
index 76265a305..404c7be9b 100644
--- a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs
+++ b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs
@@ -66,7 +66,7 @@ public IExtendedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) :
 		static Delegate GetExtendedMethodHandler ()
 		{
 			if (cb_extendedMethod == null)
-				cb_extendedMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_ExtendedMethod);
+				cb_extendedMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_ExtendedMethod);
 			return cb_extendedMethod;
 		}
 
@@ -90,7 +90,7 @@ public unsafe void ExtendedMethod ()
 		static Delegate GetBaseMethodHandler ()
 		{
 			if (cb_baseMethod == null)
-				cb_baseMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_BaseMethod);
+				cb_baseMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_BaseMethod);
 			return cb_baseMethod;
 		}
 
diff --git a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs
index d1b4ed2e1..5bab2ec06 100644
--- a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs
+++ b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs
@@ -66,7 +66,7 @@ public IProtectedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) :
 			static Delegate GetFooHandler ()
 			{
 				if (cb_foo == null)
-					cb_foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+					cb_foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 				return cb_foo;
 			}
 
@@ -138,7 +138,7 @@ public unsafe PublicClass ()
 		static Delegate GetFooHandler ()
 		{
 			if (cb_foo == null)
-				cb_foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+				cb_foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 			return cb_foo;
 		}
 
diff --git a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs
index b28856b9d..85049e4bf 100644
--- a/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs
+++ b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs
@@ -58,7 +58,7 @@ public unsafe TestClass ()
 		static Delegate GetBaseMethodHandler ()
 		{
 			if (cb_baseMethod == null)
-				cb_baseMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_BaseMethod);
+				cb_baseMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_BaseMethod);
 			return cb_baseMethod;
 		}
 
diff --git a/tests/generator-Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs
index 299c70378..5886631c7 100644
--- a/tests/generator-Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs
+++ b/tests/generator-Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs
@@ -30,7 +30,7 @@ protected AbsSpinner (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetAdapterHandler ()
 		{
 			if (cb_getAdapter == null)
-				cb_getAdapter = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetAdapter);
+				cb_getAdapter = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetAdapter);
 			return cb_getAdapter;
 		}
 
@@ -46,7 +46,7 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler ()
 		{
 			if (cb_setAdapter_Lxamarin_test_SpinnerAdapter_ == null)
-				cb_setAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetAdapter_Lxamarin_test_SpinnerAdapter_);
+				cb_setAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetAdapter_Lxamarin_test_SpinnerAdapter_);
 			return cb_setAdapter_Lxamarin_test_SpinnerAdapter_;
 		}
 
diff --git a/tests/generator-Tests/expected/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.AdapterView.cs
index c04e825a6..1c6dede0c 100644
--- a/tests/generator-Tests/expected/Adapters/Xamarin.Test.AdapterView.cs
+++ b/tests/generator-Tests/expected/Adapters/Xamarin.Test.AdapterView.cs
@@ -31,7 +31,7 @@ protected AdapterView (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetAdapterHandler ()
 		{
 			if (cb_getAdapter == null)
-				cb_getAdapter = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetAdapter);
+				cb_getAdapter = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetAdapter);
 			return cb_getAdapter;
 		}
 
@@ -47,7 +47,7 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler ()
 		{
 			if (cb_setAdapter_Lxamarin_test_Adapter_ == null)
-				cb_setAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetAdapter_Lxamarin_test_Adapter_);
+				cb_setAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetAdapter_Lxamarin_test_Adapter_);
 			return cb_setAdapter_Lxamarin_test_Adapter_;
 		}
 
diff --git a/tests/generator-Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs
index 97e9a5c3d..ac3dcf7c1 100644
--- a/tests/generator-Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs
+++ b/tests/generator-Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs
@@ -30,7 +30,7 @@ protected GenericReturnObject (IntPtr javaReference, JniHandleOwnership transfer
 		static Delegate GetGenericReturnHandler ()
 		{
 			if (cb_GenericReturn == null)
-				cb_GenericReturn = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GenericReturn);
+				cb_GenericReturn = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GenericReturn);
 			return cb_GenericReturn;
 		}
 
diff --git a/tests/generator-Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs
index 82a5cfda2..f93f97563 100644
--- a/tests/generator-Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs
@@ -51,7 +51,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetSomeColorHandler ()
 		{
 			if (cb_getSomeColor == null)
-				cb_getSomeColor = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetSomeColor);
+				cb_getSomeColor = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetSomeColor);
 			return cb_getSomeColor;
 		}
 
@@ -67,7 +67,7 @@ static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeColor_IHandler ()
 		{
 			if (cb_setSomeColor_I == null)
-				cb_setSomeColor_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_SetSomeColor_I);
+				cb_setSomeColor_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_SetSomeColor_I);
 			return cb_setSomeColor_I;
 		}
 
diff --git a/tests/generator-Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
index 0c79c3e52..08480e408 100644
--- a/tests/generator-Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
+++ b/tests/generator-Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
@@ -30,7 +30,7 @@ protected CSharpKeywords (IntPtr javaReference, JniHandleOwnership transfer) : b
 		static Delegate GetUsePartial_IHandler ()
 		{
 			if (cb_usePartial_I == null)
-				cb_usePartial_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_UsePartial_I);
+				cb_usePartial_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_UsePartial_I);
 			return cb_usePartial_I;
 		}
 
diff --git a/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs
index ec2127209..65e7073a9 100644
--- a/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs
@@ -30,7 +30,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetSomeObjectPropertyHandler ()
 		{
 			if (cb_getSomeObjectProperty == null)
-				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetSomeObjectProperty);
+				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetSomeObjectProperty);
 			return cb_getSomeObjectProperty;
 		}
 
@@ -46,7 +46,7 @@ static int n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeObjectProperty_IHandler ()
 		{
 			if (cb_setSomeObjectProperty_I == null)
-				cb_setSomeObjectProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_SetSomeObjectProperty_I);
+				cb_setSomeObjectProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_SetSomeObjectProperty_I);
 			return cb_setSomeObjectProperty_I;
 		}
 
diff --git a/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs
index 503894e5a..7a22603ac 100644
--- a/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs
+++ b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs
@@ -30,7 +30,7 @@ protected SomeObject2 (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetSomeObjectPropertyHandler ()
 		{
 			if (cb_getSomeObjectProperty == null)
-				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetSomeObjectProperty);
+				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetSomeObjectProperty);
 			return cb_getSomeObjectProperty;
 		}
 
@@ -46,7 +46,7 @@ static int n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeObjectProperty_IHandler ()
 		{
 			if (cb_setSomeObjectProperty_I == null)
-				cb_setSomeObjectProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_SetSomeObjectProperty_I);
+				cb_setSomeObjectProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_SetSomeObjectProperty_I);
 			return cb_setSomeObjectProperty_I;
 		}
 
@@ -98,7 +98,7 @@ static void n_SetSomeObjectProperty_I (IntPtr jnienv, IntPtr native__this, int n
 		static Delegate GetGetSomeObjectPropertyArrayHandler ()
 		{
 			if (cb_getSomeObjectPropertyArray == null)
-				cb_getSomeObjectPropertyArray = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetSomeObjectPropertyArray);
+				cb_getSomeObjectPropertyArray = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetSomeObjectPropertyArray);
 			return cb_getSomeObjectPropertyArray;
 		}
 
@@ -132,7 +132,7 @@ static IntPtr n_GetSomeObjectPropertyArray (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeObjectPropertyArray_arrayIHandler ()
 		{
 			if (cb_setSomeObjectPropertyArray_arrayI == null)
-				cb_setSomeObjectPropertyArray_arrayI = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetSomeObjectPropertyArray_arrayI);
+				cb_setSomeObjectPropertyArray_arrayI = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetSomeObjectPropertyArray_arrayI);
 			return cb_setSomeObjectPropertyArray_arrayI;
 		}
 
diff --git a/tests/generator-Tests/expected/EnumerationFixup/__NamespaceMapping__.cs b/tests/generator-Tests/expected/EnumerationFixup/__NamespaceMapping__.cs
index 03f5e975a..223b17256 100644
--- a/tests/generator-Tests/expected/EnumerationFixup/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected/EnumerationFixup/__NamespaceMapping__.cs
@@ -1,2 +1,9 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate int _JniMarshal_PP_I (IntPtr jnienv, IntPtr klass);
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr klass);
+delegate void _JniMarshal_PPI_V (IntPtr jnienv, IntPtr klass, int p0);
+delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
diff --git a/tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
index 725f9d99b..aea9f861e 100644
--- a/tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
+++ b/tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
@@ -63,7 +63,7 @@ public IExoMediaDrmOnEventListenerInvoker (IntPtr handle, JniHandleOwnership tra
 		static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayBHandler ()
 		{
 			if (cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB == null)
-				cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr, IntPtr, int, int, IntPtr>) n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB);
+				cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLLIIL_V) n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB);
 			return cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB;
 		}
 
@@ -236,7 +236,7 @@ public IExoMediaDrmInvoker (IntPtr handle, JniHandleOwnership transfer) : base (
 		static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_Handler ()
 		{
 			if (cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ == null)
-				cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_);
+				cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_);
 			return cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_;
 		}
 
diff --git a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs
index 38e537c90..1949af7f2 100644
--- a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs
+++ b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs
@@ -62,7 +62,7 @@ public II1Invoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs
index 11efbf3a5..1e544b89a 100644
--- a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs
+++ b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs
@@ -62,7 +62,7 @@ public II2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
index 613d6cfbc..e314d7298 100644
--- a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
@@ -30,7 +30,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
index 55e18da9b..f56ee5e7a 100644
--- a/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
+++ b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
@@ -30,7 +30,7 @@ protected SomeObject2 (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetIrrelevantHandler ()
 		{
 			if (cb_irrelevant == null)
-				cb_irrelevant = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Irrelevant);
+				cb_irrelevant = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Irrelevant);
 			return cb_irrelevant;
 		}
 
@@ -63,7 +63,7 @@ public virtual unsafe void Irrelevant ()
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
diff --git a/tests/generator-Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs
index 03f5e975a..85c43009a 100644
--- a/tests/generator-Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs
@@ -1,2 +1,6 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test", Managed="Xamarin.Test")]
+
+delegate void _JniMarshal_PP_V (IntPtr jnienv, IntPtr klass);
diff --git a/tests/generator-Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
index 869f90a3d..1c53a1698 100644
--- a/tests/generator-Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
+++ b/tests/generator-Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
@@ -70,7 +70,7 @@ public IFactoryInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
 				static Delegate GetBuild_IHandler ()
 				{
 					if (cb_build_I == null)
-						cb_build_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_Build_I);
+						cb_build_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_Build_I);
 					return cb_build_I;
 				}
 
diff --git a/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.A.cs
index ffd781199..fead8817d 100644
--- a/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.A.cs
+++ b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.A.cs
@@ -35,7 +35,7 @@ protected B (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 			static Delegate GetSetCustomDimension_IHandler ()
 			{
 				if (cb_setCustomDimension_I == null)
-					cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_SetCustomDimension_I);
+					cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_SetCustomDimension_I);
 				return cb_setCustomDimension_I;
 			}
 
@@ -89,7 +89,7 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 		static Delegate GetGetHandleHandler ()
 		{
 			if (cb_getHandle == null)
-				cb_getHandle = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetHandle);
+				cb_getHandle = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetHandle);
 			return cb_getHandle;
 		}
 
diff --git a/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.C.cs
index d98089aa9..471668049 100644
--- a/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.C.cs
+++ b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.C.cs
@@ -31,7 +31,7 @@ protected C (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 		static Delegate GetSetCustomDimension_IHandler ()
 		{
 			if (cb_setCustomDimension_I == null)
-				cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int, IntPtr>) n_SetCustomDimension_I);
+				cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_L) n_SetCustomDimension_I);
 			return cb_setCustomDimension_I;
 		}
 
diff --git a/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs
index b33deeb02..3f274067b 100644
--- a/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs
@@ -60,7 +60,7 @@ public unsafe SomeObject (global::Java.Lang.Class c)
 		static Delegate GetGetTypeHandler ()
 		{
 			if (cb_getType == null)
-				cb_getType = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetType);
+				cb_getType = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetType);
 			return cb_getType;
 		}
 
@@ -93,7 +93,7 @@ static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler ()
 		{
 			if (cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ == null)
-				cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, IntPtr, int>) n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_);
+				cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLL_I) n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_);
 			return cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_;
 		}
 
@@ -134,7 +134,7 @@ static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntP
 		static Delegate GetIntegerMethodHandler ()
 		{
 			if (cb_IntegerMethod == null)
-				cb_IntegerMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_IntegerMethod);
+				cb_IntegerMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_IntegerMethod);
 			return cb_IntegerMethod;
 		}
 
@@ -167,7 +167,7 @@ public virtual unsafe int IntegerMethod ()
 		static Delegate GetVoidMethodHandler ()
 		{
 			if (cb_VoidMethod == null)
-				cb_VoidMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_VoidMethod);
+				cb_VoidMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_VoidMethod);
 			return cb_VoidMethod;
 		}
 
@@ -200,7 +200,7 @@ public virtual unsafe void VoidMethod ()
 		static Delegate GetStringMethodHandler ()
 		{
 			if (cb_StringMethod == null)
-				cb_StringMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_StringMethod);
+				cb_StringMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_StringMethod);
 			return cb_StringMethod;
 		}
 
@@ -233,7 +233,7 @@ public virtual unsafe string StringMethod ()
 		static Delegate GetObjectMethodHandler ()
 		{
 			if (cb_ObjectMethod == null)
-				cb_ObjectMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_ObjectMethod);
+				cb_ObjectMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_ObjectMethod);
 			return cb_ObjectMethod;
 		}
 
@@ -266,7 +266,7 @@ static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Handler ()
 		{
 			if (cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ == null)
-				cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr, int, IntPtr>) n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_);
+				cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLIL_V) n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_);
 			return cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_;
 		}
 
@@ -308,7 +308,7 @@ public virtual unsafe void VoidMethodWithParams (string astring, int anint, glob
 		static Delegate GetObsoleteMethodHandler ()
 		{
 			if (cb_ObsoleteMethod == null)
-				cb_ObsoleteMethod = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_ObsoleteMethod);
+				cb_ObsoleteMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_ObsoleteMethod);
 			return cb_ObsoleteMethod;
 		}
 
@@ -343,7 +343,7 @@ public virtual unsafe int ObsoleteMethod ()
 		static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler ()
 		{
 			if (cb_ArrayListTest_Ljava_util_ArrayList_ == null)
-				cb_ArrayListTest_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_ArrayListTest_Ljava_util_ArrayList_);
+				cb_ArrayListTest_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_ArrayListTest_Ljava_util_ArrayList_);
 			return cb_ArrayListTest_Ljava_util_ArrayList_;
 		}
 
diff --git a/tests/generator-Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs
index c0e125055..2cea8977c 100644
--- a/tests/generator-Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs
@@ -30,7 +30,7 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetGetSomeIntegerHandler ()
 		{
 			if (cb_getSomeInteger == null)
-				cb_getSomeInteger = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_GetSomeInteger);
+				cb_getSomeInteger = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_GetSomeInteger);
 			return cb_getSomeInteger;
 		}
 
@@ -46,7 +46,7 @@ static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeInteger_IHandler ()
 		{
 			if (cb_setSomeInteger_I == null)
-				cb_setSomeInteger_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_SetSomeInteger_I);
+				cb_setSomeInteger_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_SetSomeInteger_I);
 			return cb_setSomeInteger_I;
 		}
 
@@ -69,7 +69,7 @@ public abstract int SomeInteger {
 		static Delegate GetGetSomeObjectPropertyHandler ()
 		{
 			if (cb_getSomeObjectProperty == null)
-				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetSomeObjectProperty);
+				cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetSomeObjectProperty);
 			return cb_getSomeObjectProperty;
 		}
 
@@ -85,7 +85,7 @@ static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setSomeObjectProperty_Ljava_lang_Object_ == null)
-				cb_setSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetSomeObjectProperty_Ljava_lang_Object_);
+				cb_setSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetSomeObjectProperty_Ljava_lang_Object_);
 			return cb_setSomeObjectProperty_Ljava_lang_Object_;
 		}
 
@@ -109,7 +109,7 @@ static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na
 		static Delegate GetGetSomeStringHandler ()
 		{
 			if (cb_getSomeString == null)
-				cb_getSomeString = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetSomeString);
+				cb_getSomeString = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetSomeString);
 			return cb_getSomeString;
 		}
 
@@ -125,7 +125,7 @@ static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetSomeString_Ljava_lang_String_Handler ()
 		{
 			if (cb_setSomeString_Ljava_lang_String_ == null)
-				cb_setSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetSomeString_Ljava_lang_String_);
+				cb_setSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetSomeString_Ljava_lang_String_);
 			return cb_setSomeString_Ljava_lang_String_;
 		}
 
diff --git a/tests/generator-Tests/expected/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected/ParameterXPath/Xamarin.Test.A.cs
index 3357e503f..338ce1daf 100644
--- a/tests/generator-Tests/expected/ParameterXPath/Xamarin.Test.A.cs
+++ b/tests/generator-Tests/expected/ParameterXPath/Xamarin.Test.A.cs
@@ -31,7 +31,7 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe
 		static Delegate GetSetA_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setA_Ljava_lang_Object_ == null)
-				cb_setA_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetA_Ljava_lang_Object_);
+				cb_setA_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetA_Ljava_lang_Object_);
 			return cb_setA_Ljava_lang_Object_;
 		}
 
@@ -69,7 +69,7 @@ public virtual unsafe void SetA (global::Java.Lang.Object adapter)
 		static Delegate GetListTest_Ljava_util_List_Handler ()
 		{
 			if (cb_listTest_Ljava_util_List_ == null)
-				cb_listTest_Ljava_util_List_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_ListTest_Ljava_util_List_);
+				cb_listTest_Ljava_util_List_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_ListTest_Ljava_util_List_);
 			return cb_listTest_Ljava_util_List_;
 		}
 
diff --git a/tests/generator-Tests/expected/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected/Streams/Java.IO.FilterOutputStream.cs
index 91271be4d..4f778944d 100644
--- a/tests/generator-Tests/expected/Streams/Java.IO.FilterOutputStream.cs
+++ b/tests/generator-Tests/expected/Streams/Java.IO.FilterOutputStream.cs
@@ -62,7 +62,7 @@ public unsafe FilterOutputStream (global::System.IO.Stream @out)
 		static Delegate GetWrite_IHandler ()
 		{
 			if (cb_write_I == null)
-				cb_write_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_Write_I);
+				cb_write_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_Write_I);
 			return cb_write_I;
 		}
 
diff --git a/tests/generator-Tests/expected/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected/Streams/Java.IO.IOException.cs
index 972b502e3..6ce0bf4ef 100644
--- a/tests/generator-Tests/expected/Streams/Java.IO.IOException.cs
+++ b/tests/generator-Tests/expected/Streams/Java.IO.IOException.cs
@@ -30,7 +30,7 @@ protected IOException (IntPtr javaReference, JniHandleOwnership transfer) : base
 		static Delegate GetPrintStackTraceHandler ()
 		{
 			if (cb_printStackTrace == null)
-				cb_printStackTrace = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_PrintStackTrace);
+				cb_printStackTrace = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_PrintStackTrace);
 			return cb_printStackTrace;
 		}
 
diff --git a/tests/generator-Tests/expected/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected/Streams/Java.IO.InputStream.cs
index 39e85d310..82db6bcc4 100644
--- a/tests/generator-Tests/expected/Streams/Java.IO.InputStream.cs
+++ b/tests/generator-Tests/expected/Streams/Java.IO.InputStream.cs
@@ -58,7 +58,7 @@ public unsafe InputStream ()
 		static Delegate GetAvailableHandler ()
 		{
 			if (cb_available == null)
-				cb_available = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_Available);
+				cb_available = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_Available);
 			return cb_available;
 		}
 
@@ -91,7 +91,7 @@ public virtual unsafe int Available ()
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
@@ -124,7 +124,7 @@ public virtual unsafe void Close ()
 		static Delegate GetMark_IHandler ()
 		{
 			if (cb_mark_I == null)
-				cb_mark_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_Mark_I);
+				cb_mark_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_Mark_I);
 			return cb_mark_I;
 		}
 
@@ -159,7 +159,7 @@ public virtual unsafe void Mark (int readlimit)
 		static Delegate GetMarkSupportedHandler ()
 		{
 			if (cb_markSupported == null)
-				cb_markSupported = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, bool>) n_MarkSupported);
+				cb_markSupported = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_Z) n_MarkSupported);
 			return cb_markSupported;
 		}
 
@@ -192,7 +192,7 @@ public virtual unsafe bool MarkSupported ()
 		static Delegate GetReadHandler ()
 		{
 			if (cb_read == null)
-				cb_read = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_Read);
+				cb_read = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_Read);
 			return cb_read;
 		}
 
@@ -212,7 +212,7 @@ static int n_Read (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetRead_arrayBHandler ()
 		{
 			if (cb_read_arrayB == null)
-				cb_read_arrayB = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_Read_arrayB);
+				cb_read_arrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_Read_arrayB);
 			return cb_read_arrayB;
 		}
 
@@ -258,7 +258,7 @@ public virtual unsafe int Read (byte[] buffer)
 		static Delegate GetRead_arrayBIIHandler ()
 		{
 			if (cb_read_arrayBII == null)
-				cb_read_arrayBII = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int, int, int>) n_Read_arrayBII);
+				cb_read_arrayBII = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLII_I) n_Read_arrayBII);
 			return cb_read_arrayBII;
 		}
 
@@ -306,7 +306,7 @@ public virtual unsafe int Read (byte[] buffer, int byteOffset, int byteCount)
 		static Delegate GetResetHandler ()
 		{
 			if (cb_reset == null)
-				cb_reset = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Reset);
+				cb_reset = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Reset);
 			return cb_reset;
 		}
 
@@ -339,7 +339,7 @@ public virtual unsafe void Reset ()
 		static Delegate GetSkip_JHandler ()
 		{
 			if (cb_skip_J == null)
-				cb_skip_J = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, long, long>) n_Skip_J);
+				cb_skip_J = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPJ_J) n_Skip_J);
 			return cb_skip_J;
 		}
 
diff --git a/tests/generator-Tests/expected/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected/Streams/Java.IO.OutputStream.cs
index 41d6c5d74..735484d95 100644
--- a/tests/generator-Tests/expected/Streams/Java.IO.OutputStream.cs
+++ b/tests/generator-Tests/expected/Streams/Java.IO.OutputStream.cs
@@ -58,7 +58,7 @@ public unsafe OutputStream ()
 		static Delegate GetCloseHandler ()
 		{
 			if (cb_close == null)
-				cb_close = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Close);
+				cb_close = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Close);
 			return cb_close;
 		}
 
@@ -91,7 +91,7 @@ public virtual unsafe void Close ()
 		static Delegate GetFlushHandler ()
 		{
 			if (cb_flush == null)
-				cb_flush = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Flush);
+				cb_flush = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Flush);
 			return cb_flush;
 		}
 
@@ -124,7 +124,7 @@ public virtual unsafe void Flush ()
 		static Delegate GetWrite_arrayBHandler ()
 		{
 			if (cb_write_arrayB == null)
-				cb_write_arrayB = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_Write_arrayB);
+				cb_write_arrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_Write_arrayB);
 			return cb_write_arrayB;
 		}
 
@@ -167,7 +167,7 @@ public virtual unsafe void Write (byte[] buffer)
 		static Delegate GetWrite_arrayBIIHandler ()
 		{
 			if (cb_write_arrayBII == null)
-				cb_write_arrayBII = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr, int, int>) n_Write_arrayBII);
+				cb_write_arrayBII = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLII_V) n_Write_arrayBII);
 			return cb_write_arrayBII;
 		}
 
@@ -212,7 +212,7 @@ public virtual unsafe void Write (byte[] buffer, int offset, int count)
 		static Delegate GetWrite_IHandler ()
 		{
 			if (cb_write_I == null)
-				cb_write_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_Write_I);
+				cb_write_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_Write_I);
 			return cb_write_I;
 		}
 
diff --git a/tests/generator-Tests/expected/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected/Streams/Java.Lang.Throwable.cs
index 479cb3314..600f87e40 100644
--- a/tests/generator-Tests/expected/Streams/Java.Lang.Throwable.cs
+++ b/tests/generator-Tests/expected/Streams/Java.Lang.Throwable.cs
@@ -20,7 +20,7 @@ internal static IntPtr class_ref {
 		static Delegate GetGetMessageHandler ()
 		{
 			if (cb_getMessage == null)
-				cb_getMessage = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetMessage);
+				cb_getMessage = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetMessage);
 			return cb_getMessage;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected/TestInterface/ClassWithoutNamespace.cs
index 2ecf60286..d5b670cad 100644
--- a/tests/generator-Tests/expected/TestInterface/ClassWithoutNamespace.cs
+++ b/tests/generator-Tests/expected/TestInterface/ClassWithoutNamespace.cs
@@ -56,7 +56,7 @@ public unsafe ClassWithoutNamespace ()
 	static Delegate GetFooHandler ()
 	{
 		if (cb_Foo == null)
-			cb_Foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+			cb_Foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 		return cb_Foo;
 	}
 
diff --git a/tests/generator-Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs
index 63d03cfc5..612fe57d7 100644
--- a/tests/generator-Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs
+++ b/tests/generator-Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs
@@ -60,7 +60,7 @@ public IInterfaceWithoutNamespaceInvoker (IntPtr handle, JniHandleOwnership tran
 	static Delegate GetFooHandler ()
 	{
 		if (cb_Foo == null)
-			cb_Foo = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_Foo);
+			cb_Foo = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_Foo);
 		return cb_Foo;
 	}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericImplementation.cs
index 7d94d9ec9..a2c700557 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericImplementation.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericImplementation.cs
@@ -58,7 +58,7 @@ public unsafe GenericImplementation ()
 		static Delegate GetSetObject_arrayBHandler ()
 		{
 			if (cb_SetObject_arrayB == null)
-				cb_SetObject_arrayB = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_arrayB);
+				cb_SetObject_arrayB = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_arrayB);
 			return cb_SetObject_arrayB;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
index 22d9f2fd2..50f5121d1 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
@@ -58,7 +58,7 @@ public unsafe GenericObjectPropertyImplementation ()
 		static Delegate GetGetObjectHandler ()
 		{
 			if (cb_getObject == null)
-				cb_getObject = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetObject);
+				cb_getObject = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetObject);
 			return cb_getObject;
 		}
 
@@ -74,7 +74,7 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetObject_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setObject_Ljava_lang_Object_ == null)
-				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_Object_);
+				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_Object_);
 			return cb_setObject_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs
index ca6c169de..7795cdfa1 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs
@@ -58,7 +58,7 @@ public unsafe GenericStringImplementation ()
 		static Delegate GetSetObject_arrayLjava_lang_String_Handler ()
 		{
 			if (cb_SetObject_arrayLjava_lang_String_ == null)
-				cb_SetObject_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_arrayLjava_lang_String_);
+				cb_SetObject_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_arrayLjava_lang_String_);
 			return cb_SetObject_arrayLjava_lang_String_;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs
index 6e7c440f2..401becb8e 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs
@@ -58,7 +58,7 @@ public unsafe GenericStringPropertyImplementation ()
 		static Delegate GetGetObjectHandler ()
 		{
 			if (cb_getObject == null)
-				cb_getObject = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetObject);
+				cb_getObject = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetObject);
 			return cb_getObject;
 		}
 
@@ -74,7 +74,7 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetObject_Ljava_lang_String_Handler ()
 		{
 			if (cb_SetObject_Ljava_lang_String_ == null)
-				cb_SetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_String_);
+				cb_SetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_String_);
 			return cb_SetObject_Ljava_lang_String_;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericInterface.cs
index a1e89d9b1..5dd28d2be 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericInterface.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericInterface.cs
@@ -63,7 +63,7 @@ public IGenericInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : b
 		static Delegate GetSetObject_Ljava_lang_Object_Handler ()
 		{
 			if (cb_SetObject_Ljava_lang_Object_ == null)
-				cb_SetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_Object_);
+				cb_SetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_Object_);
 			return cb_SetObject_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs
index e83728344..2fb275ed5 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs
@@ -66,7 +66,7 @@ public IGenericPropertyInterfaceInvoker (IntPtr handle, JniHandleOwnership trans
 		static Delegate GetGetObjectHandler ()
 		{
 			if (cb_getObject == null)
-				cb_getObject = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetObject);
+				cb_getObject = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_GetObject);
 			return cb_getObject;
 		}
 
@@ -82,7 +82,7 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this)
 		static Delegate GetSetObject_Ljava_lang_Object_Handler ()
 		{
 			if (cb_setObject_Ljava_lang_Object_ == null)
-				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetObject_Ljava_lang_Object_);
+				cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetObject_Ljava_lang_Object_);
 			return cb_setObject_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.ITestInterface.cs
index 0e6489315..bf30c1d16 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.ITestInterface.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.ITestInterface.cs
@@ -125,7 +125,7 @@ public ITestInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
@@ -154,7 +154,7 @@ public unsafe int GetSpanFlags (global::Java.Lang.Object tag)
 		static Delegate GetAppend_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_append_Ljava_lang_CharSequence_ == null)
-				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_Append_Ljava_lang_CharSequence_);
+				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_Append_Ljava_lang_CharSequence_);
 			return cb_append_Ljava_lang_CharSequence_;
 		}
 
@@ -183,7 +183,7 @@ public unsafe void Append (global::Java.Lang.ICharSequence value)
 		static Delegate GetIdentity_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_identity_Ljava_lang_CharSequence_ == null)
-				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, IntPtr>) n_Identity_Ljava_lang_CharSequence_);
+				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Identity_Ljava_lang_CharSequence_);
 			return cb_identity_Ljava_lang_CharSequence_;
 		}
 
diff --git a/tests/generator-Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs
index 6f8aa5d10..512c02f86 100644
--- a/tests/generator-Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs
+++ b/tests/generator-Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs
@@ -81,7 +81,7 @@ public unsafe TestInterfaceImplementation ()
 		static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
 		{
 			if (cb_getSpanFlags_Ljava_lang_Object_ == null)
-				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
+				cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
 			return cb_getSpanFlags_Ljava_lang_Object_;
 		}
 
@@ -103,7 +103,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this
 		static Delegate GetAppend_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_append_Ljava_lang_CharSequence_ == null)
-				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_Append_Ljava_lang_CharSequence_);
+				cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_Append_Ljava_lang_CharSequence_);
 			return cb_append_Ljava_lang_CharSequence_;
 		}
 
@@ -131,7 +131,7 @@ public void Append (string value)
 		static Delegate GetIdentity_Ljava_lang_CharSequence_Handler ()
 		{
 			if (cb_identity_Ljava_lang_CharSequence_ == null)
-				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, IntPtr>) n_Identity_Ljava_lang_CharSequence_);
+				cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Identity_Ljava_lang_CharSequence_);
 			return cb_identity_Ljava_lang_CharSequence_;
 		}
 
diff --git a/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs
index 6ca25321d..188e5ba2c 100644
--- a/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs
+++ b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs
@@ -63,7 +63,7 @@ public IComparableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (V
 		static Delegate GetCompareTo_Ljava_lang_Object_Handler ()
 		{
 			if (cb_compareTo_Ljava_lang_Object_ == null)
-				cb_compareTo_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_CompareTo_Ljava_lang_Object_);
+				cb_compareTo_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_CompareTo_Ljava_lang_Object_);
 			return cb_compareTo_Ljava_lang_Object_;
 		}
 
diff --git a/tests/generator-Tests/expected/java.lang.Object/__NamespaceMapping__.cs b/tests/generator-Tests/expected/java.lang.Object/__NamespaceMapping__.cs
index de304907c..01ebfbe27 100644
--- a/tests/generator-Tests/expected/java.lang.Object/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected/java.lang.Object/__NamespaceMapping__.cs
@@ -1 +1,4 @@
+using System;
+
 [assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
+
diff --git a/tools/generator/CodeGenerationOptions.cs b/tools/generator/CodeGenerationOptions.cs
index d5085ff74..9d15cb42e 100644
--- a/tools/generator/CodeGenerationOptions.cs
+++ b/tools/generator/CodeGenerationOptions.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 using Java.Interop.Tools.JavaCallableWrappers;
 
@@ -44,6 +45,9 @@ internal CodeGenerator CreateCodeGenerator (TextWriter writer)
 
 		public      SymbolTable             SymbolTable             { get; } = new SymbolTable ();
 
+		readonly SortedSet<string> jni_marshal_delegates = new SortedSet<string> ();
+		readonly object jni_marshal_delegates_lock = new object ();
+
 		public bool UseGlobal { get; set; }
 		public bool IgnoreNonPublicType { get; set; }
 		public string AssemblyName { get; set; }
@@ -156,6 +160,57 @@ string GetNullable (string s)
 			return NullableOperator;
 		}
 
+		// Encoding format:
+		// - Type name prefix: _JniMarshal_PP
+		// - Parameter types, using JNI encoding, e.g. Z is boolean, I is int, etc.
+		//   - Exception: Reference types, normally encoded as L…;, are instead just L.
+		//   - Lowercase JNI encoding indicates unsigned type, e.g. i is uint.
+		// - Another _.
+		// - Return type, encoded as with parameters. A void return type is V.
+		internal string GetJniMarshalDelegate (Method method)
+		{
+			var sb = new StringBuilder ("_JniMarshal_PP");
+
+			foreach (var p in method.Parameters)
+				sb.Append (GetJniTypeCode (p.Symbol));
+
+			sb.Append ("_");
+			sb.Append (GetJniTypeCode (method.RetVal.Symbol));
+
+			var result = sb.ToString ();
+
+			lock (jni_marshal_delegates_lock)
+				jni_marshal_delegates.Add (result);
+
+			return result;
+		}
+
+		string GetJniTypeCode (ISymbol symbol)
+		{
+			// The JniName for our Kotlin unsigned types is the same
+			// as the Java signed types, so check the original symbol
+			// name and encode lowercase for unsigned version.
+			switch (symbol.JavaName) {
+				case "ubyte": return "b";
+				case "uint": return "i";
+				case "ulong": return "j";
+				case "ushort": return "s";
+			}
+
+			var jni_name = symbol.JniName;
+
+			if (jni_name.StartsWith ("L") || jni_name.StartsWith ("["))
+				return "L";
+
+			return symbol.JniName;
+		}
+
+		internal IEnumerable<string> GetJniMarshalDelegates ()
+		{
+			lock (jni_marshal_delegates_lock)
+				return jni_marshal_delegates;
+		}
+
 		public string GetOutputName (string s)
 		{
 			if (s == "System.Void")
diff --git a/tools/generator/CodeGenerator.cs b/tools/generator/CodeGenerator.cs
index cb7160f1f..54d189aeb 100644
--- a/tools/generator/CodeGenerator.cs
+++ b/tools/generator/CodeGenerator.cs
@@ -187,12 +187,12 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
 			if (mapping_file != null)
 				GenerateMappingReportFile (gens, mapping_file);
 
-			new NamespaceMapping (gens).Generate (opt, gen_info);
-
 			foreach (IGeneratable gen in gens)
 				if (gen.IsGeneratable)
 					gen.Generate (opt, gen_info);
 
+			new NamespaceMapping (gens).Generate (opt, gen_info);
+
 
 			ClassGen.GenerateTypeRegistrations (opt, gen_info);
 			ClassGen.GenerateEnumList (gen_info);
diff --git a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
index 0b593bd36..b1b3a4745 100644
--- a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
@@ -1090,7 +1090,7 @@ public virtual void WriteMethodCallback (Method method, string indent, GenBase t
 		{
 			var is_private = method.IsInterfaceDefaultMethod ? "private " : string.Empty;
 
-			string delegate_type = method.GetDelegateType ();
+			string delegate_type = method.GetDelegateType (opt);
 			writer.WriteLine ("{0}{2}static Delegate{3} {1};", indent, method.EscapedCallbackName, is_private, opt.NullableOperator);
 			writer.WriteLine ("#pragma warning disable 0169");
 			if (method.Deprecated != null)
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs
index 3632a9b01..6ad71a4e0 100644
--- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs
@@ -128,15 +128,7 @@ internal string GetAdapterName (CodeGenerationOptions opt, string adapter)
 		// Connectors for DIM are defined on the interface, not the implementing type
 		public string GetConnectorNameFull (CodeGenerationOptions opt) => ConnectorName + (opt.SupportDefaultInterfaceMethods && IsInterfaceDefaultMethod ? $":{DeclaringType.FullName}, " + (AssemblyName ?? opt.AssemblyName) : string.Empty);
 
-		internal string GetDelegateType ()
-		{
-			var parms = Parameters.DelegateTypeParams;
-
-			if (IsVoid)
-				return $"Action<IntPtr, IntPtr{parms}>";
-			else
-				return $"Func<IntPtr, IntPtr{parms}, {RetVal.NativeType}>";
-		}
+		internal string GetDelegateType (CodeGenerationOptions opt) => opt.GetJniMarshalDelegate (this);
 
 		public string GetMetadataXPathReference (GenBase declaringType) =>
 			$"{declaringType.MetadataXPathReference}/method[@name='{JavaName}'{Parameters.GetMethodXPathPredicate ()}]";
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs
index 3c259f1d9..c0b3d5efe 100644
--- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs
@@ -115,10 +115,7 @@ protected virtual bool OnValidate (CodeGenerationOptions opt, GenericParameterDe
 			var tpl = GenericParameterDefinitionList.Merge (type_params, GenericArguments);
 			if (!Parameters.Validate (opt, tpl, context))
 				return false;
-			if (Parameters.Count > 14) {
-				Report.Warning (0, Report.WarningMethodBase + 0, "More than 16 parameters were found, which goes beyond the maximum number of parameters. ({0})", context.ContextString);
-				return false;
-			}
+
 			return true;
 		}
 
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs
index d4c7f519c..d4c44f0c5 100644
--- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs
@@ -19,9 +19,58 @@ public NamespaceMapping (IEnumerable<GenBase> gens)
 		public void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
 		{
 			using (var sw = gen_info.OpenStream (opt.GetFileName ("__NamespaceMapping__"))) {
+				sw.WriteLine ("using System;");
+				sw.WriteLine ();
+
 				foreach (var p in mappings)
 					sw.WriteLine ("[assembly:global::Android.Runtime.NamespaceMapping (Java = \"{0}\", Managed=\"{1}\")]",
 					              p.Key, p.Value);
+
+				sw.WriteLine ();
+
+				// delegate bool _JniMarshal_PPL_Z (IntPtr jnienv, IntPtr klass, IntPtr a);
+				foreach (var jni in opt.GetJniMarshalDelegates ())
+					sw.WriteLine ($"delegate {FromJniType (jni[jni.Length - 1])} {jni} (IntPtr jnienv, IntPtr klass{GetDelegateParameters (jni)});");
+			}
+		}
+
+		string GetDelegateParameters (string jni)
+		{
+			var parameters = new List<string> ();
+
+			jni = jni.Substring ("_JniMarshal_PP".Length);
+
+			var index = 0;
+
+			while (jni[index] != '_') {
+				parameters.Add ($"{FromJniType (jni [index])} p{index}");
+				index++;
+			}
+
+			if (parameters.Count == 0)
+				return string.Empty;
+
+			return ", " + string.Join (", ", parameters);
+		}
+
+		string FromJniType (char c)
+		{
+			switch (c) {
+				case 'B': return "sbyte";
+				case 'b': return "byte";
+				case 'C': return "char";
+				case 'D': return "double";
+				case 'F': return "float";
+				case 'I': return "int";
+				case 'i': return "uint";
+				case 'J': return "long";
+				case 'j': return "ulong";
+				case 'S': return "short";
+				case 's': return "ushort";
+				case 'Z': return "bool";
+				case 'V': return "void";
+				default:
+					return "IntPtr"; ;
 			}
 		}
 	}
diff --git a/tools/generator/generator.csproj b/tools/generator/generator.csproj
index 3dc05c887..dcddb1f9d 100644
--- a/tools/generator/generator.csproj
+++ b/tools/generator/generator.csproj
@@ -10,6 +10,10 @@
     <OutputPath>$(UtilityOutputFullPath)</OutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="generator.slnf" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\..\src\utils\StringRocks.cs">
       <Link>utils\StringRocks.cs</Link>
diff --git a/tools/generator/generator.sln b/tools/generator/generator.sln
deleted file mode 100644
index ce45e4310..000000000
--- a/tools/generator/generator.sln
+++ /dev/null
@@ -1,23 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator.csproj", "{D14A1B5C-2060-4930-92BE-F7190256C735}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-Tests", "..\..\tests\generator-Tests\generator-Tests.csproj", "{4EEAB1A7-99C1-4302-9C18-01A7B481409B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D14A1B5C-2060-4930-92BE-F7190256C735}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D14A1B5C-2060-4930-92BE-F7190256C735}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/tools/generator/generator.slnf b/tools/generator/generator.slnf
new file mode 100644
index 000000000..70f9b0a25
--- /dev/null
+++ b/tools/generator/generator.slnf
@@ -0,0 +1,15 @@
+{
+  "solution": {
+    "path": "C:\\code\\xamarin-android-backport\\external\\Java.Interop\\Java.Interop.sln",
+    "projects": [
+      "src\\Java.Interop.NamingCustomAttributes\\Java.Interop.NamingCustomAttributes.shproj",
+      "src\\Java.Interop.Tools.Cecil\\Java.Interop.Tools.Cecil.csproj",
+      "src\\Java.Interop.Tools.JavaCallableWrappers\\Java.Interop.Tools.JavaCallableWrappers.csproj",
+      "src\\Java.Interop.Tools.Diagnostics\\Java.Interop.Tools.Diagnostics.csproj",
+      "src\\Xamarin.Android.Tools.AnnotationSupport\\Xamarin.Android.Tools.AnnotationSupport.csproj",
+      "src\\Xamarin.Android.Tools.ApiXmlAdjuster\\Xamarin.Android.Tools.ApiXmlAdjuster.csproj",
+      "tests\\generator-Tests\\generator-Tests.csproj",
+      "tools\\generator\\generator.csproj",
+    ]
+  }
+}
\ No newline at end of file