diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
index 420feb693c7..44e7f28de1e 100644
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -10,7 +10,8 @@
 namespace mozilla {
 namespace widget {
 
-constexpr char ANRReporter::name[];
+template<> const char mozilla::jni::Context<ANRReporter, jobject>::name[] =
+        "org/mozilla/gecko/ANRReporter";
 
 constexpr char ANRReporter::GetNativeStack_t::name[];
 constexpr char ANRReporter::GetNativeStack_t::signature[];
@@ -21,29 +22,32 @@ constexpr char ANRReporter::ReleaseNativeStack_t::signature[];
 constexpr char ANRReporter::RequestNativeStack_t::name[];
 constexpr char ANRReporter::RequestNativeStack_t::signature[];
 
-constexpr char AlarmReceiver::name[];
+template<> const char mozilla::jni::Context<AlarmReceiver, jobject>::name[] =
+        "org/mozilla/gecko/AlarmReceiver";
 
 constexpr char AlarmReceiver::NotifyAlarmFired_t::name[];
 constexpr char AlarmReceiver::NotifyAlarmFired_t::signature[];
 
-constexpr char DownloadsIntegration::name[];
+template<> const char mozilla::jni::Context<DownloadsIntegration, jobject>::name[] =
+        "org/mozilla/gecko/DownloadsIntegration";
 
 constexpr char DownloadsIntegration::ScanMedia_t::name[];
 constexpr char DownloadsIntegration::ScanMedia_t::signature[];
 
 auto DownloadsIntegration::ScanMedia(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> void
 {
-    return mozilla::jni::Method<ScanMedia_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<ScanMedia_t>::Call(DownloadsIntegration::Context(), nullptr, a0, a1);
 }
 
-constexpr char GeckoAppShell::name[];
+template<> const char mozilla::jni::Context<GeckoAppShell, jobject>::name[] =
+        "org/mozilla/gecko/GeckoAppShell";
 
 constexpr char GeckoAppShell::AcknowledgeEvent_t::name[];
 constexpr char GeckoAppShell::AcknowledgeEvent_t::signature[];
 
 auto GeckoAppShell::AcknowledgeEvent() -> void
 {
-    return mozilla::jni::Method<AcknowledgeEvent_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<AcknowledgeEvent_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::AddPluginViewWrapper_t::name[];
@@ -51,7 +55,7 @@ constexpr char GeckoAppShell::AddPluginViewWrapper_t::signature[];
 
 auto GeckoAppShell::AddPluginViewWrapper(mozilla::jni::Object::Param a0, float a1, float a2, float a3, float a4, bool a5) -> void
 {
-    return mozilla::jni::Method<AddPluginViewWrapper_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4, a5);
+    return mozilla::jni::Method<AddPluginViewWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5);
 }
 
 constexpr char GeckoAppShell::AlertsProgressListener_OnProgress_t::name[];
@@ -59,7 +63,7 @@ constexpr char GeckoAppShell::AlertsProgressListener_OnProgress_t::signature[];
 
 auto GeckoAppShell::AlertsProgressListener_OnProgress(mozilla::jni::String::Param a0, int64_t a1, int64_t a2, mozilla::jni::String::Param a3) -> void
 {
-    return mozilla::jni::Method<AlertsProgressListener_OnProgress_t>::Call(nullptr, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<AlertsProgressListener_OnProgress_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoAppShell::CancelVibrate_t::name[];
@@ -67,7 +71,7 @@ constexpr char GeckoAppShell::CancelVibrate_t::signature[];
 
 auto GeckoAppShell::CancelVibrate() -> void
 {
-    return mozilla::jni::Method<CancelVibrate_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<CancelVibrate_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::CheckURIVisited_t::name[];
@@ -75,7 +79,7 @@ constexpr char GeckoAppShell::CheckURIVisited_t::signature[];
 
 auto GeckoAppShell::CheckURIVisited(mozilla::jni::String::Param a0) -> void
 {
-    return mozilla::jni::Method<CheckURIVisited_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<CheckURIVisited_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::CloseCamera_t::name[];
@@ -83,7 +87,7 @@ constexpr char GeckoAppShell::CloseCamera_t::signature[];
 
 auto GeckoAppShell::CloseCamera() -> void
 {
-    return mozilla::jni::Method<CloseCamera_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<CloseCamera_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::CloseNotification_t::name[];
@@ -91,7 +95,7 @@ constexpr char GeckoAppShell::CloseNotification_t::signature[];
 
 auto GeckoAppShell::CloseNotification(mozilla::jni::String::Param a0) -> void
 {
-    return mozilla::jni::Method<CloseNotification_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<CloseNotification_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::ConnectionGetMimeType_t::name[];
@@ -99,7 +103,7 @@ constexpr char GeckoAppShell::ConnectionGetMimeType_t::signature[];
 
 auto GeckoAppShell::ConnectionGetMimeType(mozilla::jni::Object::Param a0) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<ConnectionGetMimeType_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<ConnectionGetMimeType_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::CreateInputStream_t::name[];
@@ -107,7 +111,7 @@ constexpr char GeckoAppShell::CreateInputStream_t::signature[];
 
 auto GeckoAppShell::CreateInputStream(mozilla::jni::Object::Param a0) -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<CreateInputStream_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<CreateInputStream_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::CreateMessageCursorWrapper_t::name[];
@@ -115,7 +119,7 @@ constexpr char GeckoAppShell::CreateMessageCursorWrapper_t::signature[];
 
 auto GeckoAppShell::CreateMessageCursorWrapper(int64_t a0, int64_t a1, mozilla::jni::ObjectArray::Param a2, int32_t a3, mozilla::jni::String::Param a4, bool a5, bool a6, bool a7, int64_t a8, bool a9, int32_t a10) -> void
 {
-    return mozilla::jni::Method<CreateMessageCursorWrapper_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+    return mozilla::jni::Method<CreateMessageCursorWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
 }
 
 constexpr char GeckoAppShell::CreateShortcut_t::name[];
@@ -123,7 +127,7 @@ constexpr char GeckoAppShell::CreateShortcut_t::signature[];
 
 auto GeckoAppShell::CreateShortcut(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> void
 {
-    return mozilla::jni::Method<CreateShortcut_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<CreateShortcut_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::CreateThreadCursorWrapper_t::name[];
@@ -131,7 +135,7 @@ constexpr char GeckoAppShell::CreateThreadCursorWrapper_t::signature[];
 
 auto GeckoAppShell::CreateThreadCursorWrapper(int32_t a0) -> void
 {
-    return mozilla::jni::Method<CreateThreadCursorWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<CreateThreadCursorWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::DeleteMessageWrapper_t::name[];
@@ -139,7 +143,7 @@ constexpr char GeckoAppShell::DeleteMessageWrapper_t::signature[];
 
 auto GeckoAppShell::DeleteMessageWrapper(int32_t a0, int32_t a1) -> void
 {
-    return mozilla::jni::Method<DeleteMessageWrapper_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<DeleteMessageWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::DisableAlarm_t::name[];
@@ -147,7 +151,7 @@ constexpr char GeckoAppShell::DisableAlarm_t::signature[];
 
 auto GeckoAppShell::DisableAlarm() -> void
 {
-    return mozilla::jni::Method<DisableAlarm_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<DisableAlarm_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::DisableBatteryNotifications_t::name[];
@@ -155,7 +159,7 @@ constexpr char GeckoAppShell::DisableBatteryNotifications_t::signature[];
 
 auto GeckoAppShell::DisableBatteryNotifications() -> void
 {
-    return mozilla::jni::Method<DisableBatteryNotifications_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<DisableBatteryNotifications_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::DisableNetworkNotifications_t::name[];
@@ -163,7 +167,7 @@ constexpr char GeckoAppShell::DisableNetworkNotifications_t::signature[];
 
 auto GeckoAppShell::DisableNetworkNotifications() -> void
 {
-    return mozilla::jni::Method<DisableNetworkNotifications_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<DisableNetworkNotifications_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::DisableScreenOrientationNotifications_t::name[];
@@ -171,7 +175,7 @@ constexpr char GeckoAppShell::DisableScreenOrientationNotifications_t::signature
 
 auto GeckoAppShell::DisableScreenOrientationNotifications() -> void
 {
-    return mozilla::jni::Method<DisableScreenOrientationNotifications_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<DisableScreenOrientationNotifications_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::DisableSensor_t::name[];
@@ -179,7 +183,7 @@ constexpr char GeckoAppShell::DisableSensor_t::signature[];
 
 auto GeckoAppShell::DisableSensor(int32_t a0) -> void
 {
-    return mozilla::jni::Method<DisableSensor_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<DisableSensor_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::EnableBatteryNotifications_t::name[];
@@ -187,7 +191,7 @@ constexpr char GeckoAppShell::EnableBatteryNotifications_t::signature[];
 
 auto GeckoAppShell::EnableBatteryNotifications() -> void
 {
-    return mozilla::jni::Method<EnableBatteryNotifications_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<EnableBatteryNotifications_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::EnableLocation_t::name[];
@@ -195,7 +199,7 @@ constexpr char GeckoAppShell::EnableLocation_t::signature[];
 
 auto GeckoAppShell::EnableLocation(bool a0) -> void
 {
-    return mozilla::jni::Method<EnableLocation_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<EnableLocation_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::EnableLocationHighAccuracy_t::name[];
@@ -203,7 +207,7 @@ constexpr char GeckoAppShell::EnableLocationHighAccuracy_t::signature[];
 
 auto GeckoAppShell::EnableLocationHighAccuracy(bool a0) -> void
 {
-    return mozilla::jni::Method<EnableLocationHighAccuracy_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<EnableLocationHighAccuracy_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::EnableNetworkNotifications_t::name[];
@@ -211,7 +215,7 @@ constexpr char GeckoAppShell::EnableNetworkNotifications_t::signature[];
 
 auto GeckoAppShell::EnableNetworkNotifications() -> void
 {
-    return mozilla::jni::Method<EnableNetworkNotifications_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<EnableNetworkNotifications_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::EnableScreenOrientationNotifications_t::name[];
@@ -219,7 +223,7 @@ constexpr char GeckoAppShell::EnableScreenOrientationNotifications_t::signature[
 
 auto GeckoAppShell::EnableScreenOrientationNotifications() -> void
 {
-    return mozilla::jni::Method<EnableScreenOrientationNotifications_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<EnableScreenOrientationNotifications_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::EnableSensor_t::name[];
@@ -227,7 +231,7 @@ constexpr char GeckoAppShell::EnableSensor_t::signature[];
 
 auto GeckoAppShell::EnableSensor(int32_t a0) -> void
 {
-    return mozilla::jni::Method<EnableSensor_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<EnableSensor_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GamepadAdded_t::name[];
@@ -235,7 +239,7 @@ constexpr char GeckoAppShell::GamepadAdded_t::signature[];
 
 auto GeckoAppShell::GamepadAdded(int32_t a0, int32_t a1) -> void
 {
-    return mozilla::jni::Method<GamepadAdded_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<GamepadAdded_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::GetConnection_t::name[];
@@ -243,7 +247,7 @@ constexpr char GeckoAppShell::GetConnection_t::signature[];
 
 auto GeckoAppShell::GetConnection(mozilla::jni::String::Param a0) -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetConnection_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetConnection_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GetContext_t::name[];
@@ -251,7 +255,7 @@ constexpr char GeckoAppShell::GetContext_t::signature[];
 
 auto GeckoAppShell::GetContext() -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetContext_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetContext_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetCurrentBatteryInformationWrapper_t::name[];
@@ -259,7 +263,7 @@ constexpr char GeckoAppShell::GetCurrentBatteryInformationWrapper_t::signature[]
 
 auto GeckoAppShell::GetCurrentBatteryInformationWrapper() -> mozilla::jni::DoubleArray::LocalRef
 {
-    return mozilla::jni::Method<GetCurrentBatteryInformationWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetCurrentBatteryInformationWrapper_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetCurrentNetworkInformationWrapper_t::name[];
@@ -267,7 +271,7 @@ constexpr char GeckoAppShell::GetCurrentNetworkInformationWrapper_t::signature[]
 
 auto GeckoAppShell::GetCurrentNetworkInformationWrapper() -> mozilla::jni::DoubleArray::LocalRef
 {
-    return mozilla::jni::Method<GetCurrentNetworkInformationWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetCurrentNetworkInformationWrapper_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetDensity_t::name[];
@@ -275,7 +279,7 @@ constexpr char GeckoAppShell::GetDensity_t::signature[];
 
 auto GeckoAppShell::GetDensity() -> float
 {
-    return mozilla::jni::Method<GetDensity_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetDensity_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetDpiWrapper_t::name[];
@@ -283,7 +287,7 @@ constexpr char GeckoAppShell::GetDpiWrapper_t::signature[];
 
 auto GeckoAppShell::GetDpiWrapper() -> int32_t
 {
-    return mozilla::jni::Method<GetDpiWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetDpiWrapper_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetExtensionFromMimeTypeWrapper_t::name[];
@@ -291,7 +295,7 @@ constexpr char GeckoAppShell::GetExtensionFromMimeTypeWrapper_t::signature[];
 
 auto GeckoAppShell::GetExtensionFromMimeTypeWrapper(mozilla::jni::String::Param a0) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetExtensionFromMimeTypeWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetExtensionFromMimeTypeWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GetExternalPublicDirectory_t::name[];
@@ -299,7 +303,7 @@ constexpr char GeckoAppShell::GetExternalPublicDirectory_t::signature[];
 
 auto GeckoAppShell::GetExternalPublicDirectory(mozilla::jni::String::Param a0) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetExternalPublicDirectory_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetExternalPublicDirectory_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GetHWDecoderCapability_t::name[];
@@ -307,7 +311,7 @@ constexpr char GeckoAppShell::GetHWDecoderCapability_t::signature[];
 
 auto GeckoAppShell::GetHWDecoderCapability() -> bool
 {
-    return mozilla::jni::Method<GetHWDecoderCapability_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetHWDecoderCapability_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetHWEncoderCapability_t::name[];
@@ -315,7 +319,7 @@ constexpr char GeckoAppShell::GetHWEncoderCapability_t::signature[];
 
 auto GeckoAppShell::GetHWEncoderCapability() -> bool
 {
-    return mozilla::jni::Method<GetHWEncoderCapability_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetHWEncoderCapability_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetHandlersForMimeTypeWrapper_t::name[];
@@ -323,7 +327,7 @@ constexpr char GeckoAppShell::GetHandlersForMimeTypeWrapper_t::signature[];
 
 auto GeckoAppShell::GetHandlersForMimeTypeWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> mozilla::jni::ObjectArray::LocalRef
 {
-    return mozilla::jni::Method<GetHandlersForMimeTypeWrapper_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<GetHandlersForMimeTypeWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::GetHandlersForURLWrapper_t::name[];
@@ -331,7 +335,7 @@ constexpr char GeckoAppShell::GetHandlersForURLWrapper_t::signature[];
 
 auto GeckoAppShell::GetHandlersForURLWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> mozilla::jni::ObjectArray::LocalRef
 {
-    return mozilla::jni::Method<GetHandlersForURLWrapper_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<GetHandlersForURLWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::GetIconForExtensionWrapper_t::name[];
@@ -339,7 +343,7 @@ constexpr char GeckoAppShell::GetIconForExtensionWrapper_t::signature[];
 
 auto GeckoAppShell::GetIconForExtensionWrapper(mozilla::jni::String::Param a0, int32_t a1) -> mozilla::jni::ByteArray::LocalRef
 {
-    return mozilla::jni::Method<GetIconForExtensionWrapper_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<GetIconForExtensionWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::GetMaxTouchPoints_t::name[];
@@ -347,7 +351,7 @@ constexpr char GeckoAppShell::GetMaxTouchPoints_t::signature[];
 
 auto GeckoAppShell::GetMaxTouchPoints() -> int32_t
 {
-    return mozilla::jni::Method<GetMaxTouchPoints_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetMaxTouchPoints_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetMessageWrapper_t::name[];
@@ -355,7 +359,7 @@ constexpr char GeckoAppShell::GetMessageWrapper_t::signature[];
 
 auto GeckoAppShell::GetMessageWrapper(int32_t a0, int32_t a1) -> void
 {
-    return mozilla::jni::Method<GetMessageWrapper_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<GetMessageWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::GetMimeTypeFromExtensionsWrapper_t::name[];
@@ -363,7 +367,7 @@ constexpr char GeckoAppShell::GetMimeTypeFromExtensionsWrapper_t::signature[];
 
 auto GeckoAppShell::GetMimeTypeFromExtensionsWrapper(mozilla::jni::String::Param a0) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetMimeTypeFromExtensionsWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetMimeTypeFromExtensionsWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GetNextMessageWrapper_t::name[];
@@ -371,7 +375,7 @@ constexpr char GeckoAppShell::GetNextMessageWrapper_t::signature[];
 
 auto GeckoAppShell::GetNextMessageWrapper(int32_t a0) -> void
 {
-    return mozilla::jni::Method<GetNextMessageWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetNextMessageWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GetNextThreadWrapper_t::name[];
@@ -379,7 +383,7 @@ constexpr char GeckoAppShell::GetNextThreadWrapper_t::signature[];
 
 auto GeckoAppShell::GetNextThreadWrapper(int32_t a0) -> void
 {
-    return mozilla::jni::Method<GetNextThreadWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetNextThreadWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::GetProxyForURIWrapper_t::name[];
@@ -387,7 +391,7 @@ constexpr char GeckoAppShell::GetProxyForURIWrapper_t::signature[];
 
 auto GeckoAppShell::GetProxyForURIWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, int32_t a3) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetProxyForURIWrapper_t>::Call(nullptr, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<GetProxyForURIWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoAppShell::GetScreenAngle_t::name[];
@@ -395,7 +399,7 @@ constexpr char GeckoAppShell::GetScreenAngle_t::signature[];
 
 auto GeckoAppShell::GetScreenAngle() -> int32_t
 {
-    return mozilla::jni::Method<GetScreenAngle_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetScreenAngle_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetScreenDepthWrapper_t::name[];
@@ -403,7 +407,7 @@ constexpr char GeckoAppShell::GetScreenDepthWrapper_t::signature[];
 
 auto GeckoAppShell::GetScreenDepthWrapper() -> int32_t
 {
-    return mozilla::jni::Method<GetScreenDepthWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetScreenDepthWrapper_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetScreenOrientationWrapper_t::name[];
@@ -411,7 +415,7 @@ constexpr char GeckoAppShell::GetScreenOrientationWrapper_t::signature[];
 
 auto GeckoAppShell::GetScreenOrientationWrapper() -> int16_t
 {
-    return mozilla::jni::Method<GetScreenOrientationWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetScreenOrientationWrapper_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetScreenSize_t::name[];
@@ -419,7 +423,7 @@ constexpr char GeckoAppShell::GetScreenSize_t::signature[];
 
 auto GeckoAppShell::GetScreenSize() -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetScreenSize_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetScreenSize_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetShowPasswordSetting_t::name[];
@@ -427,7 +431,7 @@ constexpr char GeckoAppShell::GetShowPasswordSetting_t::signature[];
 
 auto GeckoAppShell::GetShowPasswordSetting() -> bool
 {
-    return mozilla::jni::Method<GetShowPasswordSetting_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetShowPasswordSetting_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::GetSystemColoursWrapper_t::name[];
@@ -435,7 +439,7 @@ constexpr char GeckoAppShell::GetSystemColoursWrapper_t::signature[];
 
 auto GeckoAppShell::GetSystemColoursWrapper() -> mozilla::jni::IntArray::LocalRef
 {
-    return mozilla::jni::Method<GetSystemColoursWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetSystemColoursWrapper_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::HandleGeckoMessageWrapper_t::name[];
@@ -443,7 +447,7 @@ constexpr char GeckoAppShell::HandleGeckoMessageWrapper_t::signature[];
 
 auto GeckoAppShell::HandleGeckoMessageWrapper(mozilla::jni::Object::Param a0) -> void
 {
-    return mozilla::jni::Method<HandleGeckoMessageWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<HandleGeckoMessageWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::HandleUncaughtException_t::name[];
@@ -451,7 +455,7 @@ constexpr char GeckoAppShell::HandleUncaughtException_t::signature[];
 
 auto GeckoAppShell::HandleUncaughtException(mozilla::jni::Throwable::Param a0) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<HandleUncaughtException_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<HandleUncaughtException_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::HideProgressDialog_t::name[];
@@ -459,7 +463,7 @@ constexpr char GeckoAppShell::HideProgressDialog_t::signature[];
 
 auto GeckoAppShell::HideProgressDialog() -> void
 {
-    return mozilla::jni::Method<HideProgressDialog_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<HideProgressDialog_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::InitCameraWrapper_t::name[];
@@ -467,7 +471,7 @@ constexpr char GeckoAppShell::InitCameraWrapper_t::signature[];
 
 auto GeckoAppShell::InitCameraWrapper(mozilla::jni::String::Param a0, int32_t a1, int32_t a2, int32_t a3) -> mozilla::jni::IntArray::LocalRef
 {
-    return mozilla::jni::Method<InitCameraWrapper_t>::Call(nullptr, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<InitCameraWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoAppShell::IsNetworkLinkKnown_t::name[];
@@ -475,7 +479,7 @@ constexpr char GeckoAppShell::IsNetworkLinkKnown_t::signature[];
 
 auto GeckoAppShell::IsNetworkLinkKnown() -> bool
 {
-    return mozilla::jni::Method<IsNetworkLinkKnown_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<IsNetworkLinkKnown_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::IsNetworkLinkUp_t::name[];
@@ -483,7 +487,7 @@ constexpr char GeckoAppShell::IsNetworkLinkUp_t::signature[];
 
 auto GeckoAppShell::IsNetworkLinkUp() -> bool
 {
-    return mozilla::jni::Method<IsNetworkLinkUp_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<IsNetworkLinkUp_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::IsTablet_t::name[];
@@ -491,7 +495,7 @@ constexpr char GeckoAppShell::IsTablet_t::signature[];
 
 auto GeckoAppShell::IsTablet() -> bool
 {
-    return mozilla::jni::Method<IsTablet_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<IsTablet_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::KillAnyZombies_t::name[];
@@ -499,15 +503,15 @@ constexpr char GeckoAppShell::KillAnyZombies_t::signature[];
 
 auto GeckoAppShell::KillAnyZombies() -> void
 {
-    return mozilla::jni::Method<KillAnyZombies_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<KillAnyZombies_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::LoadPluginClass_t::name[];
 constexpr char GeckoAppShell::LoadPluginClass_t::signature[];
 
-auto GeckoAppShell::LoadPluginClass(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> mozilla::jni::ClassObject::LocalRef
+auto GeckoAppShell::LoadPluginClass(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> mozilla::jni::Class::LocalRef
 {
-    return mozilla::jni::Method<LoadPluginClass_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<LoadPluginClass_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::LockScreenOrientation_t::name[];
@@ -515,7 +519,7 @@ constexpr char GeckoAppShell::LockScreenOrientation_t::signature[];
 
 auto GeckoAppShell::LockScreenOrientation(int32_t a0) -> void
 {
-    return mozilla::jni::Method<LockScreenOrientation_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<LockScreenOrientation_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::MarkMessageRead_t::name[];
@@ -523,7 +527,7 @@ constexpr char GeckoAppShell::MarkMessageRead_t::signature[];
 
 auto GeckoAppShell::MarkMessageRead(int32_t a0, bool a1, bool a2, int32_t a3) -> void
 {
-    return mozilla::jni::Method<MarkMessageRead_t>::Call(nullptr, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<MarkMessageRead_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoAppShell::MarkURIVisited_t::name[];
@@ -531,7 +535,7 @@ constexpr char GeckoAppShell::MarkURIVisited_t::signature[];
 
 auto GeckoAppShell::MarkURIVisited(mozilla::jni::String::Param a0) -> void
 {
-    return mozilla::jni::Method<MarkURIVisited_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<MarkURIVisited_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::MoveTaskToBack_t::name[];
@@ -539,7 +543,7 @@ constexpr char GeckoAppShell::MoveTaskToBack_t::signature[];
 
 auto GeckoAppShell::MoveTaskToBack() -> void
 {
-    return mozilla::jni::Method<MoveTaskToBack_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<MoveTaskToBack_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::NetworkLinkType_t::name[];
@@ -547,7 +551,7 @@ constexpr char GeckoAppShell::NetworkLinkType_t::signature[];
 
 auto GeckoAppShell::NetworkLinkType() -> int32_t
 {
-    return mozilla::jni::Method<NetworkLinkType_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<NetworkLinkType_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::NotifyDefaultPrevented_t::name[];
@@ -555,7 +559,7 @@ constexpr char GeckoAppShell::NotifyDefaultPrevented_t::signature[];
 
 auto GeckoAppShell::NotifyDefaultPrevented(bool a0) -> void
 {
-    return mozilla::jni::Method<NotifyDefaultPrevented_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<NotifyDefaultPrevented_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::NotifyWakeLockChanged_t::name[];
@@ -563,7 +567,7 @@ constexpr char GeckoAppShell::NotifyWakeLockChanged_t::signature[];
 
 auto GeckoAppShell::NotifyWakeLockChanged(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> void
 {
-    return mozilla::jni::Method<NotifyWakeLockChanged_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<NotifyWakeLockChanged_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::OpenUriExternal_t::name[];
@@ -571,7 +575,7 @@ constexpr char GeckoAppShell::OpenUriExternal_t::signature[];
 
 auto GeckoAppShell::OpenUriExternal(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, mozilla::jni::String::Param a4, mozilla::jni::String::Param a5) -> bool
 {
-    return mozilla::jni::Method<OpenUriExternal_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4, a5);
+    return mozilla::jni::Method<OpenUriExternal_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5);
 }
 
 constexpr char GeckoAppShell::PerformHapticFeedback_t::name[];
@@ -579,7 +583,7 @@ constexpr char GeckoAppShell::PerformHapticFeedback_t::signature[];
 
 auto GeckoAppShell::PerformHapticFeedback(bool a0) -> void
 {
-    return mozilla::jni::Method<PerformHapticFeedback_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<PerformHapticFeedback_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::RegisterSurfaceTextureFrameListener_t::name[];
@@ -587,7 +591,7 @@ constexpr char GeckoAppShell::RegisterSurfaceTextureFrameListener_t::signature[]
 
 auto GeckoAppShell::RegisterSurfaceTextureFrameListener(mozilla::jni::Object::Param a0, int32_t a1) -> void
 {
-    return mozilla::jni::Method<RegisterSurfaceTextureFrameListener_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<RegisterSurfaceTextureFrameListener_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::RemovePluginView_t::name[];
@@ -595,7 +599,7 @@ constexpr char GeckoAppShell::RemovePluginView_t::signature[];
 
 auto GeckoAppShell::RemovePluginView(mozilla::jni::Object::Param a0, bool a1) -> void
 {
-    return mozilla::jni::Method<RemovePluginView_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<RemovePluginView_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::RequestUiThreadCallback_t::name[];
@@ -603,7 +607,7 @@ constexpr char GeckoAppShell::RequestUiThreadCallback_t::signature[];
 
 auto GeckoAppShell::RequestUiThreadCallback(int64_t a0) -> void
 {
-    return mozilla::jni::Method<RequestUiThreadCallback_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<RequestUiThreadCallback_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::ScheduleRestart_t::name[];
@@ -611,7 +615,7 @@ constexpr char GeckoAppShell::ScheduleRestart_t::signature[];
 
 auto GeckoAppShell::ScheduleRestart() -> void
 {
-    return mozilla::jni::Method<ScheduleRestart_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<ScheduleRestart_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::SendMessageWrapper_t::name[];
@@ -619,7 +623,7 @@ constexpr char GeckoAppShell::SendMessageWrapper_t::signature[];
 
 auto GeckoAppShell::SendMessageWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1, int32_t a2) -> void
 {
-    return mozilla::jni::Method<SendMessageWrapper_t>::Call(nullptr, nullptr, a0, a1, a2);
+    return mozilla::jni::Method<SendMessageWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2);
 }
 
 constexpr char GeckoAppShell::SetAlarm_t::name[];
@@ -627,7 +631,7 @@ constexpr char GeckoAppShell::SetAlarm_t::signature[];
 
 auto GeckoAppShell::SetAlarm(int32_t a0, int32_t a1) -> bool
 {
-    return mozilla::jni::Method<SetAlarm_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<SetAlarm_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::SetFullScreen_t::name[];
@@ -635,7 +639,7 @@ constexpr char GeckoAppShell::SetFullScreen_t::signature[];
 
 auto GeckoAppShell::SetFullScreen(bool a0) -> void
 {
-    return mozilla::jni::Method<SetFullScreen_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<SetFullScreen_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::SetKeepScreenOn_t::name[];
@@ -643,7 +647,7 @@ constexpr char GeckoAppShell::SetKeepScreenOn_t::signature[];
 
 auto GeckoAppShell::SetKeepScreenOn(bool a0) -> void
 {
-    return mozilla::jni::Method<SetKeepScreenOn_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<SetKeepScreenOn_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::SetScreenDepthOverride_t::name[];
@@ -651,7 +655,7 @@ constexpr char GeckoAppShell::SetScreenDepthOverride_t::signature[];
 
 auto GeckoAppShell::SetScreenDepthOverride(int32_t a0) -> void
 {
-    return mozilla::jni::Method<SetScreenDepthOverride_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<SetScreenDepthOverride_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::SetURITitle_t::name[];
@@ -659,7 +663,7 @@ constexpr char GeckoAppShell::SetURITitle_t::signature[];
 
 auto GeckoAppShell::SetURITitle(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> void
 {
-    return mozilla::jni::Method<SetURITitle_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<SetURITitle_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoAppShell::ShowAlertNotificationWrapper_t::name[];
@@ -667,7 +671,7 @@ constexpr char GeckoAppShell::ShowAlertNotificationWrapper_t::signature[];
 
 auto GeckoAppShell::ShowAlertNotificationWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, mozilla::jni::String::Param a4, mozilla::jni::String::Param a5) -> void
 {
-    return mozilla::jni::Method<ShowAlertNotificationWrapper_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4, a5);
+    return mozilla::jni::Method<ShowAlertNotificationWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5);
 }
 
 constexpr char GeckoAppShell::ShowInputMethodPicker_t::name[];
@@ -675,7 +679,7 @@ constexpr char GeckoAppShell::ShowInputMethodPicker_t::signature[];
 
 auto GeckoAppShell::ShowInputMethodPicker() -> void
 {
-    return mozilla::jni::Method<ShowInputMethodPicker_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<ShowInputMethodPicker_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::StartMonitoringGamepad_t::name[];
@@ -683,7 +687,7 @@ constexpr char GeckoAppShell::StartMonitoringGamepad_t::signature[];
 
 auto GeckoAppShell::StartMonitoringGamepad() -> void
 {
-    return mozilla::jni::Method<StartMonitoringGamepad_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<StartMonitoringGamepad_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::StopMonitoringGamepad_t::name[];
@@ -691,7 +695,7 @@ constexpr char GeckoAppShell::StopMonitoringGamepad_t::signature[];
 
 auto GeckoAppShell::StopMonitoringGamepad() -> void
 {
-    return mozilla::jni::Method<StopMonitoringGamepad_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<StopMonitoringGamepad_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::UnlockProfile_t::name[];
@@ -699,7 +703,7 @@ constexpr char GeckoAppShell::UnlockProfile_t::signature[];
 
 auto GeckoAppShell::UnlockProfile() -> bool
 {
-    return mozilla::jni::Method<UnlockProfile_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<UnlockProfile_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::UnlockScreenOrientation_t::name[];
@@ -707,7 +711,7 @@ constexpr char GeckoAppShell::UnlockScreenOrientation_t::signature[];
 
 auto GeckoAppShell::UnlockScreenOrientation() -> void
 {
-    return mozilla::jni::Method<UnlockScreenOrientation_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<UnlockScreenOrientation_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
 constexpr char GeckoAppShell::UnregisterSurfaceTextureFrameListener_t::name[];
@@ -715,7 +719,7 @@ constexpr char GeckoAppShell::UnregisterSurfaceTextureFrameListener_t::signature
 
 auto GeckoAppShell::UnregisterSurfaceTextureFrameListener(mozilla::jni::Object::Param a0) -> void
 {
-    return mozilla::jni::Method<UnregisterSurfaceTextureFrameListener_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<UnregisterSurfaceTextureFrameListener_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::Vibrate1_t::name[];
@@ -723,7 +727,7 @@ constexpr char GeckoAppShell::Vibrate1_t::signature[];
 
 auto GeckoAppShell::Vibrate1(int64_t a0) -> void
 {
-    return mozilla::jni::Method<Vibrate1_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<Vibrate1_t>::Call(GeckoAppShell::Context(), nullptr, a0);
 }
 
 constexpr char GeckoAppShell::VibrateA_t::name[];
@@ -731,17 +735,18 @@ constexpr char GeckoAppShell::VibrateA_t::signature[];
 
 auto GeckoAppShell::VibrateA(mozilla::jni::LongArray::Param a0, int32_t a1) -> void
 {
-    return mozilla::jni::Method<VibrateA_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<VibrateA_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1);
 }
 
-constexpr char GeckoEditable::name[];
+template<> const char mozilla::jni::Context<GeckoEditable, jobject>::name[] =
+        "org/mozilla/gecko/GeckoEditable";
 
 constexpr char GeckoEditable::New_t::name[];
 constexpr char GeckoEditable::New_t::signature[];
 
 auto GeckoEditable::New(mozilla::jni::Object::Param a0) -> GeckoEditable::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Constructor<New_t>::Call(GeckoEditable::Context(), nullptr, a0);
 }
 
 constexpr char GeckoEditable::DisposeNative_t::name[];
@@ -752,7 +757,7 @@ constexpr char GeckoEditable::NotifyIME_t::signature[];
 
 auto GeckoEditable::NotifyIME(int32_t a0) const -> void
 {
-    return mozilla::jni::Method<NotifyIME_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<NotifyIME_t>::Call(GeckoEditable::mCtx, nullptr, a0);
 }
 
 constexpr char GeckoEditable::NotifyIMEContext_t::name[];
@@ -760,7 +765,7 @@ constexpr char GeckoEditable::NotifyIMEContext_t::signature[];
 
 auto GeckoEditable::NotifyIMEContext(int32_t a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3) const -> void
 {
-    return mozilla::jni::Method<NotifyIMEContext_t>::Call(this, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<NotifyIMEContext_t>::Call(GeckoEditable::mCtx, nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoEditable::OnImeAcknowledgeFocus_t::name[];
@@ -786,7 +791,7 @@ constexpr char GeckoEditable::OnSelectionChange_t::signature[];
 
 auto GeckoEditable::OnSelectionChange(int32_t a0, int32_t a1) const -> void
 {
-    return mozilla::jni::Method<OnSelectionChange_t>::Call(this, nullptr, a0, a1);
+    return mozilla::jni::Method<OnSelectionChange_t>::Call(GeckoEditable::mCtx, nullptr, a0, a1);
 }
 
 constexpr char GeckoEditable::OnTextChange_t::name[];
@@ -794,7 +799,7 @@ constexpr char GeckoEditable::OnTextChange_t::signature[];
 
 auto GeckoEditable::OnTextChange(mozilla::jni::String::Param a0, int32_t a1, int32_t a2, int32_t a3) const -> void
 {
-    return mozilla::jni::Method<OnTextChange_t>::Call(this, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<OnTextChange_t>::Call(GeckoEditable::mCtx, nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoEditable::OnViewChange_t::name[];
@@ -802,19 +807,21 @@ constexpr char GeckoEditable::OnViewChange_t::signature[];
 
 auto GeckoEditable::OnViewChange(mozilla::jni::Object::Param a0) const -> void
 {
-    return mozilla::jni::Method<OnViewChange_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<OnViewChange_t>::Call(GeckoEditable::mCtx, nullptr, a0);
 }
 
-constexpr char GeckoEditableListener::name[];
+template<> const char mozilla::jni::Context<GeckoEditableListener, jobject>::name[] =
+        "org/mozilla/gecko/GeckoEditableListener";
 
-constexpr char GeckoJavaSampler::name[];
+template<> const char mozilla::jni::Context<GeckoJavaSampler, jobject>::name[] =
+        "org/mozilla/gecko/GeckoJavaSampler";
 
 constexpr char GeckoJavaSampler::GetFrameNameJavaProfilingWrapper_t::name[];
 constexpr char GeckoJavaSampler::GetFrameNameJavaProfilingWrapper_t::signature[];
 
 auto GeckoJavaSampler::GetFrameNameJavaProfilingWrapper(int32_t a0, int32_t a1, int32_t a2) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetFrameNameJavaProfilingWrapper_t>::Call(nullptr, nullptr, a0, a1, a2);
+    return mozilla::jni::Method<GetFrameNameJavaProfilingWrapper_t>::Call(GeckoJavaSampler::Context(), nullptr, a0, a1, a2);
 }
 
 constexpr char GeckoJavaSampler::GetProfilerTime_t::name[];
@@ -825,7 +832,7 @@ constexpr char GeckoJavaSampler::GetSampleTimeJavaProfiling_t::signature[];
 
 auto GeckoJavaSampler::GetSampleTimeJavaProfiling(int32_t a0, int32_t a1) -> double
 {
-    return mozilla::jni::Method<GetSampleTimeJavaProfiling_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<GetSampleTimeJavaProfiling_t>::Call(GeckoJavaSampler::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoJavaSampler::GetThreadNameJavaProfilingWrapper_t::name[];
@@ -833,7 +840,7 @@ constexpr char GeckoJavaSampler::GetThreadNameJavaProfilingWrapper_t::signature[
 
 auto GeckoJavaSampler::GetThreadNameJavaProfilingWrapper(int32_t a0) -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetThreadNameJavaProfilingWrapper_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<GetThreadNameJavaProfilingWrapper_t>::Call(GeckoJavaSampler::Context(), nullptr, a0);
 }
 
 constexpr char GeckoJavaSampler::PauseJavaProfiling_t::name[];
@@ -841,7 +848,7 @@ constexpr char GeckoJavaSampler::PauseJavaProfiling_t::signature[];
 
 auto GeckoJavaSampler::PauseJavaProfiling() -> void
 {
-    return mozilla::jni::Method<PauseJavaProfiling_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<PauseJavaProfiling_t>::Call(GeckoJavaSampler::Context(), nullptr);
 }
 
 constexpr char GeckoJavaSampler::StartJavaProfiling_t::name[];
@@ -849,7 +856,7 @@ constexpr char GeckoJavaSampler::StartJavaProfiling_t::signature[];
 
 auto GeckoJavaSampler::StartJavaProfiling(int32_t a0, int32_t a1) -> void
 {
-    return mozilla::jni::Method<StartJavaProfiling_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<StartJavaProfiling_t>::Call(GeckoJavaSampler::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoJavaSampler::StopJavaProfiling_t::name[];
@@ -857,7 +864,7 @@ constexpr char GeckoJavaSampler::StopJavaProfiling_t::signature[];
 
 auto GeckoJavaSampler::StopJavaProfiling() -> void
 {
-    return mozilla::jni::Method<StopJavaProfiling_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<StopJavaProfiling_t>::Call(GeckoJavaSampler::Context(), nullptr);
 }
 
 constexpr char GeckoJavaSampler::UnpauseJavaProfiling_t::name[];
@@ -865,10 +872,11 @@ constexpr char GeckoJavaSampler::UnpauseJavaProfiling_t::signature[];
 
 auto GeckoJavaSampler::UnpauseJavaProfiling() -> void
 {
-    return mozilla::jni::Method<UnpauseJavaProfiling_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<UnpauseJavaProfiling_t>::Call(GeckoJavaSampler::Context(), nullptr);
 }
 
-constexpr char GeckoSmsManager::name[];
+template<> const char mozilla::jni::Context<GeckoSmsManager, jobject>::name[] =
+        "org/mozilla/gecko/GeckoSmsManager";
 
 constexpr char GeckoSmsManager::NotifyCursorDone_t::name[];
 constexpr char GeckoSmsManager::NotifyCursorDone_t::signature[];
@@ -912,14 +920,15 @@ constexpr char GeckoSmsManager::NotifySmsSent_t::signature[];
 constexpr char GeckoSmsManager::NotifyThreadCursorResult_t::name[];
 constexpr char GeckoSmsManager::NotifyThreadCursorResult_t::signature[];
 
-constexpr char GeckoThread::name[];
+template<> const char mozilla::jni::Context<GeckoThread, jobject>::name[] =
+        "org/mozilla/gecko/GeckoThread";
 
 constexpr char GeckoThread::CheckAndSetState_t::name[];
 constexpr char GeckoThread::CheckAndSetState_t::signature[];
 
 auto GeckoThread::CheckAndSetState(mozilla::jni::Object::Param a0, mozilla::jni::Object::Param a1) -> bool
 {
-    return mozilla::jni::Method<CheckAndSetState_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<CheckAndSetState_t>::Call(GeckoThread::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoThread::PumpMessageLoop_t::name[];
@@ -927,7 +936,7 @@ constexpr char GeckoThread::PumpMessageLoop_t::signature[];
 
 auto GeckoThread::PumpMessageLoop(mozilla::jni::Object::Param a0) -> bool
 {
-    return mozilla::jni::Method<PumpMessageLoop_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<PumpMessageLoop_t>::Call(GeckoThread::Context(), nullptr, a0);
 }
 
 constexpr char GeckoThread::SetState_t::name[];
@@ -935,7 +944,7 @@ constexpr char GeckoThread::SetState_t::signature[];
 
 auto GeckoThread::SetState(mozilla::jni::Object::Param a0) -> void
 {
-    return mozilla::jni::Method<SetState_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<SetState_t>::Call(GeckoThread::Context(), nullptr, a0);
 }
 
 constexpr char GeckoThread::SpeculativeConnect_t::name[];
@@ -946,7 +955,7 @@ constexpr char GeckoThread::ClsLoader_t::signature[];
 
 auto GeckoThread::ClsLoader() -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<ClsLoader_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<ClsLoader_t>::Get(GeckoThread::Context(), nullptr);
 }
 
 constexpr char GeckoThread::MsgQueue_t::name[];
@@ -954,22 +963,23 @@ constexpr char GeckoThread::MsgQueue_t::signature[];
 
 auto GeckoThread::MsgQueue() -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<MsgQueue_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<MsgQueue_t>::Get(GeckoThread::Context(), nullptr);
 }
 
 auto GeckoThread::MsgQueue(mozilla::jni::Object::Param a0) -> void
 {
-    return mozilla::jni::Field<MsgQueue_t>::Set(nullptr, nullptr, a0);
+    return mozilla::jni::Field<MsgQueue_t>::Set(GeckoThread::Context(), nullptr, a0);
 }
 
-constexpr char GeckoThread::State::name[];
+template<> const char mozilla::jni::Context<GeckoThread::State, jobject>::name[] =
+        "org/mozilla/gecko/GeckoThread$State";
 
 constexpr char GeckoThread::State::New_t::name[];
 constexpr char GeckoThread::State::New_t::signature[];
 
 auto GeckoThread::State::New(mozilla::jni::String::Param a0, int32_t a1) -> State::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Constructor<New_t>::Call(State::Context(), nullptr, a0, a1);
 }
 
 constexpr char GeckoThread::State::Is_t::name[];
@@ -977,7 +987,7 @@ constexpr char GeckoThread::State::Is_t::signature[];
 
 auto GeckoThread::State::Is(State::Param a0) const -> bool
 {
-    return mozilla::jni::Method<Is_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<Is_t>::Call(State::mCtx, nullptr, a0);
 }
 
 constexpr char GeckoThread::State::IsAtLeast_t::name[];
@@ -985,7 +995,7 @@ constexpr char GeckoThread::State::IsAtLeast_t::signature[];
 
 auto GeckoThread::State::IsAtLeast(State::Param a0) const -> bool
 {
-    return mozilla::jni::Method<IsAtLeast_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<IsAtLeast_t>::Call(State::mCtx, nullptr, a0);
 }
 
 constexpr char GeckoThread::State::IsAtMost_t::name[];
@@ -993,7 +1003,7 @@ constexpr char GeckoThread::State::IsAtMost_t::signature[];
 
 auto GeckoThread::State::IsAtMost(State::Param a0) const -> bool
 {
-    return mozilla::jni::Method<IsAtMost_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<IsAtMost_t>::Call(State::mCtx, nullptr, a0);
 }
 
 constexpr char GeckoThread::State::IsBetween_t::name[];
@@ -1001,7 +1011,7 @@ constexpr char GeckoThread::State::IsBetween_t::signature[];
 
 auto GeckoThread::State::IsBetween(State::Param a0, State::Param a1) const -> bool
 {
-    return mozilla::jni::Method<IsBetween_t>::Call(this, nullptr, a0, a1);
+    return mozilla::jni::Method<IsBetween_t>::Call(State::mCtx, nullptr, a0, a1);
 }
 
 constexpr char GeckoThread::State::ValueOf_t::name[];
@@ -1009,7 +1019,7 @@ constexpr char GeckoThread::State::ValueOf_t::signature[];
 
 auto GeckoThread::State::ValueOf(mozilla::jni::String::Param a0) -> State::LocalRef
 {
-    return mozilla::jni::Method<ValueOf_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<ValueOf_t>::Call(State::Context(), nullptr, a0);
 }
 
 constexpr char GeckoThread::State::Values_t::name[];
@@ -1017,7 +1027,7 @@ constexpr char GeckoThread::State::Values_t::signature[];
 
 auto GeckoThread::State::Values() -> mozilla::jni::ObjectArray::LocalRef
 {
-    return mozilla::jni::Method<Values_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<Values_t>::Call(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::EXITED_t::name[];
@@ -1025,7 +1035,7 @@ constexpr char GeckoThread::State::EXITED_t::signature[];
 
 auto GeckoThread::State::EXITED() -> State::LocalRef
 {
-    return mozilla::jni::Field<EXITED_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<EXITED_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::EXITING_t::name[];
@@ -1033,7 +1043,7 @@ constexpr char GeckoThread::State::EXITING_t::signature[];
 
 auto GeckoThread::State::EXITING() -> State::LocalRef
 {
-    return mozilla::jni::Field<EXITING_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<EXITING_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::INITIAL_t::name[];
@@ -1041,7 +1051,7 @@ constexpr char GeckoThread::State::INITIAL_t::signature[];
 
 auto GeckoThread::State::INITIAL() -> State::LocalRef
 {
-    return mozilla::jni::Field<INITIAL_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<INITIAL_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::JNI_READY_t::name[];
@@ -1049,7 +1059,7 @@ constexpr char GeckoThread::State::JNI_READY_t::signature[];
 
 auto GeckoThread::State::JNI_READY() -> State::LocalRef
 {
-    return mozilla::jni::Field<JNI_READY_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<JNI_READY_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::LAUNCHED_t::name[];
@@ -1057,7 +1067,7 @@ constexpr char GeckoThread::State::LAUNCHED_t::signature[];
 
 auto GeckoThread::State::LAUNCHED() -> State::LocalRef
 {
-    return mozilla::jni::Field<LAUNCHED_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<LAUNCHED_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::LIBS_READY_t::name[];
@@ -1065,7 +1075,7 @@ constexpr char GeckoThread::State::LIBS_READY_t::signature[];
 
 auto GeckoThread::State::LIBS_READY() -> State::LocalRef
 {
-    return mozilla::jni::Field<LIBS_READY_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<LIBS_READY_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::MOZGLUE_READY_t::name[];
@@ -1073,7 +1083,7 @@ constexpr char GeckoThread::State::MOZGLUE_READY_t::signature[];
 
 auto GeckoThread::State::MOZGLUE_READY() -> State::LocalRef
 {
-    return mozilla::jni::Field<MOZGLUE_READY_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<MOZGLUE_READY_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::PROFILE_READY_t::name[];
@@ -1081,7 +1091,7 @@ constexpr char GeckoThread::State::PROFILE_READY_t::signature[];
 
 auto GeckoThread::State::PROFILE_READY() -> State::LocalRef
 {
-    return mozilla::jni::Field<PROFILE_READY_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<PROFILE_READY_t>::Get(State::Context(), nullptr);
 }
 
 constexpr char GeckoThread::State::RUNNING_t::name[];
@@ -1089,19 +1099,21 @@ constexpr char GeckoThread::State::RUNNING_t::signature[];
 
 auto GeckoThread::State::RUNNING() -> State::LocalRef
 {
-    return mozilla::jni::Field<RUNNING_t>::Get(nullptr, nullptr);
+    return mozilla::jni::Field<RUNNING_t>::Get(State::Context(), nullptr);
 }
 
-constexpr char GeckoView::name[];
+template<> const char mozilla::jni::Context<GeckoView, jobject>::name[] =
+        "org/mozilla/gecko/GeckoView";
 
-constexpr char GeckoView::Window::name[];
+template<> const char mozilla::jni::Context<GeckoView::Window, jobject>::name[] =
+        "org/mozilla/gecko/GeckoView$Window";
 
 constexpr char GeckoView::Window::New_t::name[];
 constexpr char GeckoView::Window::New_t::signature[];
 
 auto GeckoView::Window::New() -> Window::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(Window::Context(), nullptr);
 }
 
 constexpr char GeckoView::Window::Close_t::name[];
@@ -1121,17 +1133,18 @@ constexpr char GeckoView::Window::GlController_t::signature[];
 
 auto GeckoView::Window::GlController() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<GlController_t>::Get(this, nullptr);
+    return mozilla::jni::Field<GlController_t>::Get(Window::mCtx, nullptr);
 }
 
-constexpr char PrefsHelper::name[];
+template<> const char mozilla::jni::Context<PrefsHelper, jobject>::name[] =
+        "org/mozilla/gecko/PrefsHelper";
 
 constexpr char PrefsHelper::CallPrefHandler_t::name[];
 constexpr char PrefsHelper::CallPrefHandler_t::signature[];
 
 auto PrefsHelper::CallPrefHandler(mozilla::jni::Object::Param a0, int32_t a1, mozilla::jni::String::Param a2, bool a3, int32_t a4, mozilla::jni::String::Param a5) -> void
 {
-    return mozilla::jni::Method<CallPrefHandler_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4, a5);
+    return mozilla::jni::Method<CallPrefHandler_t>::Call(PrefsHelper::Context(), nullptr, a0, a1, a2, a3, a4, a5);
 }
 
 constexpr char PrefsHelper::AddObserver_t::name[];
@@ -1151,17 +1164,18 @@ constexpr char PrefsHelper::OnPrefChange_t::signature[];
 
 auto PrefsHelper::OnPrefChange(mozilla::jni::String::Param a0, int32_t a1, bool a2, int32_t a3, mozilla::jni::String::Param a4) -> void
 {
-    return mozilla::jni::Method<OnPrefChange_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4);
+    return mozilla::jni::Method<OnPrefChange_t>::Call(PrefsHelper::Context(), nullptr, a0, a1, a2, a3, a4);
 }
 
-constexpr char Restrictions::name[];
+template<> const char mozilla::jni::Context<Restrictions, jobject>::name[] =
+        "org/mozilla/gecko/Restrictions";
 
 constexpr char Restrictions::IsAllowed_t::name[];
 constexpr char Restrictions::IsAllowed_t::signature[];
 
 auto Restrictions::IsAllowed(int32_t a0, mozilla::jni::String::Param a1) -> bool
 {
-    return mozilla::jni::Method<IsAllowed_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Method<IsAllowed_t>::Call(Restrictions::Context(), nullptr, a0, a1);
 }
 
 constexpr char Restrictions::IsUserRestricted_t::name[];
@@ -1169,17 +1183,18 @@ constexpr char Restrictions::IsUserRestricted_t::signature[];
 
 auto Restrictions::IsUserRestricted() -> bool
 {
-    return mozilla::jni::Method<IsUserRestricted_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<IsUserRestricted_t>::Call(Restrictions::Context(), nullptr);
 }
 
-constexpr char SurfaceBits::name[];
+template<> const char mozilla::jni::Context<SurfaceBits, jobject>::name[] =
+        "org/mozilla/gecko/SurfaceBits";
 
 constexpr char SurfaceBits::New_t::name[];
 constexpr char SurfaceBits::New_t::signature[];
 
 auto SurfaceBits::New() -> SurfaceBits::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(SurfaceBits::Context(), nullptr);
 }
 
 constexpr char SurfaceBits::Buffer_t::name[];
@@ -1187,12 +1202,12 @@ constexpr char SurfaceBits::Buffer_t::signature[];
 
 auto SurfaceBits::Buffer() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<Buffer_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Buffer_t>::Get(SurfaceBits::mCtx, nullptr);
 }
 
 auto SurfaceBits::Buffer(mozilla::jni::Object::Param a0) const -> void
 {
-    return mozilla::jni::Field<Buffer_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Buffer_t>::Set(SurfaceBits::mCtx, nullptr, a0);
 }
 
 constexpr char SurfaceBits::Format_t::name[];
@@ -1200,12 +1215,12 @@ constexpr char SurfaceBits::Format_t::signature[];
 
 auto SurfaceBits::Format() const -> int32_t
 {
-    return mozilla::jni::Field<Format_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Format_t>::Get(SurfaceBits::mCtx, nullptr);
 }
 
 auto SurfaceBits::Format(int32_t a0) const -> void
 {
-    return mozilla::jni::Field<Format_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Format_t>::Set(SurfaceBits::mCtx, nullptr, a0);
 }
 
 constexpr char SurfaceBits::Height_t::name[];
@@ -1213,12 +1228,12 @@ constexpr char SurfaceBits::Height_t::signature[];
 
 auto SurfaceBits::Height() const -> int32_t
 {
-    return mozilla::jni::Field<Height_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Height_t>::Get(SurfaceBits::mCtx, nullptr);
 }
 
 auto SurfaceBits::Height(int32_t a0) const -> void
 {
-    return mozilla::jni::Field<Height_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Height_t>::Set(SurfaceBits::mCtx, nullptr, a0);
 }
 
 constexpr char SurfaceBits::Width_t::name[];
@@ -1226,42 +1241,45 @@ constexpr char SurfaceBits::Width_t::signature[];
 
 auto SurfaceBits::Width() const -> int32_t
 {
-    return mozilla::jni::Field<Width_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Width_t>::Get(SurfaceBits::mCtx, nullptr);
 }
 
 auto SurfaceBits::Width(int32_t a0) const -> void
 {
-    return mozilla::jni::Field<Width_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Width_t>::Set(SurfaceBits::mCtx, nullptr, a0);
 }
 
-constexpr char ThumbnailHelper::name[];
+template<> const char mozilla::jni::Context<ThumbnailHelper, jobject>::name[] =
+        "org/mozilla/gecko/ThumbnailHelper";
 
 constexpr char ThumbnailHelper::SendThumbnail_t::name[];
 constexpr char ThumbnailHelper::SendThumbnail_t::signature[];
 
 auto ThumbnailHelper::SendThumbnail(mozilla::jni::Object::Param a0, int32_t a1, bool a2, bool a3) -> void
 {
-    return mozilla::jni::Method<SendThumbnail_t>::Call(nullptr, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<SendThumbnail_t>::Call(ThumbnailHelper::Context(), nullptr, a0, a1, a2, a3);
 }
 
-constexpr char Distribution::name[];
+template<> const char mozilla::jni::Context<Distribution, jobject>::name[] =
+        "org/mozilla/gecko/distribution/Distribution";
 
 constexpr char Distribution::GetDistributionDirectories_t::name[];
 constexpr char Distribution::GetDistributionDirectories_t::signature[];
 
 auto Distribution::GetDistributionDirectories() -> mozilla::jni::ObjectArray::LocalRef
 {
-    return mozilla::jni::Method<GetDistributionDirectories_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetDistributionDirectories_t>::Call(Distribution::Context(), nullptr);
 }
 
-constexpr char DisplayPortMetrics::name[];
+template<> const char mozilla::jni::Context<DisplayPortMetrics, jobject>::name[] =
+        "org/mozilla/gecko/gfx/DisplayPortMetrics";
 
 constexpr char DisplayPortMetrics::New_t::name[];
 constexpr char DisplayPortMetrics::New_t::signature[];
 
 auto DisplayPortMetrics::New(float a0, float a1, float a2, float a3, float a4) -> DisplayPortMetrics::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4);
+    return mozilla::jni::Constructor<New_t>::Call(DisplayPortMetrics::Context(), nullptr, a0, a1, a2, a3, a4);
 }
 
 constexpr char DisplayPortMetrics::MPosition_t::name[];
@@ -1269,7 +1287,7 @@ constexpr char DisplayPortMetrics::MPosition_t::signature[];
 
 auto DisplayPortMetrics::MPosition() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<MPosition_t>::Get(this, nullptr);
+    return mozilla::jni::Field<MPosition_t>::Get(DisplayPortMetrics::mCtx, nullptr);
 }
 
 constexpr char DisplayPortMetrics::Resolution_t::name[];
@@ -1277,10 +1295,11 @@ constexpr char DisplayPortMetrics::Resolution_t::signature[];
 
 auto DisplayPortMetrics::Resolution() const -> float
 {
-    return mozilla::jni::Field<Resolution_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Resolution_t>::Get(DisplayPortMetrics::mCtx, nullptr);
 }
 
-constexpr char GLController::name[];
+template<> const char mozilla::jni::Context<GLController, jobject>::name[] =
+        "org/mozilla/gecko/gfx/GLController";
 
 constexpr char GLController::AttachToJava_t::name[];
 constexpr char GLController::AttachToJava_t::signature[];
@@ -1293,7 +1312,7 @@ constexpr char GLController::CreateEGLSurface_t::signature[];
 
 auto GLController::CreateEGLSurface() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<CreateEGLSurface_t>::Call(this, nullptr);
+    return mozilla::jni::Method<CreateEGLSurface_t>::Call(GLController::mCtx, nullptr);
 }
 
 constexpr char GLController::Destroy_t::name[];
@@ -1301,7 +1320,7 @@ constexpr char GLController::Destroy_t::signature[];
 
 auto GLController::Destroy() const -> void
 {
-    return mozilla::jni::Method<Destroy_t>::Call(this, nullptr);
+    return mozilla::jni::Method<Destroy_t>::Call(GLController::mCtx, nullptr);
 }
 
 constexpr char GLController::DisposeNative_t::name[];
@@ -1319,14 +1338,15 @@ constexpr char GLController::SyncInvalidateAndScheduleComposite_t::signature[];
 constexpr char GLController::SyncResumeResizeCompositor_t::name[];
 constexpr char GLController::SyncResumeResizeCompositor_t::signature[];
 
-constexpr char GeckoLayerClient::name[];
+template<> const char mozilla::jni::Context<GeckoLayerClient, jobject>::name[] =
+        "org/mozilla/gecko/gfx/GeckoLayerClient";
 
 constexpr char GeckoLayerClient::ActivateProgram_t::name[];
 constexpr char GeckoLayerClient::ActivateProgram_t::signature[];
 
 auto GeckoLayerClient::ActivateProgram() const -> void
 {
-    return mozilla::jni::Method<ActivateProgram_t>::Call(this, nullptr);
+    return mozilla::jni::Method<ActivateProgram_t>::Call(GeckoLayerClient::mCtx, nullptr);
 }
 
 constexpr char GeckoLayerClient::ContentDocumentChanged_t::name[];
@@ -1334,7 +1354,7 @@ constexpr char GeckoLayerClient::ContentDocumentChanged_t::signature[];
 
 auto GeckoLayerClient::ContentDocumentChanged() const -> void
 {
-    return mozilla::jni::Method<ContentDocumentChanged_t>::Call(this, nullptr);
+    return mozilla::jni::Method<ContentDocumentChanged_t>::Call(GeckoLayerClient::mCtx, nullptr);
 }
 
 constexpr char GeckoLayerClient::CreateFrame_t::name[];
@@ -1342,7 +1362,7 @@ constexpr char GeckoLayerClient::CreateFrame_t::signature[];
 
 auto GeckoLayerClient::CreateFrame() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<CreateFrame_t>::Call(this, nullptr);
+    return mozilla::jni::Method<CreateFrame_t>::Call(GeckoLayerClient::mCtx, nullptr);
 }
 
 constexpr char GeckoLayerClient::DeactivateProgramAndRestoreState_t::name[];
@@ -1350,7 +1370,7 @@ constexpr char GeckoLayerClient::DeactivateProgramAndRestoreState_t::signature[]
 
 auto GeckoLayerClient::DeactivateProgramAndRestoreState(bool a0, int32_t a1, int32_t a2, int32_t a3, int32_t a4) const -> void
 {
-    return mozilla::jni::Method<DeactivateProgramAndRestoreState_t>::Call(this, nullptr, a0, a1, a2, a3, a4);
+    return mozilla::jni::Method<DeactivateProgramAndRestoreState_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4);
 }
 
 constexpr char GeckoLayerClient::GetDisplayPort_t::name[];
@@ -1358,7 +1378,7 @@ constexpr char GeckoLayerClient::GetDisplayPort_t::signature[];
 
 auto GeckoLayerClient::GetDisplayPort(bool a0, bool a1, int32_t a2, mozilla::jni::Object::Param a3) const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetDisplayPort_t>::Call(this, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<GetDisplayPort_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoLayerClient::IsContentDocumentDisplayed_t::name[];
@@ -1366,7 +1386,7 @@ constexpr char GeckoLayerClient::IsContentDocumentDisplayed_t::signature[];
 
 auto GeckoLayerClient::IsContentDocumentDisplayed() const -> bool
 {
-    return mozilla::jni::Method<IsContentDocumentDisplayed_t>::Call(this, nullptr);
+    return mozilla::jni::Method<IsContentDocumentDisplayed_t>::Call(GeckoLayerClient::mCtx, nullptr);
 }
 
 constexpr char GeckoLayerClient::OnGeckoReady_t::name[];
@@ -1374,7 +1394,7 @@ constexpr char GeckoLayerClient::OnGeckoReady_t::signature[];
 
 auto GeckoLayerClient::OnGeckoReady() const -> void
 {
-    return mozilla::jni::Method<OnGeckoReady_t>::Call(this, nullptr);
+    return mozilla::jni::Method<OnGeckoReady_t>::Call(GeckoLayerClient::mCtx, nullptr);
 }
 
 constexpr char GeckoLayerClient::ProgressiveUpdateCallback_t::name[];
@@ -1382,7 +1402,7 @@ constexpr char GeckoLayerClient::ProgressiveUpdateCallback_t::signature[];
 
 auto GeckoLayerClient::ProgressiveUpdateCallback(bool a0, float a1, float a2, float a3, float a4, float a5, bool a6) const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<ProgressiveUpdateCallback_t>::Call(this, nullptr, a0, a1, a2, a3, a4, a5, a6);
+    return mozilla::jni::Method<ProgressiveUpdateCallback_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4, a5, a6);
 }
 
 constexpr char GeckoLayerClient::SetFirstPaintViewport_t::name[];
@@ -1390,7 +1410,7 @@ constexpr char GeckoLayerClient::SetFirstPaintViewport_t::signature[];
 
 auto GeckoLayerClient::SetFirstPaintViewport(float a0, float a1, float a2, float a3, float a4, float a5, float a6) const -> void
 {
-    return mozilla::jni::Method<SetFirstPaintViewport_t>::Call(this, nullptr, a0, a1, a2, a3, a4, a5, a6);
+    return mozilla::jni::Method<SetFirstPaintViewport_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4, a5, a6);
 }
 
 constexpr char GeckoLayerClient::SetPageRect_t::name[];
@@ -1398,7 +1418,7 @@ constexpr char GeckoLayerClient::SetPageRect_t::signature[];
 
 auto GeckoLayerClient::SetPageRect(float a0, float a1, float a2, float a3) const -> void
 {
-    return mozilla::jni::Method<SetPageRect_t>::Call(this, nullptr, a0, a1, a2, a3);
+    return mozilla::jni::Method<SetPageRect_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3);
 }
 
 constexpr char GeckoLayerClient::SyncFrameMetrics_t::name[];
@@ -1406,7 +1426,7 @@ constexpr char GeckoLayerClient::SyncFrameMetrics_t::signature[];
 
 auto GeckoLayerClient::SyncFrameMetrics(float a0, float a1, float a2, float a3, float a4, float a5, float a6, int32_t a7, int32_t a8, int32_t a9, int32_t a10, float a11, bool a12, int32_t a13) const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<SyncFrameMetrics_t>::Call(this, nullptr, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
+    return mozilla::jni::Method<SyncFrameMetrics_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
 }
 
 constexpr char GeckoLayerClient::SyncViewportInfo_t::name[];
@@ -1414,29 +1434,32 @@ constexpr char GeckoLayerClient::SyncViewportInfo_t::signature[];
 
 auto GeckoLayerClient::SyncViewportInfo(int32_t a0, int32_t a1, int32_t a2, int32_t a3, float a4, bool a5, int32_t a6) const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<SyncViewportInfo_t>::Call(this, nullptr, a0, a1, a2, a3, a4, a5, a6);
+    return mozilla::jni::Method<SyncViewportInfo_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4, a5, a6);
 }
 
-constexpr char ImmutableViewportMetrics::name[];
+template<> const char mozilla::jni::Context<ImmutableViewportMetrics, jobject>::name[] =
+        "org/mozilla/gecko/gfx/ImmutableViewportMetrics";
 
 constexpr char ImmutableViewportMetrics::New_t::name[];
 constexpr char ImmutableViewportMetrics::New_t::signature[];
 
 auto ImmutableViewportMetrics::New(float a0, float a1, float a2, float a3, float a4, float a5, float a6, float a7, float a8, float a9, int32_t a10, int32_t a11, float a12) -> ImmutableViewportMetrics::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
+    return mozilla::jni::Constructor<New_t>::Call(ImmutableViewportMetrics::Context(), nullptr, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
 }
 
-constexpr char LayerRenderer::name[];
+template<> const char mozilla::jni::Context<LayerRenderer, jobject>::name[] =
+        "org/mozilla/gecko/gfx/LayerRenderer";
 
-constexpr char LayerRenderer::Frame::name[];
+template<> const char mozilla::jni::Context<LayerRenderer::Frame, jobject>::name[] =
+        "org/mozilla/gecko/gfx/LayerRenderer$Frame";
 
 constexpr char LayerRenderer::Frame::BeginDrawing_t::name[];
 constexpr char LayerRenderer::Frame::BeginDrawing_t::signature[];
 
 auto LayerRenderer::Frame::BeginDrawing() const -> void
 {
-    return mozilla::jni::Method<BeginDrawing_t>::Call(this, nullptr);
+    return mozilla::jni::Method<BeginDrawing_t>::Call(Frame::mCtx, nullptr);
 }
 
 constexpr char LayerRenderer::Frame::DrawBackground_t::name[];
@@ -1444,7 +1467,7 @@ constexpr char LayerRenderer::Frame::DrawBackground_t::signature[];
 
 auto LayerRenderer::Frame::DrawBackground() const -> void
 {
-    return mozilla::jni::Method<DrawBackground_t>::Call(this, nullptr);
+    return mozilla::jni::Method<DrawBackground_t>::Call(Frame::mCtx, nullptr);
 }
 
 constexpr char LayerRenderer::Frame::DrawForeground_t::name[];
@@ -1452,7 +1475,7 @@ constexpr char LayerRenderer::Frame::DrawForeground_t::signature[];
 
 auto LayerRenderer::Frame::DrawForeground() const -> void
 {
-    return mozilla::jni::Method<DrawForeground_t>::Call(this, nullptr);
+    return mozilla::jni::Method<DrawForeground_t>::Call(Frame::mCtx, nullptr);
 }
 
 constexpr char LayerRenderer::Frame::EndDrawing_t::name[];
@@ -1460,20 +1483,22 @@ constexpr char LayerRenderer::Frame::EndDrawing_t::signature[];
 
 auto LayerRenderer::Frame::EndDrawing() const -> void
 {
-    return mozilla::jni::Method<EndDrawing_t>::Call(this, nullptr);
+    return mozilla::jni::Method<EndDrawing_t>::Call(Frame::mCtx, nullptr);
 }
 
-constexpr char LayerView::name[];
+template<> const char mozilla::jni::Context<LayerView, jobject>::name[] =
+        "org/mozilla/gecko/gfx/LayerView";
 
 constexpr char LayerView::updateZoomedView_t::name[];
 constexpr char LayerView::updateZoomedView_t::signature[];
 
 auto LayerView::updateZoomedView(mozilla::jni::Object::Param a0) -> void
 {
-    return mozilla::jni::Method<updateZoomedView_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<updateZoomedView_t>::Call(LayerView::Context(), nullptr, a0);
 }
 
-constexpr char NativePanZoomController::name[];
+template<> const char mozilla::jni::Context<NativePanZoomController, jobject>::name[] =
+        "org/mozilla/gecko/gfx/NativePanZoomController";
 
 constexpr char NativePanZoomController::AdjustScrollForSurfaceShift_t::name[];
 constexpr char NativePanZoomController::AdjustScrollForSurfaceShift_t::signature[];
@@ -1483,7 +1508,7 @@ constexpr char NativePanZoomController::Destroy_t::signature[];
 
 auto NativePanZoomController::Destroy() const -> void
 {
-    return mozilla::jni::Method<Destroy_t>::Call(this, nullptr);
+    return mozilla::jni::Method<Destroy_t>::Call(NativePanZoomController::mCtx, nullptr);
 }
 
 constexpr char NativePanZoomController::DisposeNative_t::name[];
@@ -1503,7 +1528,7 @@ constexpr char NativePanZoomController::RequestContentRepaintWrapper_t::signatur
 
 auto NativePanZoomController::RequestContentRepaintWrapper(float a0, float a1, float a2, float a3, float a4) const -> void
 {
-    return mozilla::jni::Method<RequestContentRepaintWrapper_t>::Call(this, nullptr, a0, a1, a2, a3, a4);
+    return mozilla::jni::Method<RequestContentRepaintWrapper_t>::Call(NativePanZoomController::mCtx, nullptr, a0, a1, a2, a3, a4);
 }
 
 constexpr char NativePanZoomController::UpdateOverscrollOffset_t::name[];
@@ -1511,7 +1536,7 @@ constexpr char NativePanZoomController::UpdateOverscrollOffset_t::signature[];
 
 auto NativePanZoomController::UpdateOverscrollOffset(float a0, float a1) const -> void
 {
-    return mozilla::jni::Method<UpdateOverscrollOffset_t>::Call(this, nullptr, a0, a1);
+    return mozilla::jni::Method<UpdateOverscrollOffset_t>::Call(NativePanZoomController::mCtx, nullptr, a0, a1);
 }
 
 constexpr char NativePanZoomController::UpdateOverscrollVelocity_t::name[];
@@ -1519,17 +1544,18 @@ constexpr char NativePanZoomController::UpdateOverscrollVelocity_t::signature[];
 
 auto NativePanZoomController::UpdateOverscrollVelocity(float a0, float a1) const -> void
 {
-    return mozilla::jni::Method<UpdateOverscrollVelocity_t>::Call(this, nullptr, a0, a1);
+    return mozilla::jni::Method<UpdateOverscrollVelocity_t>::Call(NativePanZoomController::mCtx, nullptr, a0, a1);
 }
 
-constexpr char ProgressiveUpdateData::name[];
+template<> const char mozilla::jni::Context<ProgressiveUpdateData, jobject>::name[] =
+        "org/mozilla/gecko/gfx/ProgressiveUpdateData";
 
 constexpr char ProgressiveUpdateData::New_t::name[];
 constexpr char ProgressiveUpdateData::New_t::signature[];
 
 auto ProgressiveUpdateData::New() -> ProgressiveUpdateData::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(ProgressiveUpdateData::Context(), nullptr);
 }
 
 constexpr char ProgressiveUpdateData::SetViewport_t::name[];
@@ -1537,7 +1563,7 @@ constexpr char ProgressiveUpdateData::SetViewport_t::signature[];
 
 auto ProgressiveUpdateData::SetViewport(mozilla::jni::Object::Param a0) const -> void
 {
-    return mozilla::jni::Method<SetViewport_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<SetViewport_t>::Call(ProgressiveUpdateData::mCtx, nullptr, a0);
 }
 
 constexpr char ProgressiveUpdateData::Abort_t::name[];
@@ -1545,12 +1571,12 @@ constexpr char ProgressiveUpdateData::Abort_t::signature[];
 
 auto ProgressiveUpdateData::Abort() const -> bool
 {
-    return mozilla::jni::Field<Abort_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Abort_t>::Get(ProgressiveUpdateData::mCtx, nullptr);
 }
 
 auto ProgressiveUpdateData::Abort(bool a0) const -> void
 {
-    return mozilla::jni::Field<Abort_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Abort_t>::Set(ProgressiveUpdateData::mCtx, nullptr, a0);
 }
 
 constexpr char ProgressiveUpdateData::Scale_t::name[];
@@ -1558,12 +1584,12 @@ constexpr char ProgressiveUpdateData::Scale_t::signature[];
 
 auto ProgressiveUpdateData::Scale() const -> float
 {
-    return mozilla::jni::Field<Scale_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Scale_t>::Get(ProgressiveUpdateData::mCtx, nullptr);
 }
 
 auto ProgressiveUpdateData::Scale(float a0) const -> void
 {
-    return mozilla::jni::Field<Scale_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Scale_t>::Set(ProgressiveUpdateData::mCtx, nullptr, a0);
 }
 
 constexpr char ProgressiveUpdateData::X_t::name[];
@@ -1571,12 +1597,12 @@ constexpr char ProgressiveUpdateData::X_t::signature[];
 
 auto ProgressiveUpdateData::X() const -> float
 {
-    return mozilla::jni::Field<X_t>::Get(this, nullptr);
+    return mozilla::jni::Field<X_t>::Get(ProgressiveUpdateData::mCtx, nullptr);
 }
 
 auto ProgressiveUpdateData::X(float a0) const -> void
 {
-    return mozilla::jni::Field<X_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<X_t>::Set(ProgressiveUpdateData::mCtx, nullptr, a0);
 }
 
 constexpr char ProgressiveUpdateData::Y_t::name[];
@@ -1584,22 +1610,23 @@ constexpr char ProgressiveUpdateData::Y_t::signature[];
 
 auto ProgressiveUpdateData::Y() const -> float
 {
-    return mozilla::jni::Field<Y_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Y_t>::Get(ProgressiveUpdateData::mCtx, nullptr);
 }
 
 auto ProgressiveUpdateData::Y(float a0) const -> void
 {
-    return mozilla::jni::Field<Y_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Y_t>::Set(ProgressiveUpdateData::mCtx, nullptr, a0);
 }
 
-constexpr char ViewTransform::name[];
+template<> const char mozilla::jni::Context<ViewTransform, jobject>::name[] =
+        "org/mozilla/gecko/gfx/ViewTransform";
 
 constexpr char ViewTransform::New_t::name[];
 constexpr char ViewTransform::New_t::signature[];
 
 auto ViewTransform::New(float a0, float a1, float a2) -> ViewTransform::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0, a1, a2);
+    return mozilla::jni::Constructor<New_t>::Call(ViewTransform::Context(), nullptr, a0, a1, a2);
 }
 
 constexpr char ViewTransform::FixedLayerMarginBottom_t::name[];
@@ -1607,12 +1634,12 @@ constexpr char ViewTransform::FixedLayerMarginBottom_t::signature[];
 
 auto ViewTransform::FixedLayerMarginBottom() const -> float
 {
-    return mozilla::jni::Field<FixedLayerMarginBottom_t>::Get(this, nullptr);
+    return mozilla::jni::Field<FixedLayerMarginBottom_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::FixedLayerMarginBottom(float a0) const -> void
 {
-    return mozilla::jni::Field<FixedLayerMarginBottom_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<FixedLayerMarginBottom_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::FixedLayerMarginLeft_t::name[];
@@ -1620,12 +1647,12 @@ constexpr char ViewTransform::FixedLayerMarginLeft_t::signature[];
 
 auto ViewTransform::FixedLayerMarginLeft() const -> float
 {
-    return mozilla::jni::Field<FixedLayerMarginLeft_t>::Get(this, nullptr);
+    return mozilla::jni::Field<FixedLayerMarginLeft_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::FixedLayerMarginLeft(float a0) const -> void
 {
-    return mozilla::jni::Field<FixedLayerMarginLeft_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<FixedLayerMarginLeft_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::FixedLayerMarginRight_t::name[];
@@ -1633,12 +1660,12 @@ constexpr char ViewTransform::FixedLayerMarginRight_t::signature[];
 
 auto ViewTransform::FixedLayerMarginRight() const -> float
 {
-    return mozilla::jni::Field<FixedLayerMarginRight_t>::Get(this, nullptr);
+    return mozilla::jni::Field<FixedLayerMarginRight_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::FixedLayerMarginRight(float a0) const -> void
 {
-    return mozilla::jni::Field<FixedLayerMarginRight_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<FixedLayerMarginRight_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::FixedLayerMarginTop_t::name[];
@@ -1646,12 +1673,12 @@ constexpr char ViewTransform::FixedLayerMarginTop_t::signature[];
 
 auto ViewTransform::FixedLayerMarginTop() const -> float
 {
-    return mozilla::jni::Field<FixedLayerMarginTop_t>::Get(this, nullptr);
+    return mozilla::jni::Field<FixedLayerMarginTop_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::FixedLayerMarginTop(float a0) const -> void
 {
-    return mozilla::jni::Field<FixedLayerMarginTop_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<FixedLayerMarginTop_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::Height_t::name[];
@@ -1659,12 +1686,12 @@ constexpr char ViewTransform::Height_t::signature[];
 
 auto ViewTransform::Height() const -> float
 {
-    return mozilla::jni::Field<Height_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Height_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::Height(float a0) const -> void
 {
-    return mozilla::jni::Field<Height_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Height_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::Scale_t::name[];
@@ -1672,12 +1699,12 @@ constexpr char ViewTransform::Scale_t::signature[];
 
 auto ViewTransform::Scale() const -> float
 {
-    return mozilla::jni::Field<Scale_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Scale_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::Scale(float a0) const -> void
 {
-    return mozilla::jni::Field<Scale_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Scale_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::Width_t::name[];
@@ -1685,12 +1712,12 @@ constexpr char ViewTransform::Width_t::signature[];
 
 auto ViewTransform::Width() const -> float
 {
-    return mozilla::jni::Field<Width_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Width_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::Width(float a0) const -> void
 {
-    return mozilla::jni::Field<Width_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Width_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::X_t::name[];
@@ -1698,12 +1725,12 @@ constexpr char ViewTransform::X_t::signature[];
 
 auto ViewTransform::X() const -> float
 {
-    return mozilla::jni::Field<X_t>::Get(this, nullptr);
+    return mozilla::jni::Field<X_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::X(float a0) const -> void
 {
-    return mozilla::jni::Field<X_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<X_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
 constexpr char ViewTransform::Y_t::name[];
@@ -1711,22 +1738,23 @@ constexpr char ViewTransform::Y_t::signature[];
 
 auto ViewTransform::Y() const -> float
 {
-    return mozilla::jni::Field<Y_t>::Get(this, nullptr);
+    return mozilla::jni::Field<Y_t>::Get(ViewTransform::mCtx, nullptr);
 }
 
 auto ViewTransform::Y(float a0) const -> void
 {
-    return mozilla::jni::Field<Y_t>::Set(this, nullptr, a0);
+    return mozilla::jni::Field<Y_t>::Set(ViewTransform::mCtx, nullptr, a0);
 }
 
-constexpr char MatrixBlobCursor::name[];
+template<> const char mozilla::jni::Context<MatrixBlobCursor, jobject>::name[] =
+        "org/mozilla/gecko/sqlite/MatrixBlobCursor";
 
 constexpr char MatrixBlobCursor::New_t::name[];
 constexpr char MatrixBlobCursor::New_t::signature[];
 
 auto MatrixBlobCursor::New(mozilla::jni::ObjectArray::Param a0) -> MatrixBlobCursor::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Constructor<New_t>::Call(MatrixBlobCursor::Context(), nullptr, a0);
 }
 
 constexpr char MatrixBlobCursor::New2_t::name[];
@@ -1734,7 +1762,7 @@ constexpr char MatrixBlobCursor::New2_t::signature[];
 
 auto MatrixBlobCursor::New(mozilla::jni::ObjectArray::Param a0, int32_t a1) -> MatrixBlobCursor::LocalRef
 {
-    return mozilla::jni::Constructor<New2_t>::Call(nullptr, nullptr, a0, a1);
+    return mozilla::jni::Constructor<New2_t>::Call(MatrixBlobCursor::Context(), nullptr, a0, a1);
 }
 
 constexpr char MatrixBlobCursor::AddRow_t::name[];
@@ -1742,7 +1770,7 @@ constexpr char MatrixBlobCursor::AddRow_t::signature[];
 
 auto MatrixBlobCursor::AddRow(mozilla::jni::Object::Param a0) const -> void
 {
-    return mozilla::jni::Method<AddRow_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<AddRow_t>::Call(MatrixBlobCursor::mCtx, nullptr, a0);
 }
 
 constexpr char MatrixBlobCursor::AddRow2_t::name[];
@@ -1750,7 +1778,7 @@ constexpr char MatrixBlobCursor::AddRow2_t::signature[];
 
 auto MatrixBlobCursor::AddRow(mozilla::jni::Object::Param a0, int32_t a1) const -> void
 {
-    return mozilla::jni::Method<AddRow2_t>::Call(this, nullptr, a0, a1);
+    return mozilla::jni::Method<AddRow2_t>::Call(MatrixBlobCursor::mCtx, nullptr, a0, a1);
 }
 
 constexpr char MatrixBlobCursor::AddRow3_t::name[];
@@ -1758,17 +1786,18 @@ constexpr char MatrixBlobCursor::AddRow3_t::signature[];
 
 auto MatrixBlobCursor::AddRow(mozilla::jni::ObjectArray::Param a0) const -> void
 {
-    return mozilla::jni::Method<AddRow3_t>::Call(this, nullptr, a0);
+    return mozilla::jni::Method<AddRow3_t>::Call(MatrixBlobCursor::mCtx, nullptr, a0);
 }
 
-constexpr char SQLiteBridgeException::name[];
+template<> const char mozilla::jni::Context<SQLiteBridgeException, jobject>::name[] =
+        "org/mozilla/gecko/sqlite/SQLiteBridgeException";
 
 constexpr char SQLiteBridgeException::New_t::name[];
 constexpr char SQLiteBridgeException::New_t::signature[];
 
 auto SQLiteBridgeException::New() -> SQLiteBridgeException::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(SQLiteBridgeException::Context(), nullptr);
 }
 
 constexpr char SQLiteBridgeException::New2_t::name[];
@@ -1776,17 +1805,18 @@ constexpr char SQLiteBridgeException::New2_t::signature[];
 
 auto SQLiteBridgeException::New(mozilla::jni::String::Param a0) -> SQLiteBridgeException::LocalRef
 {
-    return mozilla::jni::Constructor<New2_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Constructor<New2_t>::Call(SQLiteBridgeException::Context(), nullptr, a0);
 }
 
-constexpr char Clipboard::name[];
+template<> const char mozilla::jni::Context<Clipboard, jobject>::name[] =
+        "org/mozilla/gecko/util/Clipboard";
 
 constexpr char Clipboard::ClearText_t::name[];
 constexpr char Clipboard::ClearText_t::signature[];
 
 auto Clipboard::ClearText() -> void
 {
-    return mozilla::jni::Method<ClearText_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<ClearText_t>::Call(Clipboard::Context(), nullptr);
 }
 
 constexpr char Clipboard::GetClipboardTextWrapper_t::name[];
@@ -1794,7 +1824,7 @@ constexpr char Clipboard::GetClipboardTextWrapper_t::signature[];
 
 auto Clipboard::GetClipboardTextWrapper() -> mozilla::jni::String::LocalRef
 {
-    return mozilla::jni::Method<GetClipboardTextWrapper_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<GetClipboardTextWrapper_t>::Call(Clipboard::Context(), nullptr);
 }
 
 constexpr char Clipboard::HasText_t::name[];
@@ -1802,7 +1832,7 @@ constexpr char Clipboard::HasText_t::signature[];
 
 auto Clipboard::HasText() -> bool
 {
-    return mozilla::jni::Method<HasText_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Method<HasText_t>::Call(Clipboard::Context(), nullptr);
 }
 
 constexpr char Clipboard::SetClipboardText_t::name[];
@@ -1810,27 +1840,29 @@ constexpr char Clipboard::SetClipboardText_t::signature[];
 
 auto Clipboard::SetClipboardText(mozilla::jni::String::Param a0) -> void
 {
-    return mozilla::jni::Method<SetClipboardText_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<SetClipboardText_t>::Call(Clipboard::Context(), nullptr, a0);
 }
 
-constexpr char HardwareCodecCapabilityUtils::name[];
+template<> const char mozilla::jni::Context<HardwareCodecCapabilityUtils, jobject>::name[] =
+        "org/mozilla/gecko/util/HardwareCodecCapabilityUtils";
 
 constexpr char HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType_t::name[];
 constexpr char HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType_t::signature[];
 
 auto HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType(mozilla::jni::String::Param a0) -> bool
 {
-    return mozilla::jni::Method<FindDecoderCodecInfoForMimeType_t>::Call(nullptr, nullptr, a0);
+    return mozilla::jni::Method<FindDecoderCodecInfoForMimeType_t>::Call(HardwareCodecCapabilityUtils::Context(), nullptr, a0);
 }
 
-constexpr char NativeJSContainer::name[];
+template<> const char mozilla::jni::Context<NativeJSContainer, jobject>::name[] =
+        "org/mozilla/gecko/util/NativeJSContainer";
 
 constexpr char NativeJSContainer::New_t::name[];
 constexpr char NativeJSContainer::New_t::signature[];
 
 auto NativeJSContainer::New() -> NativeJSContainer::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(NativeJSContainer::Context(), nullptr);
 }
 
 constexpr char NativeJSContainer::Clone2_t::name[];
@@ -1839,14 +1871,15 @@ constexpr char NativeJSContainer::Clone2_t::signature[];
 constexpr char NativeJSContainer::DisposeNative_t::name[];
 constexpr char NativeJSContainer::DisposeNative_t::signature[];
 
-constexpr char NativeJSObject::name[];
+template<> const char mozilla::jni::Context<NativeJSObject, jobject>::name[] =
+        "org/mozilla/gecko/util/NativeJSObject";
 
 constexpr char NativeJSObject::New_t::name[];
 constexpr char NativeJSObject::New_t::signature[];
 
 auto NativeJSObject::New() -> NativeJSObject::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(NativeJSObject::Context(), nullptr);
 }
 
 constexpr char NativeJSObject::DisposeNative_t::name[];
@@ -1854,7 +1887,7 @@ constexpr char NativeJSObject::DisposeNative_t::signature[];
 
 auto NativeJSObject::DisposeNative() const -> void
 {
-    return mozilla::jni::Method<DisposeNative_t>::Call(this, nullptr);
+    return mozilla::jni::Method<DisposeNative_t>::Call(NativeJSObject::mCtx, nullptr);
 }
 
 constexpr char NativeJSObject::GetBoolean_t::name[];
diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h
index 1e0e99d12f5..853b790da2a 100644
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -12,21 +12,11 @@
 namespace mozilla {
 namespace widget {
 
-class ANRReporter : public mozilla::jni::Class<ANRReporter>
+class ANRReporter : public mozilla::jni::ObjectBase<ANRReporter, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<ANRReporter> Ref;
-    typedef mozilla::jni::LocalRef<ANRReporter> LocalRef;
-    typedef mozilla::jni::GlobalRef<ANRReporter> GlobalRef;
-    typedef const mozilla::jni::Param<ANRReporter>& Param;
+    explicit ANRReporter(const Context& ctx) : ObjectBase<ANRReporter, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/ANRReporter";
-
-protected:
-    ANRReporter(jobject instance) : Class(instance) {}
-
-public:
     struct GetNativeStack_t {
         typedef ANRReporter Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -36,12 +26,10 @@ public:
         static constexpr char signature[] =
                 "()Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct ReleaseNativeStack_t {
         typedef ANRReporter Owner;
         typedef void ReturnType;
@@ -51,12 +39,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct RequestNativeStack_t {
         typedef ANRReporter Owner;
         typedef bool ReturnType;
@@ -67,30 +53,20 @@ public:
         static constexpr char signature[] =
                 "(Z)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
+    static const bool isMultithreaded = false;
+
     template<class Impl> class Natives;
 };
 
-class AlarmReceiver : public mozilla::jni::Class<AlarmReceiver>
+class AlarmReceiver : public mozilla::jni::ObjectBase<AlarmReceiver, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<AlarmReceiver> Ref;
-    typedef mozilla::jni::LocalRef<AlarmReceiver> LocalRef;
-    typedef mozilla::jni::GlobalRef<AlarmReceiver> GlobalRef;
-    typedef const mozilla::jni::Param<AlarmReceiver>& Param;
+    explicit AlarmReceiver(const Context& ctx) : ObjectBase<AlarmReceiver, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/AlarmReceiver";
-
-protected:
-    AlarmReceiver(jobject instance) : Class(instance) {}
-
-public:
     struct NotifyAlarmFired_t {
         typedef AlarmReceiver Owner;
         typedef void ReturnType;
@@ -100,30 +76,20 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
+    static const bool isMultithreaded = false;
+
     template<class Impl> class Natives;
 };
 
-class DownloadsIntegration : public mozilla::jni::Class<DownloadsIntegration>
+class DownloadsIntegration : public mozilla::jni::ObjectBase<DownloadsIntegration, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<DownloadsIntegration> Ref;
-    typedef mozilla::jni::LocalRef<DownloadsIntegration> LocalRef;
-    typedef mozilla::jni::GlobalRef<DownloadsIntegration> GlobalRef;
-    typedef const mozilla::jni::Param<DownloadsIntegration>& Param;
+    explicit DownloadsIntegration(const Context& ctx) : ObjectBase<DownloadsIntegration, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/DownloadsIntegration";
-
-protected:
-    DownloadsIntegration(jobject instance) : Class(instance) {}
-
-public:
     struct ScanMedia_t {
         typedef DownloadsIntegration Owner;
         typedef void ReturnType;
@@ -135,30 +101,21 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ScanMedia(mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class GeckoAppShell : public mozilla::jni::Class<GeckoAppShell>
+class GeckoAppShell : public mozilla::jni::ObjectBase<GeckoAppShell, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoAppShell> Ref;
-    typedef mozilla::jni::LocalRef<GeckoAppShell> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoAppShell> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoAppShell>& Param;
+    explicit GeckoAppShell(const Context& ctx) : ObjectBase<GeckoAppShell, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoAppShell";
-
-protected:
-    GeckoAppShell(jobject instance) : Class(instance) {}
-
-public:
     struct AcknowledgeEvent_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -168,14 +125,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto AcknowledgeEvent() -> void;
 
-public:
     struct AddPluginViewWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -191,14 +146,12 @@ public:
         static constexpr char signature[] =
                 "(Landroid/view/View;FFFFZ)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto AddPluginViewWrapper(mozilla::jni::Object::Param, float, float, float, float, bool) -> void;
 
-public:
     struct AlertsProgressListener_OnProgress_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -212,14 +165,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;JJLjava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto AlertsProgressListener_OnProgress(mozilla::jni::String::Param, int64_t, int64_t, mozilla::jni::String::Param) -> void;
 
-public:
     struct CancelVibrate_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -229,14 +180,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CancelVibrate() -> void;
 
-public:
     struct CheckURIVisited_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -247,14 +196,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CheckURIVisited(mozilla::jni::String::Param) -> void;
 
-public:
     struct CloseCamera_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -264,14 +211,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CloseCamera() -> void;
 
-public:
     struct CloseNotification_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -282,14 +227,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CloseNotification(mozilla::jni::String::Param) -> void;
 
-public:
     struct ConnectionGetMimeType_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -300,14 +243,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/net/URLConnection;)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ConnectionGetMimeType(mozilla::jni::Object::Param) -> mozilla::jni::String::LocalRef;
 
-public:
     struct CreateInputStream_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -318,14 +259,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/net/URLConnection;)Ljava/io/InputStream;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CreateInputStream(mozilla::jni::Object::Param) -> mozilla::jni::Object::LocalRef;
 
-public:
     struct CreateMessageCursorWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -346,14 +285,12 @@ public:
         static constexpr char signature[] =
                 "(JJ[Ljava/lang/String;ILjava/lang/String;ZZZJZI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CreateMessageCursorWrapper(int64_t, int64_t, mozilla::jni::ObjectArray::Param, int32_t, mozilla::jni::String::Param, bool, bool, bool, int64_t, bool, int32_t) -> void;
 
-public:
     struct CreateShortcut_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -365,14 +302,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CreateShortcut(mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
 
-public:
     struct CreateThreadCursorWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -383,14 +318,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CreateThreadCursorWrapper(int32_t) -> void;
 
-public:
     struct DeleteMessageWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -402,14 +335,12 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto DeleteMessageWrapper(int32_t, int32_t) -> void;
 
-public:
     struct DisableAlarm_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -419,14 +350,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto DisableAlarm() -> void;
 
-public:
     struct DisableBatteryNotifications_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -436,14 +365,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto DisableBatteryNotifications() -> void;
 
-public:
     struct DisableNetworkNotifications_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -453,14 +380,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto DisableNetworkNotifications() -> void;
 
-public:
     struct DisableScreenOrientationNotifications_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -470,14 +395,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto DisableScreenOrientationNotifications() -> void;
 
-public:
     struct DisableSensor_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -488,14 +411,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto DisableSensor(int32_t) -> void;
 
-public:
     struct EnableBatteryNotifications_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -505,14 +426,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EnableBatteryNotifications() -> void;
 
-public:
     struct EnableLocation_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -523,14 +442,12 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EnableLocation(bool) -> void;
 
-public:
     struct EnableLocationHighAccuracy_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -541,14 +458,12 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EnableLocationHighAccuracy(bool) -> void;
 
-public:
     struct EnableNetworkNotifications_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -558,14 +473,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EnableNetworkNotifications() -> void;
 
-public:
     struct EnableScreenOrientationNotifications_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -575,14 +488,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EnableScreenOrientationNotifications() -> void;
 
-public:
     struct EnableSensor_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -593,14 +504,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EnableSensor(int32_t) -> void;
 
-public:
     struct GamepadAdded_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -612,14 +521,12 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GamepadAdded(int32_t, int32_t) -> void;
 
-public:
     struct GetConnection_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -630,14 +537,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Ljava/net/URLConnection;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetConnection(mozilla::jni::String::Param) -> mozilla::jni::Object::LocalRef;
 
-public:
     struct GetContext_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -647,14 +552,12 @@ public:
         static constexpr char signature[] =
                 "()Landroid/content/Context;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetContext() -> mozilla::jni::Object::LocalRef;
 
-public:
     struct GetCurrentBatteryInformationWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::DoubleArray::LocalRef ReturnType;
@@ -664,14 +567,12 @@ public:
         static constexpr char signature[] =
                 "()[D";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetCurrentBatteryInformationWrapper() -> mozilla::jni::DoubleArray::LocalRef;
 
-public:
     struct GetCurrentNetworkInformationWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::DoubleArray::LocalRef ReturnType;
@@ -681,14 +582,12 @@ public:
         static constexpr char signature[] =
                 "()[D";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetCurrentNetworkInformationWrapper() -> mozilla::jni::DoubleArray::LocalRef;
 
-public:
     struct GetDensity_t {
         typedef GeckoAppShell Owner;
         typedef float ReturnType;
@@ -698,14 +597,12 @@ public:
         static constexpr char signature[] =
                 "()F";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetDensity() -> float;
 
-public:
     struct GetDpiWrapper_t {
         typedef GeckoAppShell Owner;
         typedef int32_t ReturnType;
@@ -715,14 +612,12 @@ public:
         static constexpr char signature[] =
                 "()I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetDpiWrapper() -> int32_t;
 
-public:
     struct GetExtensionFromMimeTypeWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -733,14 +628,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetExtensionFromMimeTypeWrapper(mozilla::jni::String::Param) -> mozilla::jni::String::LocalRef;
 
-public:
     struct GetExternalPublicDirectory_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -751,14 +644,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetExternalPublicDirectory(mozilla::jni::String::Param) -> mozilla::jni::String::LocalRef;
 
-public:
     struct GetHWDecoderCapability_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -768,14 +659,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetHWDecoderCapability() -> bool;
 
-public:
     struct GetHWEncoderCapability_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -785,14 +674,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetHWEncoderCapability() -> bool;
 
-public:
     struct GetHandlersForMimeTypeWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -804,14 +691,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetHandlersForMimeTypeWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param) -> mozilla::jni::ObjectArray::LocalRef;
 
-public:
     struct GetHandlersForURLWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -823,14 +708,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetHandlersForURLWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param) -> mozilla::jni::ObjectArray::LocalRef;
 
-public:
     struct GetIconForExtensionWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::ByteArray::LocalRef ReturnType;
@@ -842,14 +725,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;I)[B";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetIconForExtensionWrapper(mozilla::jni::String::Param, int32_t) -> mozilla::jni::ByteArray::LocalRef;
 
-public:
     struct GetMaxTouchPoints_t {
         typedef GeckoAppShell Owner;
         typedef int32_t ReturnType;
@@ -859,14 +740,12 @@ public:
         static constexpr char signature[] =
                 "()I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetMaxTouchPoints() -> int32_t;
 
-public:
     struct GetMessageWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -878,14 +757,12 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetMessageWrapper(int32_t, int32_t) -> void;
 
-public:
     struct GetMimeTypeFromExtensionsWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -896,14 +773,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetMimeTypeFromExtensionsWrapper(mozilla::jni::String::Param) -> mozilla::jni::String::LocalRef;
 
-public:
     struct GetNextMessageWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -914,14 +789,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetNextMessageWrapper(int32_t) -> void;
 
-public:
     struct GetNextThreadWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -932,14 +805,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetNextThreadWrapper(int32_t) -> void;
 
-public:
     struct GetProxyForURIWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -953,14 +824,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetProxyForURIWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, int32_t) -> mozilla::jni::String::LocalRef;
 
-public:
     struct GetScreenAngle_t {
         typedef GeckoAppShell Owner;
         typedef int32_t ReturnType;
@@ -970,14 +839,12 @@ public:
         static constexpr char signature[] =
                 "()I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetScreenAngle() -> int32_t;
 
-public:
     struct GetScreenDepthWrapper_t {
         typedef GeckoAppShell Owner;
         typedef int32_t ReturnType;
@@ -987,14 +854,12 @@ public:
         static constexpr char signature[] =
                 "()I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetScreenDepthWrapper() -> int32_t;
 
-public:
     struct GetScreenOrientationWrapper_t {
         typedef GeckoAppShell Owner;
         typedef int16_t ReturnType;
@@ -1004,14 +869,12 @@ public:
         static constexpr char signature[] =
                 "()S";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetScreenOrientationWrapper() -> int16_t;
 
-public:
     struct GetScreenSize_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -1021,14 +884,12 @@ public:
         static constexpr char signature[] =
                 "()Landroid/graphics/Rect;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetScreenSize() -> mozilla::jni::Object::LocalRef;
 
-public:
     struct GetShowPasswordSetting_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1038,14 +899,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetShowPasswordSetting() -> bool;
 
-public:
     struct GetSystemColoursWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::IntArray::LocalRef ReturnType;
@@ -1055,14 +914,12 @@ public:
         static constexpr char signature[] =
                 "()[I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetSystemColoursWrapper() -> mozilla::jni::IntArray::LocalRef;
 
-public:
     struct HandleGeckoMessageWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1073,14 +930,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/util/NativeJSContainer;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto HandleGeckoMessageWrapper(mozilla::jni::Object::Param) -> void;
 
-public:
     struct HandleUncaughtException_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -1091,14 +946,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/Throwable;)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::IGNORE;
     };
 
     static auto HandleUncaughtException(mozilla::jni::Throwable::Param) -> mozilla::jni::String::LocalRef;
 
-public:
     struct HideProgressDialog_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1108,14 +961,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto HideProgressDialog() -> void;
 
-public:
     struct InitCameraWrapper_t {
         typedef GeckoAppShell Owner;
         typedef mozilla::jni::IntArray::LocalRef ReturnType;
@@ -1129,14 +980,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;III)[I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto InitCameraWrapper(mozilla::jni::String::Param, int32_t, int32_t, int32_t) -> mozilla::jni::IntArray::LocalRef;
 
-public:
     struct IsNetworkLinkKnown_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1146,14 +995,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto IsNetworkLinkKnown() -> bool;
 
-public:
     struct IsNetworkLinkUp_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1163,14 +1010,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto IsNetworkLinkUp() -> bool;
 
-public:
     struct IsTablet_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1180,14 +1025,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto IsTablet() -> bool;
 
-public:
     struct KillAnyZombies_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1197,18 +1040,16 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto KillAnyZombies() -> void;
 
-public:
     struct LoadPluginClass_t {
         typedef GeckoAppShell Owner;
-        typedef mozilla::jni::ClassObject::LocalRef ReturnType;
-        typedef mozilla::jni::ClassObject::Param SetterType;
+        typedef mozilla::jni::Class::LocalRef ReturnType;
+        typedef mozilla::jni::Class::Param SetterType;
         typedef mozilla::jni::Args<
                 mozilla::jni::String::Param,
                 mozilla::jni::String::Param> Args;
@@ -1216,14 +1057,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-    static auto LoadPluginClass(mozilla::jni::String::Param, mozilla::jni::String::Param) -> mozilla::jni::ClassObject::LocalRef;
+    static auto LoadPluginClass(mozilla::jni::String::Param, mozilla::jni::String::Param) -> mozilla::jni::Class::LocalRef;
 
-public:
     struct LockScreenOrientation_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1234,14 +1073,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto LockScreenOrientation(int32_t) -> void;
 
-public:
     struct MarkMessageRead_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1255,14 +1092,12 @@ public:
         static constexpr char signature[] =
                 "(IZZI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto MarkMessageRead(int32_t, bool, bool, int32_t) -> void;
 
-public:
     struct MarkURIVisited_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1273,14 +1108,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto MarkURIVisited(mozilla::jni::String::Param) -> void;
 
-public:
     struct MoveTaskToBack_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1290,14 +1123,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto MoveTaskToBack() -> void;
 
-public:
     struct NetworkLinkType_t {
         typedef GeckoAppShell Owner;
         typedef int32_t ReturnType;
@@ -1307,14 +1138,12 @@ public:
         static constexpr char signature[] =
                 "()I";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto NetworkLinkType() -> int32_t;
 
-public:
     struct NotifyDefaultPrevented_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1325,14 +1154,12 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto NotifyDefaultPrevented(bool) -> void;
 
-public:
     struct NotifyWakeLockChanged_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1344,14 +1171,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto NotifyWakeLockChanged(mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
 
-public:
     struct OpenUriExternal_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1367,14 +1192,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto OpenUriExternal(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> bool;
 
-public:
     struct PerformHapticFeedback_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1385,14 +1208,12 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto PerformHapticFeedback(bool) -> void;
 
-public:
     struct RegisterSurfaceTextureFrameListener_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1404,14 +1225,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/Object;I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto RegisterSurfaceTextureFrameListener(mozilla::jni::Object::Param, int32_t) -> void;
 
-public:
     struct RemovePluginView_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1423,14 +1242,12 @@ public:
         static constexpr char signature[] =
                 "(Landroid/view/View;Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto RemovePluginView(mozilla::jni::Object::Param, bool) -> void;
 
-public:
     struct RequestUiThreadCallback_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1441,14 +1258,12 @@ public:
         static constexpr char signature[] =
                 "(J)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto RequestUiThreadCallback(int64_t) -> void;
 
-public:
     struct ScheduleRestart_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1458,14 +1273,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ScheduleRestart() -> void;
 
-public:
     struct SendMessageWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1478,14 +1291,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SendMessageWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, int32_t) -> void;
 
-public:
     struct SetAlarm_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1497,14 +1308,12 @@ public:
         static constexpr char signature[] =
                 "(II)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetAlarm(int32_t, int32_t) -> bool;
 
-public:
     struct SetFullScreen_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1515,14 +1324,12 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetFullScreen(bool) -> void;
 
-public:
     struct SetKeepScreenOn_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1533,14 +1340,12 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetKeepScreenOn(bool) -> void;
 
-public:
     struct SetScreenDepthOverride_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1551,14 +1356,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetScreenDepthOverride(int32_t) -> void;
 
-public:
     struct SetURITitle_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1570,14 +1373,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetURITitle(mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
 
-public:
     struct ShowAlertNotificationWrapper_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1593,14 +1394,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ShowAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
 
-public:
     struct ShowInputMethodPicker_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1610,14 +1409,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ShowInputMethodPicker() -> void;
 
-public:
     struct StartMonitoringGamepad_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1627,14 +1424,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto StartMonitoringGamepad() -> void;
 
-public:
     struct StopMonitoringGamepad_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1644,14 +1439,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto StopMonitoringGamepad() -> void;
 
-public:
     struct UnlockProfile_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
@@ -1661,14 +1454,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto UnlockProfile() -> bool;
 
-public:
     struct UnlockScreenOrientation_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1678,14 +1469,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto UnlockScreenOrientation() -> void;
 
-public:
     struct UnregisterSurfaceTextureFrameListener_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1696,14 +1485,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/Object;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto UnregisterSurfaceTextureFrameListener(mozilla::jni::Object::Param) -> void;
 
-public:
     struct Vibrate1_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1714,14 +1501,12 @@ public:
         static constexpr char signature[] =
                 "(J)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto Vibrate1(int64_t) -> void;
 
-public:
     struct VibrateA_t {
         typedef GeckoAppShell Owner;
         typedef void ReturnType;
@@ -1733,30 +1518,21 @@ public:
         static constexpr char signature[] =
                 "([JI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto VibrateA(mozilla::jni::LongArray::Param, int32_t) -> void;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class GeckoEditable : public mozilla::jni::Class<GeckoEditable>
+class GeckoEditable : public mozilla::jni::ObjectBase<GeckoEditable, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoEditable> Ref;
-    typedef mozilla::jni::LocalRef<GeckoEditable> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoEditable> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoEditable>& Param;
+    explicit GeckoEditable(const Context& ctx) : ObjectBase<GeckoEditable, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoEditable";
-
-protected:
-    GeckoEditable(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef GeckoEditable Owner;
         typedef GeckoEditable::LocalRef ReturnType;
@@ -1767,14 +1543,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoView;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(mozilla::jni::Object::Param) -> GeckoEditable::LocalRef;
 
-public:
     struct DisposeNative_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1784,12 +1558,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifyIME_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1800,14 +1572,12 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto NotifyIME(int32_t) const -> void;
 
-public:
     struct NotifyIMEContext_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1821,14 +1591,12 @@ public:
         static constexpr char signature[] =
                 "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto NotifyIMEContext(int32_t, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) const -> void;
 
-public:
     struct OnImeAcknowledgeFocus_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1838,12 +1606,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnImeAddCompositionRange_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1862,12 +1628,10 @@ public:
         static constexpr char signature[] =
                 "(IIIIIZIII)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnImeReplaceText_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1880,12 +1644,10 @@ public:
         static constexpr char signature[] =
                 "(IILjava/lang/String;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnImeSynchronize_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1895,12 +1657,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnImeUpdateComposition_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1912,12 +1672,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnKeyEvent_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1938,12 +1696,10 @@ public:
         static constexpr char signature[] =
                 "(IIIIJIIIIIZ)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnSelectionChange_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1955,14 +1711,12 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto OnSelectionChange(int32_t, int32_t) const -> void;
 
-public:
     struct OnTextChange_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1976,14 +1730,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/CharSequence;III)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto OnTextChange(mozilla::jni::String::Param, int32_t, int32_t, int32_t) const -> void;
 
-public:
     struct OnViewChange_t {
         typedef GeckoEditable Owner;
         typedef void ReturnType;
@@ -1994,54 +1746,35 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoView;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto OnViewChange(mozilla::jni::Object::Param) const -> void;
 
-public:
+    static const bool isMultithreaded = false;
+
     template<class Impl> class Natives;
 };
 
-class GeckoEditableListener : public mozilla::jni::Class<GeckoEditableListener>
+class GeckoEditableListener : public mozilla::jni::ObjectBase<GeckoEditableListener, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoEditableListener> Ref;
-    typedef mozilla::jni::LocalRef<GeckoEditableListener> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoEditableListener> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoEditableListener>& Param;
+    explicit GeckoEditableListener(const Context& ctx) : ObjectBase<GeckoEditableListener, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoEditableListener";
-
-protected:
-    GeckoEditableListener(jobject instance) : Class(instance) {}
-
-public:
     static const int32_t NOTIFY_IME_OPEN_VKB = -2;
 
-public:
     static const int32_t NOTIFY_IME_REPLY_EVENT = -1;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class GeckoJavaSampler : public mozilla::jni::Class<GeckoJavaSampler>
+class GeckoJavaSampler : public mozilla::jni::ObjectBase<GeckoJavaSampler, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoJavaSampler> Ref;
-    typedef mozilla::jni::LocalRef<GeckoJavaSampler> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoJavaSampler> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoJavaSampler>& Param;
+    explicit GeckoJavaSampler(const Context& ctx) : ObjectBase<GeckoJavaSampler, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoJavaSampler";
-
-protected:
-    GeckoJavaSampler(jobject instance) : Class(instance) {}
-
-public:
     struct GetFrameNameJavaProfilingWrapper_t {
         typedef GeckoJavaSampler Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -2054,14 +1787,12 @@ public:
         static constexpr char signature[] =
                 "(III)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetFrameNameJavaProfilingWrapper(int32_t, int32_t, int32_t) -> mozilla::jni::String::LocalRef;
 
-public:
     struct GetProfilerTime_t {
         typedef GeckoJavaSampler Owner;
         typedef double ReturnType;
@@ -2071,12 +1802,10 @@ public:
         static constexpr char signature[] =
                 "()D";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetSampleTimeJavaProfiling_t {
         typedef GeckoJavaSampler Owner;
         typedef double ReturnType;
@@ -2088,14 +1817,12 @@ public:
         static constexpr char signature[] =
                 "(II)D";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetSampleTimeJavaProfiling(int32_t, int32_t) -> double;
 
-public:
     struct GetThreadNameJavaProfilingWrapper_t {
         typedef GeckoJavaSampler Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -2106,14 +1833,12 @@ public:
         static constexpr char signature[] =
                 "(I)Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetThreadNameJavaProfilingWrapper(int32_t) -> mozilla::jni::String::LocalRef;
 
-public:
     struct PauseJavaProfiling_t {
         typedef GeckoJavaSampler Owner;
         typedef void ReturnType;
@@ -2123,14 +1848,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto PauseJavaProfiling() -> void;
 
-public:
     struct StartJavaProfiling_t {
         typedef GeckoJavaSampler Owner;
         typedef void ReturnType;
@@ -2142,14 +1865,12 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto StartJavaProfiling(int32_t, int32_t) -> void;
 
-public:
     struct StopJavaProfiling_t {
         typedef GeckoJavaSampler Owner;
         typedef void ReturnType;
@@ -2159,14 +1880,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto StopJavaProfiling() -> void;
 
-public:
     struct UnpauseJavaProfiling_t {
         typedef GeckoJavaSampler Owner;
         typedef void ReturnType;
@@ -2176,32 +1895,22 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto UnpauseJavaProfiling() -> void;
 
-public:
+    static const bool isMultithreaded = true;
+
     template<class Impl> class Natives;
 };
 
-class GeckoSmsManager : public mozilla::jni::Class<GeckoSmsManager>
+class GeckoSmsManager : public mozilla::jni::ObjectBase<GeckoSmsManager, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoSmsManager> Ref;
-    typedef mozilla::jni::LocalRef<GeckoSmsManager> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoSmsManager> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoSmsManager>& Param;
+    explicit GeckoSmsManager(const Context& ctx) : ObjectBase<GeckoSmsManager, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoSmsManager";
-
-protected:
-    GeckoSmsManager(jobject instance) : Class(instance) {}
-
-public:
     struct NotifyCursorDone_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2212,12 +1921,10 @@ public:
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifyCursorError_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2229,12 +1936,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifyGetSms_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2252,12 +1957,10 @@ public:
         static constexpr char signature[] =
                 "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JZI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifyGetSmsFailed_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2269,12 +1972,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifyMessageCursorResult_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2293,12 +1994,10 @@ public:
         static constexpr char signature[] =
                 "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JJZI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsDeleteFailed_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2310,12 +2009,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsDeleted_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2327,12 +2024,10 @@ public:
         static constexpr char signature[] =
                 "(ZI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsDelivery_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2347,12 +2042,10 @@ public:
         static constexpr char signature[] =
                 "(IILjava/lang/String;Ljava/lang/String;J)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsMarkAsReadFailed_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2364,12 +2057,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsMarkedAsRead_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2381,12 +2072,10 @@ public:
         static constexpr char signature[] =
                 "(ZI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsReceived_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2402,12 +2091,10 @@ public:
         static constexpr char signature[] =
                 "(ILjava/lang/String;Ljava/lang/String;IJJ)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsSendFailed_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2419,12 +2106,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifySmsSent_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2439,12 +2124,10 @@ public:
         static constexpr char signature[] =
                 "(ILjava/lang/String;Ljava/lang/String;JI)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct NotifyThreadCursorResult_t {
         typedef GeckoSmsManager Owner;
         typedef void ReturnType;
@@ -2462,33 +2145,22 @@ public:
         static constexpr char signature[] =
                 "(JLjava/lang/String;Ljava/lang/String;J[Ljava/lang/Object;JLjava/lang/String;I)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
+    static const bool isMultithreaded = false;
+
     template<class Impl> class Natives;
 };
 
-class GeckoThread : public mozilla::jni::Class<GeckoThread>
+class GeckoThread : public mozilla::jni::ObjectBase<GeckoThread, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoThread> Ref;
-    typedef mozilla::jni::LocalRef<GeckoThread> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoThread> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoThread>& Param;
+    explicit GeckoThread(const Context& ctx) : ObjectBase<GeckoThread, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoThread";
-
-protected:
-    GeckoThread(jobject instance) : Class(instance) {}
-
-public:
     class State;
 
-public:
     struct CheckAndSetState_t {
         typedef GeckoThread Owner;
         typedef bool ReturnType;
@@ -2500,14 +2172,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoThread$State;Lorg/mozilla/gecko/GeckoThread$State;)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CheckAndSetState(mozilla::jni::Object::Param, mozilla::jni::Object::Param) -> bool;
 
-public:
     struct PumpMessageLoop_t {
         typedef GeckoThread Owner;
         typedef bool ReturnType;
@@ -2518,14 +2188,12 @@ public:
         static constexpr char signature[] =
                 "(Landroid/os/Message;)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto PumpMessageLoop(mozilla::jni::Object::Param) -> bool;
 
-public:
     struct SetState_t {
         typedef GeckoThread Owner;
         typedef void ReturnType;
@@ -2536,14 +2204,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoThread$State;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetState(mozilla::jni::Object::Param) -> void;
 
-public:
     struct SpeculativeConnect_t {
         typedef GeckoThread Owner;
         typedef void ReturnType;
@@ -2554,12 +2220,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct ClsLoader_t {
         typedef GeckoThread Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -2569,14 +2233,12 @@ public:
         static constexpr char signature[] =
                 "Ljava/lang/ClassLoader;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ClsLoader() -> mozilla::jni::Object::LocalRef;
 
-public:
     struct MsgQueue_t {
         typedef GeckoThread Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -2586,7 +2248,6 @@ public:
         static constexpr char signature[] =
                 "Landroid/os/MessageQueue;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -2595,25 +2256,16 @@ public:
 
     static auto MsgQueue(mozilla::jni::Object::Param) -> void;
 
-public:
+    static const bool isMultithreaded = false;
+
     template<class Impl> class Natives;
 };
 
-class GeckoThread::State : public mozilla::jni::Class<State>
+class GeckoThread::State : public mozilla::jni::ObjectBase<State, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<State> Ref;
-    typedef mozilla::jni::LocalRef<State> LocalRef;
-    typedef mozilla::jni::GlobalRef<State> GlobalRef;
-    typedef const mozilla::jni::Param<State>& Param;
+    explicit State(const Context& ctx) : ObjectBase<State, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoThread$State";
-
-protected:
-    State(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2625,14 +2277,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;I)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(mozilla::jni::String::Param, int32_t) -> State::LocalRef;
 
-public:
     struct Is_t {
         typedef State Owner;
         typedef bool ReturnType;
@@ -2643,14 +2293,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoThread$State;)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto Is(State::Param) const -> bool;
 
-public:
     struct IsAtLeast_t {
         typedef State Owner;
         typedef bool ReturnType;
@@ -2661,14 +2309,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoThread$State;)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto IsAtLeast(State::Param) const -> bool;
 
-public:
     struct IsAtMost_t {
         typedef State Owner;
         typedef bool ReturnType;
@@ -2679,14 +2325,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoThread$State;)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto IsAtMost(State::Param) const -> bool;
 
-public:
     struct IsBetween_t {
         typedef State Owner;
         typedef bool ReturnType;
@@ -2698,14 +2342,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoThread$State;Lorg/mozilla/gecko/GeckoThread$State;)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto IsBetween(State::Param, State::Param) const -> bool;
 
-public:
     struct ValueOf_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2716,14 +2358,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ValueOf(mozilla::jni::String::Param) -> State::LocalRef;
 
-public:
     struct Values_t {
         typedef State Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -2733,14 +2373,12 @@ public:
         static constexpr char signature[] =
                 "()[Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto Values() -> mozilla::jni::ObjectArray::LocalRef;
 
-public:
     struct EXITED_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2750,14 +2388,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EXITED() -> State::LocalRef;
 
-public:
     struct EXITING_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2767,14 +2403,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto EXITING() -> State::LocalRef;
 
-public:
     struct INITIAL_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2784,14 +2418,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto INITIAL() -> State::LocalRef;
 
-public:
     struct JNI_READY_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2801,14 +2433,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto JNI_READY() -> State::LocalRef;
 
-public:
     struct LAUNCHED_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2818,14 +2448,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto LAUNCHED() -> State::LocalRef;
 
-public:
     struct LIBS_READY_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2835,14 +2463,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto LIBS_READY() -> State::LocalRef;
 
-public:
     struct MOZGLUE_READY_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2852,14 +2478,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto MOZGLUE_READY() -> State::LocalRef;
 
-public:
     struct PROFILE_READY_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2869,14 +2493,12 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto PROFILE_READY() -> State::LocalRef;
 
-public:
     struct RUNNING_t {
         typedef State Owner;
         typedef State::LocalRef ReturnType;
@@ -2886,49 +2508,32 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/GeckoThread$State;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto RUNNING() -> State::LocalRef;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class GeckoView : public mozilla::jni::Class<GeckoView>
+class GeckoView : public mozilla::jni::ObjectBase<GeckoView, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoView> Ref;
-    typedef mozilla::jni::LocalRef<GeckoView> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoView> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoView>& Param;
+    explicit GeckoView(const Context& ctx) : ObjectBase<GeckoView, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoView";
-
-protected:
-    GeckoView(jobject instance) : Class(instance) {}
-
-public:
     class Window;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class GeckoView::Window : public mozilla::jni::Class<Window>
+class GeckoView::Window : public mozilla::jni::ObjectBase<Window, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<Window> Ref;
-    typedef mozilla::jni::LocalRef<Window> LocalRef;
-    typedef mozilla::jni::GlobalRef<Window> GlobalRef;
-    typedef const mozilla::jni::Param<Window>& Param;
+    explicit Window(const Context& ctx) : ObjectBase<Window, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/GeckoView$Window";
-
-protected:
-    Window(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef Window Owner;
         typedef Window::LocalRef ReturnType;
@@ -2938,14 +2543,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New() -> Window::LocalRef;
 
-public:
     struct Close_t {
         typedef Window Owner;
         typedef void ReturnType;
@@ -2955,12 +2558,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct DisposeNative_t {
         typedef Window Owner;
         typedef void ReturnType;
@@ -2970,12 +2571,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct Open_t {
         typedef Window Owner;
         typedef void ReturnType;
@@ -2990,12 +2589,10 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoView$Window;Lorg/mozilla/gecko/GeckoView;Lorg/mozilla/gecko/gfx/GLController;II)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct Reattach_t {
         typedef Window Owner;
         typedef void ReturnType;
@@ -3006,12 +2603,10 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/GeckoView;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GlController_t {
         typedef Window Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3021,32 +2616,22 @@ public:
         static constexpr char signature[] =
                 "Lorg/mozilla/gecko/gfx/GLController;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto GlController() const -> mozilla::jni::Object::LocalRef;
 
-public:
+    static const bool isMultithreaded = true;
+
     template<class Impl> class Natives;
 };
 
-class PrefsHelper : public mozilla::jni::Class<PrefsHelper>
+class PrefsHelper : public mozilla::jni::ObjectBase<PrefsHelper, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<PrefsHelper> Ref;
-    typedef mozilla::jni::LocalRef<PrefsHelper> LocalRef;
-    typedef mozilla::jni::GlobalRef<PrefsHelper> GlobalRef;
-    typedef const mozilla::jni::Param<PrefsHelper>& Param;
+    explicit PrefsHelper(const Context& ctx) : ObjectBase<PrefsHelper, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/PrefsHelper";
-
-protected:
-    PrefsHelper(jobject instance) : Class(instance) {}
-
-public:
     struct CallPrefHandler_t {
         typedef PrefsHelper Owner;
         typedef void ReturnType;
@@ -3062,14 +2647,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/PrefsHelper$PrefHandler;ILjava/lang/String;ZILjava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto CallPrefHandler(mozilla::jni::Object::Param, int32_t, mozilla::jni::String::Param, bool, int32_t, mozilla::jni::String::Param) -> void;
 
-public:
     struct AddObserver_t {
         typedef PrefsHelper Owner;
         typedef void ReturnType;
@@ -3082,12 +2665,10 @@ public:
         static constexpr char signature[] =
                 "([Ljava/lang/String;Lorg/mozilla/gecko/PrefsHelper$PrefHandler;[Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetPrefs_t {
         typedef PrefsHelper Owner;
         typedef void ReturnType;
@@ -3099,12 +2680,10 @@ public:
         static constexpr char signature[] =
                 "([Ljava/lang/String;Lorg/mozilla/gecko/PrefsHelper$PrefHandler;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct RemoveObserver_t {
         typedef PrefsHelper Owner;
         typedef void ReturnType;
@@ -3115,12 +2694,10 @@ public:
         static constexpr char signature[] =
                 "([Ljava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct SetPref_t {
         typedef PrefsHelper Owner;
         typedef void ReturnType;
@@ -3136,12 +2713,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;ZIZILjava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnPrefChange_t {
         typedef PrefsHelper Owner;
         typedef void ReturnType;
@@ -3156,47 +2731,32 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;IZILjava/lang/String;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto OnPrefChange(mozilla::jni::String::Param, int32_t, bool, int32_t, mozilla::jni::String::Param) -> void;
 
-public:
     static const int32_t PREF_BOOL = 1;
 
-public:
     static const int32_t PREF_FINISH = 0;
 
-public:
     static const int32_t PREF_INT = 2;
 
-public:
     static const int32_t PREF_INVALID = -1;
 
-public:
     static const int32_t PREF_STRING = 3;
 
-public:
+    static const bool isMultithreaded = false;
+
     template<class Impl> class Natives;
 };
 
-class Restrictions : public mozilla::jni::Class<Restrictions>
+class Restrictions : public mozilla::jni::ObjectBase<Restrictions, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<Restrictions> Ref;
-    typedef mozilla::jni::LocalRef<Restrictions> LocalRef;
-    typedef mozilla::jni::GlobalRef<Restrictions> GlobalRef;
-    typedef const mozilla::jni::Param<Restrictions>& Param;
+    explicit Restrictions(const Context& ctx) : ObjectBase<Restrictions, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/Restrictions";
-
-protected:
-    Restrictions(jobject instance) : Class(instance) {}
-
-public:
     struct IsAllowed_t {
         typedef Restrictions Owner;
         typedef bool ReturnType;
@@ -3208,14 +2768,12 @@ public:
         static constexpr char signature[] =
                 "(ILjava/lang/String;)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto IsAllowed(int32_t, mozilla::jni::String::Param) -> bool;
 
-public:
     struct IsUserRestricted_t {
         typedef Restrictions Owner;
         typedef bool ReturnType;
@@ -3225,30 +2783,21 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto IsUserRestricted() -> bool;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class SurfaceBits : public mozilla::jni::Class<SurfaceBits>
+class SurfaceBits : public mozilla::jni::ObjectBase<SurfaceBits, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<SurfaceBits> Ref;
-    typedef mozilla::jni::LocalRef<SurfaceBits> LocalRef;
-    typedef mozilla::jni::GlobalRef<SurfaceBits> GlobalRef;
-    typedef const mozilla::jni::Param<SurfaceBits>& Param;
+    explicit SurfaceBits(const Context& ctx) : ObjectBase<SurfaceBits, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/SurfaceBits";
-
-protected:
-    SurfaceBits(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef SurfaceBits Owner;
         typedef SurfaceBits::LocalRef ReturnType;
@@ -3258,14 +2807,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New() -> SurfaceBits::LocalRef;
 
-public:
     struct Buffer_t {
         typedef SurfaceBits Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3275,7 +2822,6 @@ public:
         static constexpr char signature[] =
                 "Ljava/nio/ByteBuffer;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -3284,7 +2830,6 @@ public:
 
     auto Buffer(mozilla::jni::Object::Param) const -> void;
 
-public:
     struct Format_t {
         typedef SurfaceBits Owner;
         typedef int32_t ReturnType;
@@ -3294,7 +2839,6 @@ public:
         static constexpr char signature[] =
                 "I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -3303,7 +2847,6 @@ public:
 
     auto Format(int32_t) const -> void;
 
-public:
     struct Height_t {
         typedef SurfaceBits Owner;
         typedef int32_t ReturnType;
@@ -3313,7 +2856,6 @@ public:
         static constexpr char signature[] =
                 "I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -3322,7 +2864,6 @@ public:
 
     auto Height(int32_t) const -> void;
 
-public:
     struct Width_t {
         typedef SurfaceBits Owner;
         typedef int32_t ReturnType;
@@ -3332,7 +2873,6 @@ public:
         static constexpr char signature[] =
                 "I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -3341,23 +2881,15 @@ public:
 
     auto Width(int32_t) const -> void;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class ThumbnailHelper : public mozilla::jni::Class<ThumbnailHelper>
+class ThumbnailHelper : public mozilla::jni::ObjectBase<ThumbnailHelper, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<ThumbnailHelper> Ref;
-    typedef mozilla::jni::LocalRef<ThumbnailHelper> LocalRef;
-    typedef mozilla::jni::GlobalRef<ThumbnailHelper> GlobalRef;
-    typedef const mozilla::jni::Param<ThumbnailHelper>& Param;
+    explicit ThumbnailHelper(const Context& ctx) : ObjectBase<ThumbnailHelper, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/ThumbnailHelper";
-
-protected:
-    ThumbnailHelper(jobject instance) : Class(instance) {}
-
-public:
     struct SendThumbnail_t {
         typedef ThumbnailHelper Owner;
         typedef void ReturnType;
@@ -3371,30 +2903,21 @@ public:
         static constexpr char signature[] =
                 "(Ljava/nio/ByteBuffer;IZZ)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SendThumbnail(mozilla::jni::Object::Param, int32_t, bool, bool) -> void;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class Distribution : public mozilla::jni::Class<Distribution>
+class Distribution : public mozilla::jni::ObjectBase<Distribution, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<Distribution> Ref;
-    typedef mozilla::jni::LocalRef<Distribution> LocalRef;
-    typedef mozilla::jni::GlobalRef<Distribution> GlobalRef;
-    typedef const mozilla::jni::Param<Distribution>& Param;
+    explicit Distribution(const Context& ctx) : ObjectBase<Distribution, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/distribution/Distribution";
-
-protected:
-    Distribution(jobject instance) : Class(instance) {}
-
-public:
     struct GetDistributionDirectories_t {
         typedef Distribution Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -3404,30 +2927,21 @@ public:
         static constexpr char signature[] =
                 "()[Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetDistributionDirectories() -> mozilla::jni::ObjectArray::LocalRef;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class DisplayPortMetrics : public mozilla::jni::Class<DisplayPortMetrics>
+class DisplayPortMetrics : public mozilla::jni::ObjectBase<DisplayPortMetrics, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<DisplayPortMetrics> Ref;
-    typedef mozilla::jni::LocalRef<DisplayPortMetrics> LocalRef;
-    typedef mozilla::jni::GlobalRef<DisplayPortMetrics> GlobalRef;
-    typedef const mozilla::jni::Param<DisplayPortMetrics>& Param;
+    explicit DisplayPortMetrics(const Context& ctx) : ObjectBase<DisplayPortMetrics, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/DisplayPortMetrics";
-
-protected:
-    DisplayPortMetrics(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef DisplayPortMetrics Owner;
         typedef DisplayPortMetrics::LocalRef ReturnType;
@@ -3442,14 +2956,12 @@ public:
         static constexpr char signature[] =
                 "(FFFFF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(float, float, float, float, float) -> DisplayPortMetrics::LocalRef;
 
-public:
     struct MPosition_t {
         typedef DisplayPortMetrics Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3459,14 +2971,12 @@ public:
         static constexpr char signature[] =
                 "Landroid/graphics/RectF;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto MPosition() const -> mozilla::jni::Object::LocalRef;
 
-public:
     struct Resolution_t {
         typedef DisplayPortMetrics Owner;
         typedef float ReturnType;
@@ -3476,30 +2986,21 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto Resolution() const -> float;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class GLController : public mozilla::jni::Class<GLController>
+class GLController : public mozilla::jni::ObjectBase<GLController, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GLController> Ref;
-    typedef mozilla::jni::LocalRef<GLController> LocalRef;
-    typedef mozilla::jni::GlobalRef<GLController> GlobalRef;
-    typedef const mozilla::jni::Param<GLController>& Param;
+    explicit GLController(const Context& ctx) : ObjectBase<GLController, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/GLController";
-
-protected:
-    GLController(jobject instance) : Class(instance) {}
-
-public:
     struct AttachToJava_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3511,12 +3012,10 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/gfx/GeckoLayerClient;Lorg/mozilla/gecko/gfx/NativePanZoomController;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct CreateCompositor_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3528,12 +3027,10 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct CreateEGLSurface_t {
         typedef GLController Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3543,14 +3040,12 @@ public:
         static constexpr char signature[] =
                 "()Ljavax/microedition/khronos/egl/EGLSurface;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto CreateEGLSurface() const -> mozilla::jni::Object::LocalRef;
 
-public:
     struct Destroy_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3560,14 +3055,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto Destroy() const -> void;
 
-public:
     struct DisposeNative_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3577,12 +3070,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OnSizeChanged_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3596,12 +3087,10 @@ public:
         static constexpr char signature[] =
                 "(IIII)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct PauseCompositor_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3611,12 +3100,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct SyncInvalidateAndScheduleComposite_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3626,12 +3113,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct SyncResumeResizeCompositor_t {
         typedef GLController Owner;
         typedef void ReturnType;
@@ -3643,30 +3128,20 @@ public:
         static constexpr char signature[] =
                 "(II)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
+    static const bool isMultithreaded = true;
+
     template<class Impl> class Natives;
 };
 
-class GeckoLayerClient : public mozilla::jni::Class<GeckoLayerClient>
+class GeckoLayerClient : public mozilla::jni::ObjectBase<GeckoLayerClient, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<GeckoLayerClient> Ref;
-    typedef mozilla::jni::LocalRef<GeckoLayerClient> LocalRef;
-    typedef mozilla::jni::GlobalRef<GeckoLayerClient> GlobalRef;
-    typedef const mozilla::jni::Param<GeckoLayerClient>& Param;
+    explicit GeckoLayerClient(const Context& ctx) : ObjectBase<GeckoLayerClient, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/GeckoLayerClient";
-
-protected:
-    GeckoLayerClient(jobject instance) : Class(instance) {}
-
-public:
     struct ActivateProgram_t {
         typedef GeckoLayerClient Owner;
         typedef void ReturnType;
@@ -3676,14 +3151,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto ActivateProgram() const -> void;
 
-public:
     struct ContentDocumentChanged_t {
         typedef GeckoLayerClient Owner;
         typedef void ReturnType;
@@ -3693,14 +3166,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto ContentDocumentChanged() const -> void;
 
-public:
     struct CreateFrame_t {
         typedef GeckoLayerClient Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3710,14 +3181,12 @@ public:
         static constexpr char signature[] =
                 "()Lorg/mozilla/gecko/gfx/LayerRenderer$Frame;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto CreateFrame() const -> mozilla::jni::Object::LocalRef;
 
-public:
     struct DeactivateProgramAndRestoreState_t {
         typedef GeckoLayerClient Owner;
         typedef void ReturnType;
@@ -3732,14 +3201,12 @@ public:
         static constexpr char signature[] =
                 "(ZIIII)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto DeactivateProgramAndRestoreState(bool, int32_t, int32_t, int32_t, int32_t) const -> void;
 
-public:
     struct GetDisplayPort_t {
         typedef GeckoLayerClient Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3753,14 +3220,12 @@ public:
         static constexpr char signature[] =
                 "(ZZILorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)Lorg/mozilla/gecko/gfx/DisplayPortMetrics;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto GetDisplayPort(bool, bool, int32_t, mozilla::jni::Object::Param) const -> mozilla::jni::Object::LocalRef;
 
-public:
     struct IsContentDocumentDisplayed_t {
         typedef GeckoLayerClient Owner;
         typedef bool ReturnType;
@@ -3770,14 +3235,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto IsContentDocumentDisplayed() const -> bool;
 
-public:
     struct OnGeckoReady_t {
         typedef GeckoLayerClient Owner;
         typedef void ReturnType;
@@ -3787,14 +3250,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto OnGeckoReady() const -> void;
 
-public:
     struct ProgressiveUpdateCallback_t {
         typedef GeckoLayerClient Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3811,14 +3272,12 @@ public:
         static constexpr char signature[] =
                 "(ZFFFFFZ)Lorg/mozilla/gecko/gfx/ProgressiveUpdateData;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto ProgressiveUpdateCallback(bool, float, float, float, float, float, bool) const -> mozilla::jni::Object::LocalRef;
 
-public:
     struct SetFirstPaintViewport_t {
         typedef GeckoLayerClient Owner;
         typedef void ReturnType;
@@ -3835,14 +3294,12 @@ public:
         static constexpr char signature[] =
                 "(FFFFFFF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto SetFirstPaintViewport(float, float, float, float, float, float, float) const -> void;
 
-public:
     struct SetPageRect_t {
         typedef GeckoLayerClient Owner;
         typedef void ReturnType;
@@ -3856,14 +3313,12 @@ public:
         static constexpr char signature[] =
                 "(FFFF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto SetPageRect(float, float, float, float) const -> void;
 
-public:
     struct SyncFrameMetrics_t {
         typedef GeckoLayerClient Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3887,14 +3342,12 @@ public:
         static constexpr char signature[] =
                 "(FFFFFFFIIIIFZI)Lorg/mozilla/gecko/gfx/ViewTransform;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto SyncFrameMetrics(float, float, float, float, float, float, float, int32_t, int32_t, int32_t, int32_t, float, bool, int32_t) const -> mozilla::jni::Object::LocalRef;
 
-public:
     struct SyncViewportInfo_t {
         typedef GeckoLayerClient Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -3911,30 +3364,21 @@ public:
         static constexpr char signature[] =
                 "(IIIIFZI)Lorg/mozilla/gecko/gfx/ViewTransform;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto SyncViewportInfo(int32_t, int32_t, int32_t, int32_t, float, bool, int32_t) const -> mozilla::jni::Object::LocalRef;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class ImmutableViewportMetrics : public mozilla::jni::Class<ImmutableViewportMetrics>
+class ImmutableViewportMetrics : public mozilla::jni::ObjectBase<ImmutableViewportMetrics, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<ImmutableViewportMetrics> Ref;
-    typedef mozilla::jni::LocalRef<ImmutableViewportMetrics> LocalRef;
-    typedef mozilla::jni::GlobalRef<ImmutableViewportMetrics> GlobalRef;
-    typedef const mozilla::jni::Param<ImmutableViewportMetrics>& Param;
+    explicit ImmutableViewportMetrics(const Context& ctx) : ObjectBase<ImmutableViewportMetrics, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/ImmutableViewportMetrics";
-
-protected:
-    ImmutableViewportMetrics(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef ImmutableViewportMetrics Owner;
         typedef ImmutableViewportMetrics::LocalRef ReturnType;
@@ -3957,49 +3401,32 @@ public:
         static constexpr char signature[] =
                 "(FFFFFFFFFFIIF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(float, float, float, float, float, float, float, float, float, float, int32_t, int32_t, float) -> ImmutableViewportMetrics::LocalRef;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class LayerRenderer : public mozilla::jni::Class<LayerRenderer>
+class LayerRenderer : public mozilla::jni::ObjectBase<LayerRenderer, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<LayerRenderer> Ref;
-    typedef mozilla::jni::LocalRef<LayerRenderer> LocalRef;
-    typedef mozilla::jni::GlobalRef<LayerRenderer> GlobalRef;
-    typedef const mozilla::jni::Param<LayerRenderer>& Param;
+    explicit LayerRenderer(const Context& ctx) : ObjectBase<LayerRenderer, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/LayerRenderer";
-
-protected:
-    LayerRenderer(jobject instance) : Class(instance) {}
-
-public:
     class Frame;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class LayerRenderer::Frame : public mozilla::jni::Class<Frame>
+class LayerRenderer::Frame : public mozilla::jni::ObjectBase<Frame, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<Frame> Ref;
-    typedef mozilla::jni::LocalRef<Frame> LocalRef;
-    typedef mozilla::jni::GlobalRef<Frame> GlobalRef;
-    typedef const mozilla::jni::Param<Frame>& Param;
+    explicit Frame(const Context& ctx) : ObjectBase<Frame, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/LayerRenderer$Frame";
-
-protected:
-    Frame(jobject instance) : Class(instance) {}
-
-public:
     struct BeginDrawing_t {
         typedef Frame Owner;
         typedef void ReturnType;
@@ -4009,14 +3436,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto BeginDrawing() const -> void;
 
-public:
     struct DrawBackground_t {
         typedef Frame Owner;
         typedef void ReturnType;
@@ -4026,14 +3451,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto DrawBackground() const -> void;
 
-public:
     struct DrawForeground_t {
         typedef Frame Owner;
         typedef void ReturnType;
@@ -4043,14 +3466,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto DrawForeground() const -> void;
 
-public:
     struct EndDrawing_t {
         typedef Frame Owner;
         typedef void ReturnType;
@@ -4060,30 +3481,21 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto EndDrawing() const -> void;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class LayerView : public mozilla::jni::Class<LayerView>
+class LayerView : public mozilla::jni::ObjectBase<LayerView, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<LayerView> Ref;
-    typedef mozilla::jni::LocalRef<LayerView> LocalRef;
-    typedef mozilla::jni::GlobalRef<LayerView> GlobalRef;
-    typedef const mozilla::jni::Param<LayerView>& Param;
+    explicit LayerView(const Context& ctx) : ObjectBase<LayerView, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/LayerView";
-
-protected:
-    LayerView(jobject instance) : Class(instance) {}
-
-public:
     struct updateZoomedView_t {
         typedef LayerView Owner;
         typedef void ReturnType;
@@ -4094,30 +3506,21 @@ public:
         static constexpr char signature[] =
                 "(Ljava/nio/ByteBuffer;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto updateZoomedView(mozilla::jni::Object::Param) -> void;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class NativePanZoomController : public mozilla::jni::Class<NativePanZoomController>
+class NativePanZoomController : public mozilla::jni::ObjectBase<NativePanZoomController, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<NativePanZoomController> Ref;
-    typedef mozilla::jni::LocalRef<NativePanZoomController> LocalRef;
-    typedef mozilla::jni::GlobalRef<NativePanZoomController> GlobalRef;
-    typedef const mozilla::jni::Param<NativePanZoomController>& Param;
+    explicit NativePanZoomController(const Context& ctx) : ObjectBase<NativePanZoomController, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/NativePanZoomController";
-
-protected:
-    NativePanZoomController(jobject instance) : Class(instance) {}
-
-public:
     struct AdjustScrollForSurfaceShift_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4129,12 +3532,10 @@ public:
         static constexpr char signature[] =
                 "(FF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct Destroy_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4144,14 +3545,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto Destroy() const -> void;
 
-public:
     struct DisposeNative_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4161,12 +3560,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct HandleMotionEvent_t {
         typedef NativePanZoomController Owner;
         typedef bool ReturnType;
@@ -4187,12 +3584,10 @@ public:
         static constexpr char signature[] =
                 "(IIJI[I[F[F[F[F[F[F)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct AbortAnimation_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4202,12 +3597,10 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct SetIsLongpressEnabled_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4218,12 +3611,10 @@ public:
         static constexpr char signature[] =
                 "(Z)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct RequestContentRepaintWrapper_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4238,14 +3629,12 @@ public:
         static constexpr char signature[] =
                 "(FFFFF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto RequestContentRepaintWrapper(float, float, float, float, float) const -> void;
 
-public:
     struct UpdateOverscrollOffset_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4257,14 +3646,12 @@ public:
         static constexpr char signature[] =
                 "(FF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto UpdateOverscrollOffset(float, float) const -> void;
 
-public:
     struct UpdateOverscrollVelocity_t {
         typedef NativePanZoomController Owner;
         typedef void ReturnType;
@@ -4276,32 +3663,22 @@ public:
         static constexpr char signature[] =
                 "(FF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto UpdateOverscrollVelocity(float, float) const -> void;
 
-public:
+    static const bool isMultithreaded = true;
+
     template<class Impl> class Natives;
 };
 
-class ProgressiveUpdateData : public mozilla::jni::Class<ProgressiveUpdateData>
+class ProgressiveUpdateData : public mozilla::jni::ObjectBase<ProgressiveUpdateData, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<ProgressiveUpdateData> Ref;
-    typedef mozilla::jni::LocalRef<ProgressiveUpdateData> LocalRef;
-    typedef mozilla::jni::GlobalRef<ProgressiveUpdateData> GlobalRef;
-    typedef const mozilla::jni::Param<ProgressiveUpdateData>& Param;
+    explicit ProgressiveUpdateData(const Context& ctx) : ObjectBase<ProgressiveUpdateData, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/ProgressiveUpdateData";
-
-protected:
-    ProgressiveUpdateData(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef ProgressiveUpdateData Owner;
         typedef ProgressiveUpdateData::LocalRef ReturnType;
@@ -4311,14 +3688,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New() -> ProgressiveUpdateData::LocalRef;
 
-public:
     struct SetViewport_t {
         typedef ProgressiveUpdateData Owner;
         typedef void ReturnType;
@@ -4329,14 +3704,12 @@ public:
         static constexpr char signature[] =
                 "(Lorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto SetViewport(mozilla::jni::Object::Param) const -> void;
 
-public:
     struct Abort_t {
         typedef ProgressiveUpdateData Owner;
         typedef bool ReturnType;
@@ -4346,7 +3719,6 @@ public:
         static constexpr char signature[] =
                 "Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4355,7 +3727,6 @@ public:
 
     auto Abort(bool) const -> void;
 
-public:
     struct Scale_t {
         typedef ProgressiveUpdateData Owner;
         typedef float ReturnType;
@@ -4365,7 +3736,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4374,7 +3744,6 @@ public:
 
     auto Scale(float) const -> void;
 
-public:
     struct X_t {
         typedef ProgressiveUpdateData Owner;
         typedef float ReturnType;
@@ -4384,7 +3753,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4393,7 +3761,6 @@ public:
 
     auto X(float) const -> void;
 
-public:
     struct Y_t {
         typedef ProgressiveUpdateData Owner;
         typedef float ReturnType;
@@ -4403,7 +3770,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4412,23 +3778,15 @@ public:
 
     auto Y(float) const -> void;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class ViewTransform : public mozilla::jni::Class<ViewTransform>
+class ViewTransform : public mozilla::jni::ObjectBase<ViewTransform, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<ViewTransform> Ref;
-    typedef mozilla::jni::LocalRef<ViewTransform> LocalRef;
-    typedef mozilla::jni::GlobalRef<ViewTransform> GlobalRef;
-    typedef const mozilla::jni::Param<ViewTransform>& Param;
+    explicit ViewTransform(const Context& ctx) : ObjectBase<ViewTransform, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/gfx/ViewTransform";
-
-protected:
-    ViewTransform(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef ViewTransform Owner;
         typedef ViewTransform::LocalRef ReturnType;
@@ -4441,14 +3799,12 @@ public:
         static constexpr char signature[] =
                 "(FFF)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(float, float, float) -> ViewTransform::LocalRef;
 
-public:
     struct FixedLayerMarginBottom_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4458,7 +3814,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4467,7 +3822,6 @@ public:
 
     auto FixedLayerMarginBottom(float) const -> void;
 
-public:
     struct FixedLayerMarginLeft_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4477,7 +3831,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4486,7 +3839,6 @@ public:
 
     auto FixedLayerMarginLeft(float) const -> void;
 
-public:
     struct FixedLayerMarginRight_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4496,7 +3848,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4505,7 +3856,6 @@ public:
 
     auto FixedLayerMarginRight(float) const -> void;
 
-public:
     struct FixedLayerMarginTop_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4515,7 +3865,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4524,7 +3873,6 @@ public:
 
     auto FixedLayerMarginTop(float) const -> void;
 
-public:
     struct Height_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4534,7 +3882,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4543,7 +3890,6 @@ public:
 
     auto Height(float) const -> void;
 
-public:
     struct Scale_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4553,7 +3899,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4562,7 +3907,6 @@ public:
 
     auto Scale(float) const -> void;
 
-public:
     struct Width_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4572,7 +3916,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4581,7 +3924,6 @@ public:
 
     auto Width(float) const -> void;
 
-public:
     struct X_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4591,7 +3933,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4600,7 +3941,6 @@ public:
 
     auto X(float) const -> void;
 
-public:
     struct Y_t {
         typedef ViewTransform Owner;
         typedef float ReturnType;
@@ -4610,7 +3950,6 @@ public:
         static constexpr char signature[] =
                 "F";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
@@ -4619,23 +3958,15 @@ public:
 
     auto Y(float) const -> void;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class MatrixBlobCursor : public mozilla::jni::Class<MatrixBlobCursor>
+class MatrixBlobCursor : public mozilla::jni::ObjectBase<MatrixBlobCursor, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<MatrixBlobCursor> Ref;
-    typedef mozilla::jni::LocalRef<MatrixBlobCursor> LocalRef;
-    typedef mozilla::jni::GlobalRef<MatrixBlobCursor> GlobalRef;
-    typedef const mozilla::jni::Param<MatrixBlobCursor>& Param;
+    explicit MatrixBlobCursor(const Context& ctx) : ObjectBase<MatrixBlobCursor, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/sqlite/MatrixBlobCursor";
-
-protected:
-    MatrixBlobCursor(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef MatrixBlobCursor Owner;
         typedef MatrixBlobCursor::LocalRef ReturnType;
@@ -4646,14 +3977,12 @@ public:
         static constexpr char signature[] =
                 "([Ljava/lang/String;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(mozilla::jni::ObjectArray::Param) -> MatrixBlobCursor::LocalRef;
 
-public:
     struct New2_t {
         typedef MatrixBlobCursor Owner;
         typedef MatrixBlobCursor::LocalRef ReturnType;
@@ -4665,14 +3994,12 @@ public:
         static constexpr char signature[] =
                 "([Ljava/lang/String;I)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(mozilla::jni::ObjectArray::Param, int32_t) -> MatrixBlobCursor::LocalRef;
 
-public:
     struct AddRow_t {
         typedef MatrixBlobCursor Owner;
         typedef void ReturnType;
@@ -4683,14 +4010,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/Iterable;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto AddRow(mozilla::jni::Object::Param) const -> void;
 
-public:
     struct AddRow2_t {
         typedef MatrixBlobCursor Owner;
         typedef void ReturnType;
@@ -4702,14 +4027,12 @@ public:
         static constexpr char signature[] =
                 "(Ljava/util/ArrayList;I)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto AddRow(mozilla::jni::Object::Param, int32_t) const -> void;
 
-public:
     struct AddRow3_t {
         typedef MatrixBlobCursor Owner;
         typedef void ReturnType;
@@ -4720,30 +4043,21 @@ public:
         static constexpr char signature[] =
                 "([Ljava/lang/Object;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto AddRow(mozilla::jni::ObjectArray::Param) const -> void;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class SQLiteBridgeException : public mozilla::jni::Class<SQLiteBridgeException>
+class SQLiteBridgeException : public mozilla::jni::ObjectBase<SQLiteBridgeException, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<SQLiteBridgeException> Ref;
-    typedef mozilla::jni::LocalRef<SQLiteBridgeException> LocalRef;
-    typedef mozilla::jni::GlobalRef<SQLiteBridgeException> GlobalRef;
-    typedef const mozilla::jni::Param<SQLiteBridgeException>& Param;
+    explicit SQLiteBridgeException(const Context& ctx) : ObjectBase<SQLiteBridgeException, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/sqlite/SQLiteBridgeException";
-
-protected:
-    SQLiteBridgeException(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef SQLiteBridgeException Owner;
         typedef SQLiteBridgeException::LocalRef ReturnType;
@@ -4753,14 +4067,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New() -> SQLiteBridgeException::LocalRef;
 
-public:
     struct New2_t {
         typedef SQLiteBridgeException Owner;
         typedef SQLiteBridgeException::LocalRef ReturnType;
@@ -4771,33 +4083,23 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New(mozilla::jni::String::Param) -> SQLiteBridgeException::LocalRef;
 
-public:
     static const int64_t SerialVersionUID = 1;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class Clipboard : public mozilla::jni::Class<Clipboard>
+class Clipboard : public mozilla::jni::ObjectBase<Clipboard, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<Clipboard> Ref;
-    typedef mozilla::jni::LocalRef<Clipboard> LocalRef;
-    typedef mozilla::jni::GlobalRef<Clipboard> GlobalRef;
-    typedef const mozilla::jni::Param<Clipboard>& Param;
+    explicit Clipboard(const Context& ctx) : ObjectBase<Clipboard, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/util/Clipboard";
-
-protected:
-    Clipboard(jobject instance) : Class(instance) {}
-
-public:
     struct ClearText_t {
         typedef Clipboard Owner;
         typedef void ReturnType;
@@ -4807,14 +4109,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto ClearText() -> void;
 
-public:
     struct GetClipboardTextWrapper_t {
         typedef Clipboard Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -4824,14 +4124,12 @@ public:
         static constexpr char signature[] =
                 "()Ljava/lang/String;";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto GetClipboardTextWrapper() -> mozilla::jni::String::LocalRef;
 
-public:
     struct HasText_t {
         typedef Clipboard Owner;
         typedef bool ReturnType;
@@ -4841,14 +4139,12 @@ public:
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto HasText() -> bool;
 
-public:
     struct SetClipboardText_t {
         typedef Clipboard Owner;
         typedef void ReturnType;
@@ -4859,30 +4155,21 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/CharSequence;)V";
         static const bool isStatic = true;
-        static const bool isMultithreaded = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto SetClipboardText(mozilla::jni::String::Param) -> void;
 
+    static const bool isMultithreaded = false;
+
 };
 
-class HardwareCodecCapabilityUtils : public mozilla::jni::Class<HardwareCodecCapabilityUtils>
+class HardwareCodecCapabilityUtils : public mozilla::jni::ObjectBase<HardwareCodecCapabilityUtils, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<HardwareCodecCapabilityUtils> Ref;
-    typedef mozilla::jni::LocalRef<HardwareCodecCapabilityUtils> LocalRef;
-    typedef mozilla::jni::GlobalRef<HardwareCodecCapabilityUtils> GlobalRef;
-    typedef const mozilla::jni::Param<HardwareCodecCapabilityUtils>& Param;
+    explicit HardwareCodecCapabilityUtils(const Context& ctx) : ObjectBase<HardwareCodecCapabilityUtils, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/util/HardwareCodecCapabilityUtils";
-
-protected:
-    HardwareCodecCapabilityUtils(jobject instance) : Class(instance) {}
-
-public:
     struct FindDecoderCodecInfoForMimeType_t {
         typedef HardwareCodecCapabilityUtils Owner;
         typedef bool ReturnType;
@@ -4893,30 +4180,21 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Z";
         static const bool isStatic = true;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto FindDecoderCodecInfoForMimeType(mozilla::jni::String::Param) -> bool;
 
+    static const bool isMultithreaded = true;
+
 };
 
-class NativeJSContainer : public mozilla::jni::Class<NativeJSContainer>
+class NativeJSContainer : public mozilla::jni::ObjectBase<NativeJSContainer, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<NativeJSContainer> Ref;
-    typedef mozilla::jni::LocalRef<NativeJSContainer> LocalRef;
-    typedef mozilla::jni::GlobalRef<NativeJSContainer> GlobalRef;
-    typedef const mozilla::jni::Param<NativeJSContainer>& Param;
+    explicit NativeJSContainer(const Context& ctx) : ObjectBase<NativeJSContainer, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/util/NativeJSContainer";
-
-protected:
-    NativeJSContainer(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef NativeJSContainer Owner;
         typedef NativeJSContainer::LocalRef ReturnType;
@@ -4926,14 +4204,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New() -> NativeJSContainer::LocalRef;
 
-public:
     struct Clone2_t {
         typedef NativeJSContainer Owner;
         typedef NativeJSContainer::LocalRef ReturnType;
@@ -4943,12 +4219,10 @@ public:
         static constexpr char signature[] =
                 "()Lorg/mozilla/gecko/util/NativeJSContainer;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct DisposeNative_t {
         typedef NativeJSContainer Owner;
         typedef void ReturnType;
@@ -4958,30 +4232,20 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
+    static const bool isMultithreaded = true;
+
     template<class Impl> class Natives;
 };
 
-class NativeJSObject : public mozilla::jni::Class<NativeJSObject>
+class NativeJSObject : public mozilla::jni::ObjectBase<NativeJSObject, jobject>
 {
 public:
-    typedef mozilla::jni::Ref<NativeJSObject> Ref;
-    typedef mozilla::jni::LocalRef<NativeJSObject> LocalRef;
-    typedef mozilla::jni::GlobalRef<NativeJSObject> GlobalRef;
-    typedef const mozilla::jni::Param<NativeJSObject>& Param;
+    explicit NativeJSObject(const Context& ctx) : ObjectBase<NativeJSObject, jobject>(ctx) {}
 
-    static constexpr char name[] =
-            "org/mozilla/gecko/util/NativeJSObject";
-
-protected:
-    NativeJSObject(jobject instance) : Class(instance) {}
-
-public:
     struct New_t {
         typedef NativeJSObject Owner;
         typedef NativeJSObject::LocalRef ReturnType;
@@ -4991,14 +4255,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto New() -> NativeJSObject::LocalRef;
 
-public:
     struct DisposeNative_t {
         typedef NativeJSObject Owner;
         typedef void ReturnType;
@@ -5008,14 +4270,12 @@ public:
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     auto DisposeNative() const -> void;
 
-public:
     struct GetBoolean_t {
         typedef NativeJSObject Owner;
         typedef bool ReturnType;
@@ -5026,12 +4286,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetBooleanArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::BooleanArray::LocalRef ReturnType;
@@ -5042,12 +4300,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)[Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetBundle_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -5058,12 +4314,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Landroid/os/Bundle;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetBundleArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -5074,12 +4328,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)[Landroid/os/Bundle;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetDouble_t {
         typedef NativeJSObject Owner;
         typedef double ReturnType;
@@ -5090,12 +4342,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)D";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetDoubleArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::DoubleArray::LocalRef ReturnType;
@@ -5106,12 +4356,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)[D";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetInt_t {
         typedef NativeJSObject Owner;
         typedef int32_t ReturnType;
@@ -5122,12 +4370,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetIntArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::IntArray::LocalRef ReturnType;
@@ -5138,12 +4384,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)[I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetObject_t {
         typedef NativeJSObject Owner;
         typedef NativeJSObject::LocalRef ReturnType;
@@ -5154,12 +4398,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Lorg/mozilla/gecko/util/NativeJSObject;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetObjectArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -5170,12 +4412,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)[Lorg/mozilla/gecko/util/NativeJSObject;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetString_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -5186,12 +4426,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Ljava/lang/String;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct GetStringArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -5202,12 +4440,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)[Ljava/lang/String;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct Has_t {
         typedef NativeJSObject Owner;
         typedef bool ReturnType;
@@ -5218,12 +4454,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptBoolean_t {
         typedef NativeJSObject Owner;
         typedef bool ReturnType;
@@ -5235,12 +4469,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Z)Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptBooleanArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::BooleanArray::LocalRef ReturnType;
@@ -5252,12 +4484,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;[Z)[Z";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptBundle_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -5269,12 +4499,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptBundleArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -5286,12 +4514,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;[Landroid/os/Bundle;)[Landroid/os/Bundle;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptDouble_t {
         typedef NativeJSObject Owner;
         typedef double ReturnType;
@@ -5303,12 +4529,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;D)D";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptDoubleArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::DoubleArray::LocalRef ReturnType;
@@ -5320,12 +4544,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;[D)[D";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptInt_t {
         typedef NativeJSObject Owner;
         typedef int32_t ReturnType;
@@ -5337,12 +4559,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;I)I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptIntArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::IntArray::LocalRef ReturnType;
@@ -5354,12 +4574,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;[I)[I";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptObject_t {
         typedef NativeJSObject Owner;
         typedef NativeJSObject::LocalRef ReturnType;
@@ -5371,12 +4589,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Lorg/mozilla/gecko/util/NativeJSObject;)Lorg/mozilla/gecko/util/NativeJSObject;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptObjectArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -5388,12 +4604,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;[Lorg/mozilla/gecko/util/NativeJSObject;)[Lorg/mozilla/gecko/util/NativeJSObject;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptString_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -5405,12 +4619,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct OptStringArray_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
@@ -5422,12 +4634,10 @@ public:
         static constexpr char signature[] =
                 "(Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct ToBundle_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
@@ -5437,12 +4647,10 @@ public:
         static constexpr char signature[] =
                 "()Landroid/os/Bundle;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
     struct ToString_t {
         typedef NativeJSObject Owner;
         typedef mozilla::jni::String::LocalRef ReturnType;
@@ -5452,12 +4660,12 @@ public:
         static constexpr char signature[] =
                 "()Ljava/lang/String;";
         static const bool isStatic = false;
-        static const bool isMultithreaded = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
-public:
+    static const bool isMultithreaded = true;
+
     template<class Impl> class Natives;
 };