diff --git a/plugins/include/handles.inc b/plugins/include/handles.inc
index 24e46130..ece25b5d 100644
--- a/plugins/include/handles.inc
+++ b/plugins/include/handles.inc
@@ -75,14 +75,7 @@ native CloseHandle(Handle:hndl);
  */
 native Handle:CloneHandle(Handle:hndl, Handle:plugin=INVALID_HANDLE);
 
-/**
- * Helper for object-oriented syntax.
- */
-methodmap Handle __nullable__
-{
-	public Close() = CloseHandle;
-	public ~Handle() = CloseHandle;
-}
+using __intrinsics__.Handle;
 
 /**
  * Do not use this function.  Returns if a Handle and its contents 
diff --git a/public/amtl b/public/amtl
index 870938d3..1a66ad10 160000
--- a/public/amtl
+++ b/public/amtl
@@ -1 +1 @@
-Subproject commit 870938d377acb70f814fb32ebceded48ac9e9dad
+Subproject commit 1a66ad1033ce337dce26d121468404f459a521ca
diff --git a/sourcepawn b/sourcepawn
index 871fb870..734f8e0b 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 871fb87023e9e79ff63c293c98be443c28610936
+Subproject commit 734f8e0bc5d272d44cefc788f193f5431fbb4338