diff --git a/pkgs/ffigen/lib/src/code_generator/objc_block.dart b/pkgs/ffigen/lib/src/code_generator/objc_block.dart
index d46c3d913..9123860cb 100644
--- a/pkgs/ffigen/lib/src/code_generator/objc_block.dart
+++ b/pkgs/ffigen/lib/src/code_generator/objc_block.dart
@@ -14,7 +14,9 @@ class ObjCBlock extends BindingType {
   final Type returnType;
   final List<Parameter> params;
   final bool returnsRetained;
-  ObjCBlockWrapperFuncs? _blockWrappers;
+  late final ObjCBlockWrapperFuncs _blockWrappers;
+  late final _FnTypeHelper _typeHelper;
+  late final _FnTypeHelper _blockingTypeHelper;
 
   factory ObjCBlock({
     required Type returnType,
@@ -59,9 +61,7 @@ class ObjCBlock extends BindingType {
     required this.returnsRetained,
     required this.builtInFunctions,
   }) : super(originalName: name) {
-    if (hasListener) {
-      _blockWrappers = builtInFunctions.getBlockTrampolines(this);
-    }
+    _blockWrappers = builtInFunctions.getBlockTrampolines(this);
   }
 
   // Generates a human readable name for the block based on the args and return
@@ -110,9 +110,10 @@ class ObjCBlock extends BindingType {
 
     final voidPtr = PointerType(voidType);
     final blockPtr = PointerType(objCBlockType);
-    final func = _FnHelper(w, returnType, params);
 
-    final blockingFunc = _FnHelper(w, returnType, [
+    _typeHelper = _FnTypeHelper(w, returnType, params);
+
+    _blockingTypeHelper = _FnTypeHelper(w, returnType, [
       Parameter(type: voidPtr, name: 'waiter', objCConsumed: false),
       ...params,
     ]);
@@ -138,14 +139,15 @@ class ObjCBlock extends BindingType {
     final callExtension =
         w.topLevelUniqueNamer.makeUnique('${name}_CallExtension');
 
-    final newPointerBlock = ObjCBuiltInFunctions.newPointerBlock.gen(w);
-    final newClosureBlock = ObjCBuiltInFunctions.newClosureBlock.gen(w);
+    final newPointerBlock = _blockWrappers.newPointerBlock.name;
+    final newClosureBlock = _blockWrappers.newClosureBlock.name;
+    final invokeBlock = _blockWrappers.invokeBlock.name;
     final getBlockClosure = ObjCBuiltInFunctions.getBlockClosure.gen(w);
     final releaseFn = ObjCBuiltInFunctions.objectRelease.gen(w);
-    final wrapBlockingBlockFn = ObjCBuiltInFunctions.wrapBlockingBlock.gen(w);
+    final pkgNewClosureBlock = ObjCBuiltInFunctions.newClosureBlock.gen(w);
+    final pkgNewBlockingBlock = ObjCBuiltInFunctions.newBlockingBlock.gen(w);
     final signalWaiterFn = ObjCBuiltInFunctions.signalWaiter.gen(w);
     final returnFfiDartType = returnType.getFfiDartType(w);
-    final voidPtrCType = voidPtr.getCType(w);
     final blockCType = blockPtr.getCType(w);
     final blockType = _blockType(w);
     final defaultValue = returnType.getDefaultValue(w);
@@ -153,48 +155,48 @@ class ObjCBlock extends BindingType {
 
     // Write the function pointer based trampoline function.
     s.write('''
-$returnFfiDartType $funcPtrTrampoline(
-    $blockCType block, ${func.paramsFfiDartType}) =>
-        block.ref.target.cast<${func.natFnFfiDartType}>()
-            .asFunction<${func.ffiDartType}>()(${func.paramsNameOnly});
-$voidPtrCType $funcPtrCallable = ${w.ffiLibraryPrefix}.Pointer.fromFunction<
-    ${func.trampCType}>($funcPtrTrampoline $exceptionalReturn).cast();
+$returnFfiDartType $funcPtrTrampoline(${_typeHelper.natFnPtrFfiDartType} func,
+    ${_typeHelper.paramsFfiDartType}) =>
+        func.asFunction<${_typeHelper.ffiDartType}>()(
+            ${_typeHelper.paramsNameOnly});
+final $funcPtrCallable = ${w.ffiLibraryPrefix}.Pointer.fromFunction<
+    ${_typeHelper.fnPtrTrampCType}>($funcPtrTrampoline $exceptionalReturn);
 ''');
 
     // Write the closure based trampoline function.
     s.write('''
 $returnFfiDartType $closureTrampoline(
-    $blockCType block, ${func.paramsFfiDartType}) =>
-    ($getBlockClosure(block) as ${func.ffiDartType})(${func.paramsNameOnly});
-$voidPtrCType $closureCallable = ${w.ffiLibraryPrefix}.Pointer.fromFunction<
-    ${func.trampCType}>($closureTrampoline $exceptionalReturn).cast();
+    $blockCType block, int closureId, ${_typeHelper.paramsFfiDartType}) =>
+    ($getBlockClosure(closureId) as ${_typeHelper.ffiDartType})(${_typeHelper.paramsNameOnly});
+final $closureCallable = ${w.ffiLibraryPrefix}.Pointer.fromFunction<
+    ${_typeHelper.trampCType}>($closureTrampoline $exceptionalReturn);
 ''');
 
     if (hasListener) {
       // Write the listener trampoline function.
       s.write('''
 $returnFfiDartType $listenerTrampoline(
-    $blockCType block, ${func.paramsFfiDartType}) {
-  ($getBlockClosure(block) as ${func.ffiDartType})(${func.paramsNameOnly});
+    $blockCType block, int closureId, ${_typeHelper.paramsFfiDartType}) {
+  ($getBlockClosure(closureId) as ${_typeHelper.ffiDartType})(${_typeHelper.paramsNameOnly});
   $releaseFn(block.cast());
 }
-${func.trampNatCallType} $listenerCallable = ${func.trampNatCallType}.listener(
-    $listenerTrampoline $exceptionalReturn)..keepIsolateAlive = false;
-$returnFfiDartType $blockingTrampoline(
-    $blockCType block, ${blockingFunc.paramsFfiDartType}) {
+${_typeHelper.trampNatCallType} $listenerCallable = ${_typeHelper.trampNatCallType}.listener(
+        $listenerTrampoline $exceptionalReturn)..keepIsolateAlive = false;
+$returnFfiDartType $blockingTrampoline($blockCType block, int closureId,
+    ${_blockingTypeHelper.paramsFfiDartType}) {
   try {
-    ($getBlockClosure(block) as ${func.ffiDartType})(${func.paramsNameOnly});
+    ($getBlockClosure(closureId) as ${_typeHelper.ffiDartType})(${_typeHelper.paramsNameOnly});
   } catch (e) {
   } finally {
     $signalWaiterFn(waiter);
     $releaseFn(block.cast());
   }
 }
-${blockingFunc.trampNatCallType} $blockingCallable =
-    ${blockingFunc.trampNatCallType}.isolateLocal(
+${_blockingTypeHelper.trampNatCallType} $blockingCallable =
+    ${_blockingTypeHelper.trampNatCallType}.isolateLocal(
         $blockingTrampoline $exceptionalReturn)..keepIsolateAlive = false;
-${blockingFunc.trampNatCallType} $blockingListenerCallable =
-    ${blockingFunc.trampNatCallType}.listener(
+${_blockingTypeHelper.trampNatCallType} $blockingListenerCallable =
+    ${_blockingTypeHelper.trampNatCallType}.listener(
         $blockingTrampoline $exceptionalReturn)..keepIsolateAlive = false;
 ''');
     }
@@ -214,7 +216,7 @@ ${blockingFunc.trampNatCallType} $blockingListenerCallable =
       objCRetain: true,
       objCAutorelease: !returnsRetained,
     );
-    final convFn = '(${func.paramsFfiDartType}) => $convFnInvocation';
+    final convFn = '(${_typeHelper.paramsFfiDartType}) => $convFnInvocation';
 
     // Write the wrapper class.
     s.write('''
@@ -231,8 +233,8 @@ abstract final class $name {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static $blockType fromFunctionPointer(${func.natFnPtrCType} ptr) =>
-      $blockType($newPointerBlock($funcPtrCallable, ptr.cast()),
+  static $blockType fromFunctionPointer(${_typeHelper.natFnPtrCType} ptr) =>
+      $blockType($newPointerBlock($funcPtrCallable.cast(), ptr.cast()),
           retain: false, release: true);
 
   /// Creates a block from a Dart function.
@@ -240,16 +242,17 @@ abstract final class $name {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static $blockType fromFunction(${func.dartType} fn) =>
-      $blockType($newClosureBlock($closureCallable, $convFn),
-          retain: false, release: true);
+  static $blockType fromFunction(${_typeHelper.dartType} fn) =>
+      $blockType($pkgNewClosureBlock(
+          $convFn, $closureCallable.cast(),
+          $newClosureBlock), retain: false, release: true);
 ''');
 
     // Listener block constructor is only available for void blocks.
     if (hasListener) {
       // This snippet is the same as the convFn above, except that the params
       // don't need to be retained because they've already been retained by
-      // _blockWrappers.listenerWrapper.
+      // _blockWrappers.newListenerBlock.
       final listenerConvertedFnArgs = params
           .map((p) =>
               p.type.convertFfiDartTypeToDartType(w, p.name, objCRetain: false))
@@ -261,9 +264,9 @@ abstract final class $name {
         objCAutorelease: !returnsRetained,
       );
       final listenerConvFn =
-          '(${func.paramsFfiDartType}) => $listenerConvFnInvocation';
-      final wrapListenerFn = _blockWrappers!.listenerWrapper.name;
-      final wrapBlockingFn = _blockWrappers!.blockingWrapper.name;
+          '(${_typeHelper.paramsFfiDartType}) => $listenerConvFnInvocation';
+      final newListenerBlock = _blockWrappers.newListenerBlock!.name;
+      final newBlockingBlock = _blockWrappers.newBlockingBlock!.name;
 
       s.write('''
 
@@ -276,13 +279,10 @@ abstract final class $name {
   ///
   /// Note that unlike the default behavior of NativeCallable.listener, listener
   /// blocks do not keep the isolate alive.
-  static $blockType listener(${func.dartType} fn) {
-    final raw = $newClosureBlock(
-        $listenerCallable.nativeFunction.cast(), $listenerConvFn);
-    final wrapper = $wrapListenerFn(raw);
-    $releaseFn(raw.cast());
-    return $blockType(wrapper, retain: false, release: true);
-  }
+  static $blockType listener(${_typeHelper.dartType} fn) =>
+      $blockType($pkgNewClosureBlock(
+          $listenerConvFn, $listenerCallable.nativeFunction.cast(),
+          $newListenerBlock), retain: false, release: true);
 
   /// Creates a blocking block from a Dart function.
   ///
@@ -293,25 +293,16 @@ abstract final class $name {
   /// This block does not keep the owner isolate alive. If the owner isolate has
   /// shut down, and the block is invoked by native code, it may block
   /// indefinitely, or have other undefined behavior.
-  static $blockType blocking(${func.dartType} fn) {
-    final raw = $newClosureBlock(
-        $blockingCallable.nativeFunction.cast(), $listenerConvFn);
-    final rawListener = $newClosureBlock(
-        $blockingListenerCallable.nativeFunction.cast(), $listenerConvFn);
-    final wrapper = $wrapBlockingBlockFn($wrapBlockingFn, raw, rawListener);
-    $releaseFn(raw.cast());
-    $releaseFn(rawListener.cast());
-    return $blockType(wrapper, retain: false, release: true);
-  }
+  static $blockType blocking(${_typeHelper.dartType} fn) =>
+      $blockType($pkgNewBlockingBlock(
+          $listenerConvFn, $blockingCallable.nativeFunction.cast(),
+          $blockingListenerCallable.nativeFunction.cast(),
+          $newBlockingBlock), retain: false, release: true);
 ''');
     }
     s.write('}\n\n');
 
     // Call operator extension method.
-    s.write('''
-/// Call operator for `$blockType`.
-extension $callExtension on $blockType {
-  ${returnType.getDartType(w)} call(${func.paramsDartType}) =>''');
     final callMethodArgs = params
         .map((p) => p.type.convertDartTypeToFfiDartType(
               w,
@@ -320,32 +311,36 @@ extension $callExtension on $blockType {
               objCAutorelease: false,
             ))
         .join(', ');
-    final callMethodInvocation = '''
-ref.pointer.ref.invoke.cast<${func.trampNatFnCType}>()
-  .asFunction<${func.trampFfiDartType}>()(
-    ref.pointer, $callMethodArgs)''';
-    s.write(returnType.convertFfiDartTypeToDartType(
+    final callMethod = returnType.convertFfiDartTypeToDartType(
       w,
-      callMethodInvocation,
+      '$invokeBlock(ref.pointer, $callMethodArgs)',
       objCRetain: !returnsRetained,
-    ));
-    s.write(';\n');
+    );
+    s.write('''
+/// Call operator for `$blockType`.
+extension $callExtension on $blockType {
+  ${returnType.getDartType(w)} call(${_typeHelper.paramsDartType}) =>
+      $callMethod;
+}
+
+''');
 
-    s.write('}\n\n');
     return BindingString(
         type: BindingStringType.objcBlock, string: s.toString());
   }
 
   @override
   BindingString? toObjCBindingString(Writer w) {
-    if (_blockWrappers?.objCBindingsGenerated ?? true) return null;
-    _blockWrappers!.objCBindingsGenerated = true;
+    if (_blockWrappers.objCBindingsGenerated) return null;
+    _blockWrappers.objCBindingsGenerated = true;
 
     final argsReceived = <String>[];
     final retains = <String>[];
+    final noRetains = <String>[];
     for (var i = 0; i < params.length; ++i) {
       final param = params[i];
       final argName = 'arg$i';
+      noRetains.add(argName);
       argsReceived.add(param.getNativeType(varName: argName));
       retains.add(param.type.generateRetain(argName) ?? argName);
     }
@@ -360,44 +355,113 @@ ref.pointer.ref.invoke.cast<${func.trampNatFnCType}>()
       ...argsReceived,
     ].join(', ');
 
-    final listenerWrapper = _blockWrappers!.listenerWrapper.name;
-    final blockingWrapper = _blockWrappers!.blockingWrapper.name;
-    final listenerName =
-        w.objCLevelUniqueNamer.makeUnique('_ListenerTrampoline');
+    final returnNativeType = returnType.getNativeType();
+
+    final newPointerBlock = _blockWrappers.newPointerBlock.name;
+    final newClosureBlock = _blockWrappers.newClosureBlock.name;
+    final invokeBlock = _blockWrappers.invokeBlock.name;
+    final blockTypeName = w.objCLevelUniqueNamer.makeUnique('_BlockType');
     final blockingName =
         w.objCLevelUniqueNamer.makeUnique('_BlockingTrampoline');
+    final trampolineArg =
+        _typeHelper.trampFnType.getNativeType(varName: 'trampoline');
+    final blockingTrampolineArg =
+        _blockingTypeHelper.trampFnType.getNativeType(varName: 'tramp');
+    final blockingListenerTrampolineArg = _blockingTypeHelper.trampFnType
+        .getNativeType(varName: 'listener_tramp');
+    final retainStr = returnsRetained ? 'NS_RETURNS_RETAINED' : '';
+    final dtorClass = '_${w.className}_BlockDestroyer';
+
+    final fnPtrArg = _typeHelper.fnType.getNativeType(varName: 'func');
+    final fnPtrTrampArg = FunctionType(
+      returnType: returnType,
+      parameters: [
+        Parameter(type: _typeHelper.fnType, name: 'func', objCConsumed: false),
+        ...params,
+      ],
+    ).getNativeType(varName: 'trampoline');
 
     final s = StringBuffer();
     s.write('''
 
-typedef ${returnType.getNativeType()} (^$listenerName)($argStr);
+typedef $returnNativeType (^$blockTypeName)($argStr);
 __attribute__((visibility("default"))) __attribute__((used))
-$listenerName $listenerWrapper($listenerName block) NS_RETURNS_RETAINED {
-  return ^void($argStr) {
-    ${generateRetain('block')};
-    block(${retains.join(', ')});
+$returnNativeType $invokeBlock(
+    ${['$blockTypeName block', ...argsReceived].join(', ')}) $retainStr {
+  return block(${noRetains.join(', ')});
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+$blockTypeName $newPointerBlock($fnPtrTrampArg, $fnPtrArg) NS_RETURNS_RETAINED {
+  return ^$returnNativeType($argStr) {
+    return trampoline(${['func', ...noRetains].join(', ')});
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+$blockTypeName $newClosureBlock(
+    $trampolineArg, int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  $dtorClass* obj = [$dtorClass
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block $blockTypeName weakBlk;
+  $blockTypeName blk = ^$returnNativeType($argStr) {
+    return trampoline(weakBlk, ${['obj.closure_id', ...noRetains].join(', ')});
   };
+  weakBlk = blk;
+  return blk;
 }
+''');
+
+    if (hasListener) {
+      final newListenerBlock = _blockWrappers.newListenerBlock!.name;
+      final newBlockingBlock = _blockWrappers.newBlockingBlock!.name;
+
+      s.write('''
 
-typedef ${returnType.getNativeType()} (^$blockingName)($blockingArgStr);
 __attribute__((visibility("default"))) __attribute__((used))
-$listenerName $blockingWrapper(
-    $blockingName block, $blockingName listenerBlock,
+$blockTypeName $newListenerBlock(
+    $trampolineArg, int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  $dtorClass* obj = [$dtorClass
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block $blockTypeName weakBlk;
+  $blockTypeName blk = ^$returnNativeType($argStr) {
+    ${generateRetain('weakBlk')};
+    return trampoline(weakBlk, ${['obj.closure_id', ...retains].join(', ')});
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef $returnNativeType (^$blockingName)($blockingArgStr);
+__attribute__((visibility("default"))) __attribute__((used))
+$blockTypeName $newBlockingBlock(
+    $blockingTrampolineArg, $blockingListenerTrampolineArg,
+    int64_t closure_id, int64_t dispose_port, void (*dtor)(int64_t, int64_t),
     void* (*newWaiter)(), void (*awaitWaiter)(void*)) NS_RETURNS_RETAINED {
   NSThread *targetThread = [NSThread currentThread];
-  return ^void($argStr) {
+  $dtorClass* obj = [$dtorClass
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block $blockTypeName weakBlk;
+  $blockTypeName blk = ^$returnNativeType($argStr) {
+    ${generateRetain('weakBlk')};
     if ([NSThread currentThread] == targetThread) {
-      ${generateRetain('block')};
-      block(${blockingRetains.join(', ')});
+      tramp(weakBlk, ${['obj.closure_id', ...blockingRetains].join(', ')});
     } else {
       void* waiter = newWaiter();
-      ${generateRetain('listenerBlock')};
-      listenerBlock(${blockingListenerRetains.join(', ')});
+      listener_tramp(weakBlk, ${[
+        'obj.closure_id',
+        ...blockingListenerRetains
+      ].join(', ')});
       awaitWaiter(waiter);
     }
   };
+  weakBlk = blk;
+  return blk;
 }
 ''');
+    }
     return BindingString(
         type: BindingStringType.objcBlock, string: s.toString());
   }
@@ -474,12 +538,14 @@ $listenerName $blockingWrapper(
   }
 }
 
-class _FnHelper {
-  late final NativeFunc natFnType;
-  late final String natFnFfiDartType;
+class _FnTypeHelper {
+  late final FunctionType fnType;
+  late final FunctionType trampFnType;
+  late final String natFnPtrFfiDartType;
   late final String natFnPtrCType;
   late final String dartType;
   late final String ffiDartType;
+  late final String fnPtrTrampCType;
   late final String trampCType;
   late final String trampFfiDartType;
   late final String trampNatCallType;
@@ -488,21 +554,34 @@ class _FnHelper {
   late final String paramsFfiDartType;
   late final String paramsDartType;
 
-  _FnHelper(Writer w, Type returnType, List<Parameter> params) {
-    final fnType = FunctionType(returnType: returnType, parameters: params);
-    natFnType = NativeFunc(fnType);
-    natFnFfiDartType = natFnType.getFfiDartType(w);
-    natFnPtrCType = PointerType(natFnType).getCType(w);
+  _FnTypeHelper(Writer w, Type returnType, List<Parameter> params) {
+    fnType = FunctionType(returnType: returnType, parameters: params);
+    final natFnPtrType = PointerType(NativeFunc(fnType));
+    natFnPtrFfiDartType = natFnPtrType.getFfiDartType(w);
+    natFnPtrCType = natFnPtrType.getCType(w);
     dartType = fnType.getDartType(w, writeArgumentNames: false);
     ffiDartType = fnType.getFfiDartType(w, writeArgumentNames: false);
 
-    final trampFnType = FunctionType(
+    final fnPtrTrampFnType = FunctionType(
+      returnType: returnType,
+      parameters: [
+        Parameter(type: natFnPtrType, name: 'func', objCConsumed: false),
+        ...params,
+      ],
+    );
+    fnPtrTrampCType = fnPtrTrampFnType.getCType(w, writeArgumentNames: false);
+
+    trampFnType = FunctionType(
       returnType: returnType,
       parameters: [
         Parameter(
             type: PointerType(objCBlockType),
             name: 'block',
             objCConsumed: false),
+        Parameter(
+            type: NativeType(SupportedNativeType.int64),
+            name: 'closure_id',
+            objCConsumed: false),
         ...params,
       ],
     );
diff --git a/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart b/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart
index 8306d1d7c..06f207367 100644
--- a/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart
+++ b/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart
@@ -26,15 +26,18 @@ class ObjCBuiltInFunctions {
   static const msgSendStretPointer = ObjCImport('msgSendStretPointer');
   static const useMsgSendVariants = ObjCImport('useMsgSendVariants');
   static const respondsToSelector = ObjCImport('respondsToSelector');
-  static const newPointerBlock = ObjCImport('newPointerBlock');
-  static const newClosureBlock = ObjCImport('newClosureBlock');
+  static const registerBlockClosure = ObjCImport('registerBlockClosure');
   static const getBlockClosure = ObjCImport('getBlockClosure');
   static const getProtocolMethodSignature =
       ObjCImport('getProtocolMethodSignature');
   static const getProtocol = ObjCImport('getProtocol');
   static const objectRelease = ObjCImport('objectRelease');
   static const signalWaiter = ObjCImport('signalWaiter');
-  static const wrapBlockingBlock = ObjCImport('wrapBlockingBlock');
+  static const newBlockingBlock = ObjCImport('newBlockingBlock');
+  static const newClosureBlock = ObjCImport('newClosureBlock');
+  static const blockClosureDisposePort = ObjCImport('blockClosureDisposePort');
+  static const disposeObjCBlockWithClosure =
+      ObjCImport('disposeObjCBlockWithClosure');
   static const objectBase = ObjCImport('ObjCObjectBase');
   static const blockType = ObjCImport('ObjCBlock');
   static const consumedType = ObjCImport('Consumed');
@@ -210,36 +213,130 @@ class ObjCBuiltInFunctions {
       .toList();
 
   final _blockTrampolines = <String, ObjCBlockWrapperFuncs>{};
-  ObjCBlockWrapperFuncs? getBlockTrampolines(ObjCBlock block) {
+  ObjCBlockWrapperFuncs getBlockTrampolines(ObjCBlock block) {
     final id = _methodSigId(block.returnType, block.params);
     final idHash = fnvHash32(id).toRadixString(36);
+    final dtorType = FunctionType(
+      returnType: voidType,
+      parameters: [
+        Parameter(
+            type: NativeType(SupportedNativeType.int64),
+            name: 'dispose_port',
+            objCConsumed: false),
+        Parameter(
+            type: NativeType(SupportedNativeType.int64),
+            name: 'closure_id',
+            objCConsumed: false),
+      ],
+    );
     return _blockTrampolines[id] ??= ObjCBlockWrapperFuncs(
-      _blockTrampolineFunc('_${wrapperName}_wrapListenerBlock_$idHash'),
-      _blockTrampolineFunc('_${wrapperName}_wrapBlockingBlock_$idHash',
-          blocking: true),
+      Func(
+        name: '_${wrapperName}_invokeBlock_$idHash',
+        returnType: block.returnType,
+        parameters: [
+          Parameter(
+              name: 'block',
+              type: PointerType(objCBlockType),
+              objCConsumed: false),
+          ...block.params,
+        ],
+        objCReturnsRetained: block.returnsRetained,
+        isLeaf: false,
+        isInternal: true,
+        useNameForLookup: true,
+        ffiNativeConfig: const FfiNativeConfig(enabled: true),
+      ),
+      Func(
+        name: '_${wrapperName}_newPointerBlock_$idHash',
+        returnType: PointerType(objCBlockType),
+        parameters: [
+          Parameter(
+              name: 'trampoline',
+              type: PointerType(voidType),
+              objCConsumed: false),
+          Parameter(
+              name: 'func', type: PointerType(voidType), objCConsumed: false),
+        ],
+        objCReturnsRetained: true,
+        isLeaf: true,
+        isInternal: true,
+        useNameForLookup: true,
+        ffiNativeConfig: const FfiNativeConfig(enabled: true),
+      ),
+      Func(
+        name: '_${wrapperName}_newClosureBlock_$idHash',
+        returnType: PointerType(objCBlockType),
+        parameters: [
+          Parameter(
+              name: 'trampoline',
+              type: PointerType(voidType),
+              objCConsumed: false),
+          Parameter(
+              type: NativeType(SupportedNativeType.int64),
+              name: 'closure_id',
+              objCConsumed: false),
+          Parameter(
+              type: NativeType(SupportedNativeType.int64),
+              name: 'dispose_port',
+              objCConsumed: false),
+          Parameter(
+              name: 'dtor',
+              type: PointerType(NativeFunc(dtorType)),
+              objCConsumed: false),
+        ],
+        objCReturnsRetained: true,
+        isLeaf: true,
+        isInternal: true,
+        useNameForLookup: true,
+        ffiNativeConfig: const FfiNativeConfig(enabled: true),
+      ),
+      block.hasListener
+          ? _blockTrampolineFunc(
+              '_${wrapperName}_newListenerBlock_$idHash', dtorType)
+          : null,
+      block.hasListener
+          ? _blockTrampolineFunc(
+              '_${wrapperName}_newBlockingBlock_$idHash', dtorType,
+              blocking: true)
+          : null,
     );
   }
 
-  Func _blockTrampolineFunc(String name, {bool blocking = false}) => Func(
+  Func _blockTrampolineFunc(String name, Type dtorType,
+          {bool blocking = false}) =>
+      Func(
         name: name,
         returnType: PointerType(objCBlockType),
         parameters: [
           Parameter(
-              name: 'block',
-              type: PointerType(objCBlockType),
+              name: 'trampoline',
+              type: PointerType(voidType),
               objCConsumed: false),
-          if (blocking) ...[
+          if (blocking)
             Parameter(
-                name: 'listnerBlock',
-                type: PointerType(objCBlockType),
+                name: 'listener_trampoline',
+                type: PointerType(voidType),
                 objCConsumed: false),
+          Parameter(
+              type: NativeType(SupportedNativeType.int64),
+              name: 'closure_id',
+              objCConsumed: false),
+          Parameter(
+              type: NativeType(SupportedNativeType.int64),
+              name: 'dispose_port',
+              objCConsumed: false),
+          Parameter(
+              name: 'dtor',
+              type: PointerType(NativeFunc(dtorType)),
+              objCConsumed: false),
+          if (blocking) ...[
             Parameter(
-                name: 'newWaiter',
+                name: 'new_waiter',
                 type: PointerType(NativeFunc(FunctionType(
                     returnType: PointerType(voidType), parameters: []))),
                 objCConsumed: false),
             Parameter(
-                name: 'awaitWaiter',
+                name: 'await_waiter',
                 type: PointerType(
                     NativeFunc(FunctionType(returnType: voidType, parameters: [
                   Parameter(type: PointerType(voidType), objCConsumed: false),
@@ -263,17 +360,24 @@ class ObjCBuiltInFunctions {
 
 /// A native trampoline function for a listener block.
 class ObjCBlockWrapperFuncs extends AstNode {
-  final Func listenerWrapper;
-  final Func blockingWrapper;
+  final Func invokeBlock;
+  final Func newPointerBlock;
+  final Func newClosureBlock;
+  final Func? newListenerBlock;
+  final Func? newBlockingBlock;
   bool objCBindingsGenerated = false;
 
-  ObjCBlockWrapperFuncs(this.listenerWrapper, this.blockingWrapper);
+  ObjCBlockWrapperFuncs(this.invokeBlock, this.newPointerBlock,
+      this.newClosureBlock, this.newListenerBlock, this.newBlockingBlock);
 
   @override
   void visitChildren(Visitor visitor) {
     super.visitChildren(visitor);
-    visitor.visit(listenerWrapper);
-    visitor.visit(blockingWrapper);
+    visitor.visit(invokeBlock);
+    visitor.visit(newPointerBlock);
+    visitor.visit(newClosureBlock);
+    visitor.visit(newListenerBlock);
+    visitor.visit(newBlockingBlock);
   }
 }
 
diff --git a/pkgs/ffigen/lib/src/code_generator/objc_interface.dart b/pkgs/ffigen/lib/src/code_generator/objc_interface.dart
index 6d9e03ed2..de18c0ea3 100644
--- a/pkgs/ffigen/lib/src/code_generator/objc_interface.dart
+++ b/pkgs/ffigen/lib/src/code_generator/objc_interface.dart
@@ -180,7 +180,8 @@ ${generateAsStub ? '' : _generateMethods(w)}
   }
 
   @override
-  String? generateRetain(String value) => 'objc_retain($value)';
+  String? generateRetain(String value) =>
+      '(__bridge id)(__bridge_retained void*)($value)';
 
   @override
   void visit(Visitation visitation) => visitation.visitObjCInterface(this);
diff --git a/pkgs/ffigen/lib/src/code_generator/pointer.dart b/pkgs/ffigen/lib/src/code_generator/pointer.dart
index 4df2e867c..98abd88d6 100644
--- a/pkgs/ffigen/lib/src/code_generator/pointer.dart
+++ b/pkgs/ffigen/lib/src/code_generator/pointer.dart
@@ -105,7 +105,7 @@ class IncompleteArray extends PointerType {
 
   @override
   String getNativeType({String varName = ''}) =>
-      '${child.getNativeType()} $varName[]';
+      '${child.getNativeType()}* $varName';
 
   @override
   String toString() => '$child[]';
@@ -153,7 +153,8 @@ class ObjCObjectPointer extends PointerType {
       '${getDartType(w)}($value, retain: $objCRetain, release: true)';
 
   @override
-  String? generateRetain(String value) => 'objc_retain($value)';
+  String? generateRetain(String value) =>
+      '(__bridge id)(__bridge_retained void*)($value)';
 
   @override
   bool isSupertypeOf(Type other) {
diff --git a/pkgs/ffigen/lib/src/code_generator/writer.dart b/pkgs/ffigen/lib/src/code_generator/writer.dart
index 556126632..1254e0c27 100644
--- a/pkgs/ffigen/lib/src/code_generator/writer.dart
+++ b/pkgs/ffigen/lib/src/code_generator/writer.dart
@@ -438,14 +438,34 @@ class Writer {
     for (final entryPoint in nativeEntryPoints) {
       s.write(_objcImport(entryPoint, outDir));
     }
+    final dtorClass = '_${className}_BlockDestroyer';
     s.write('''
 
 #if !__has_feature(objc_arc)
 #error "This file must be compiled with ARC enabled"
 #endif
 
-id objc_retain(id);
 id objc_retainBlock(id);
+
+@interface $dtorClass : NSObject {}
+@property int64_t closure_id;
+@property int64_t dispose_port;
+@property void (*dtor)(int64_t, int64_t);
++ (instancetype)new:(int64_t) closure_id disposePort:(int64_t) dispose_port
+    destructor:(void (*)(int64_t, int64_t)) dtor;
+- (void)dealloc;
+@end
+@implementation $dtorClass
++ (instancetype)new:(int64_t) closure_id disposePort:(int64_t) dispose_port
+    destructor:(void (*)(int64_t, int64_t)) dtor {
+  $dtorClass* d = [[$dtorClass alloc] init];
+  d.closure_id = closure_id;
+  d.dispose_port = dispose_port;
+  d.dtor = dtor;
+  return d;
+}
+- (void)dealloc { self.dtor(self.dispose_port, self.closure_id); }
+@end
 ''');
 
     var empty = true;
diff --git a/pkgs/ffigen/test/native_objc_test/block_test.dart b/pkgs/ffigen/test/native_objc_test/block_test.dart
index 5da273c5d..46709f5d2 100644
--- a/pkgs/ffigen/test/native_objc_test/block_test.dart
+++ b/pkgs/ffigen/test/native_objc_test/block_test.dart
@@ -14,7 +14,7 @@ import 'dart:io';
 import 'package:ffi/ffi.dart';
 import 'package:objective_c/objective_c.dart';
 import 'package:objective_c/src/internal.dart' as internal_for_testing
-    show blockHasRegisteredClosure;
+    show isClosureOfBlock, lastClosureRegistryId;
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -407,8 +407,6 @@ void main() {
     Pointer<ObjCBlockImpl> funcPointerBlockRefCountTest() {
       final block =
           IntBlock.fromFunctionPointer(Pointer.fromFunction(_add100, 999));
-      expect(internal_for_testing.blockHasRegisteredClosure(block.ref.pointer),
-          false);
       expect(blockRetainCount(block.ref.pointer), 1);
       return block.ref.pointer;
     }
@@ -419,31 +417,30 @@ void main() {
       expect(blockRetainCount(rawBlock), 0);
     }, skip: !canDoGC);
 
-    Pointer<ObjCBlockImpl> funcBlockRefCountTest() {
+    (Pointer<ObjCBlockImpl>, int) funcBlockRefCountTest() {
       final block = IntBlock.fromFunction(makeAdder(4000));
-      expect(internal_for_testing.blockHasRegisteredClosure(block.ref.pointer),
-          true);
+      final closureId = internal_for_testing.lastClosureRegistryId;
+      expect(internal_for_testing.isClosureOfBlock(closureId), true);
       expect(blockRetainCount(block.ref.pointer), 1);
-      return block.ref.pointer;
+      return (block.ref.pointer, closureId);
     }
 
     test('Function block ref counting', () async {
-      final rawBlock = funcBlockRefCountTest();
+      final (rawBlock, closureId) = funcBlockRefCountTest();
       doGC();
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
       expect(blockRetainCount(rawBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(rawBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(closureId), false);
     }, skip: !canDoGC);
 
-    Pointer<ObjCBlockImpl> blockManualRetainRefCountTest() {
+    (Pointer<ObjCBlockImpl>, int) blockManualRetainRefCountTest() {
       final block = IntBlock.fromFunction(makeAdder(4000));
-      expect(internal_for_testing.blockHasRegisteredClosure(block.ref.pointer),
-          true);
+      final closureId = internal_for_testing.lastClosureRegistryId;
+      expect(internal_for_testing.isClosureOfBlock(closureId), true);
       expect(blockRetainCount(block.ref.pointer), 1);
       final rawBlock = block.ref.retainAndReturnPointer();
       expect(blockRetainCount(rawBlock), 2);
-      return rawBlock;
+      return (rawBlock, closureId);
     }
 
     int blockManualRetainRefCountTest2(Pointer<ObjCBlockImpl> rawBlock) {
@@ -453,30 +450,41 @@ void main() {
     }
 
     test('Block ref counting with manual retain and release', () async {
-      final rawBlock = blockManualRetainRefCountTest();
+      final (rawBlock, closureId) = blockManualRetainRefCountTest();
       doGC();
       expect(blockRetainCount(rawBlock), 1);
       expect(blockManualRetainRefCountTest2(rawBlock), 1);
       doGC();
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
       expect(blockRetainCount(rawBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(rawBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(closureId), false);
     }, skip: !canDoGC);
 
-    (Pointer<ObjCBlockImpl>, Pointer<ObjCBlockImpl>, Pointer<ObjCBlockImpl>)
-        blockBlockDartCallRefCountTest() {
+    (
+      Pointer<ObjCBlockImpl>,
+      Pointer<ObjCBlockImpl>,
+      Pointer<ObjCBlockImpl>,
+      int,
+      int,
+      int
+    ) blockBlockDartCallRefCountTest() {
       final pool = lib.objc_autoreleasePoolPush();
       final inputBlock = IntBlock.fromFunction((int x) {
         return 5 * x;
       });
+      final inputBlockId = internal_for_testing.lastClosureRegistryId;
       final blockBlock =
           BlockBlock.fromFunction((ObjCBlock<Int32 Function(Int32)> intBlock) {
         return IntBlock.fromFunction((int x) {
           return 3 * intBlock(x);
         });
       });
+      final blockBlockId = internal_for_testing.lastClosureRegistryId;
+      expect(blockBlockId, isNot(inputBlockId));
       final outputBlock = blockBlock(inputBlock);
+      final outputBlockId = internal_for_testing.lastClosureRegistryId;
+      expect(outputBlockId, isNot(inputBlockId));
+      expect(outputBlockId, isNot(blockBlockId));
       expect(outputBlock(1), 15);
       lib.objc_autoreleasePoolPop(pool);
       doGC();
@@ -484,49 +492,51 @@ void main() {
       // One reference held by inputBlock object, another bound to the
       // outputBlock lambda.
       expect(blockRetainCount(inputBlock.ref.pointer), 2);
-      expect(
-          internal_for_testing
-              .blockHasRegisteredClosure(inputBlock.ref.pointer.cast()),
-          true);
+      expect(internal_for_testing.isClosureOfBlock(inputBlockId), true);
 
       expect(blockRetainCount(blockBlock.ref.pointer), 1);
-      expect(
-          internal_for_testing
-              .blockHasRegisteredClosure(blockBlock.ref.pointer.cast()),
-          true);
+      expect(internal_for_testing.isClosureOfBlock(blockBlockId), true);
       expect(blockRetainCount(outputBlock.ref.pointer), 1);
-      expect(
-          internal_for_testing
-              .blockHasRegisteredClosure(outputBlock.ref.pointer.cast()),
-          true);
+      expect(internal_for_testing.isClosureOfBlock(outputBlockId), true);
       return (
         inputBlock.ref.pointer,
         blockBlock.ref.pointer,
-        outputBlock.ref.pointer
+        outputBlock.ref.pointer,
+        inputBlockId,
+        blockBlockId,
+        outputBlockId,
       );
     }
 
     test('Calling a block block from Dart has correct ref counting', () async {
-      final (inputBlock, blockBlock, outputBlock) =
-          blockBlockDartCallRefCountTest();
+      final (
+        inputBlock,
+        blockBlock,
+        outputBlock,
+        inputBlockId,
+        blockBlockId,
+        outputBlockId
+      ) = blockBlockDartCallRefCountTest();
       doGC();
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
       doGC();
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
 
       expect(blockRetainCount(inputBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(inputBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(inputBlockId), false);
       expect(blockRetainCount(blockBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(blockBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(blockBlockId), false);
       expect(blockRetainCount(outputBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(outputBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(outputBlockId), false);
     }, skip: !canDoGC);
 
-    (Pointer<ObjCBlockImpl>, Pointer<ObjCBlockImpl>, Pointer<ObjCBlockImpl>)
-        blockBlockObjCCallRefCountTest() {
+    (
+      Pointer<ObjCBlockImpl>,
+      Pointer<ObjCBlockImpl>,
+      Pointer<ObjCBlockImpl>,
+      int,
+      int
+    ) blockBlockObjCCallRefCountTest() {
       final pool = lib.objc_autoreleasePoolPush();
       late Pointer<ObjCBlockImpl> inputBlock;
       final blockBlock =
@@ -536,29 +546,30 @@ void main() {
           return 3 * intBlock(x);
         });
       });
+      final blockBlockId = internal_for_testing.lastClosureRegistryId;
       final outputBlock = BlockTester.newBlock_withMult_(blockBlock, 2);
+      final outputBlockId = internal_for_testing.lastClosureRegistryId;
+      expect(outputBlockId, isNot(blockBlockId));
       expect(outputBlock(1), 6);
       lib.objc_autoreleasePoolPop(pool);
       doGC();
 
       expect(blockRetainCount(inputBlock), 1);
-      expect(internal_for_testing.blockHasRegisteredClosure(inputBlock.cast()),
-          false);
       expect(blockRetainCount(blockBlock.ref.pointer), 1);
-      expect(
-          internal_for_testing
-              .blockHasRegisteredClosure(blockBlock.ref.pointer.cast()),
-          true);
+      expect(internal_for_testing.isClosureOfBlock(blockBlockId), true);
       expect(blockRetainCount(outputBlock.ref.pointer), 1);
-      expect(
-          internal_for_testing
-              .blockHasRegisteredClosure(outputBlock.ref.pointer.cast()),
-          true);
-      return (inputBlock, blockBlock.ref.pointer, outputBlock.ref.pointer);
+      expect(internal_for_testing.isClosureOfBlock(outputBlockId), true);
+      return (
+        inputBlock,
+        blockBlock.ref.pointer,
+        outputBlock.ref.pointer,
+        blockBlockId,
+        outputBlockId
+      );
     }
 
     test('Calling a block block from ObjC has correct ref counting', () async {
-      final (inputBlock, blockBlock, outputBlock) =
+      final (inputBlock, blockBlock, outputBlock, blockBlockId, outputBlockId) =
           blockBlockObjCCallRefCountTest();
       doGC();
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
@@ -566,14 +577,10 @@ void main() {
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
 
       expect(blockRetainCount(inputBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(inputBlock.cast()),
-          false);
       expect(blockRetainCount(blockBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(blockBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(blockBlockId), false);
       expect(blockRetainCount(outputBlock), 0);
-      expect(internal_for_testing.blockHasRegisteredClosure(outputBlock.cast()),
-          false);
+      expect(internal_for_testing.isClosureOfBlock(outputBlockId), false);
     }, skip: !canDoGC);
 
     (Pointer<ObjCBlockImpl>, Pointer<ObjCBlockImpl>, Pointer<ObjCBlockImpl>)
@@ -614,7 +621,7 @@ void main() {
         nativeBlockBlockObjCCallRefCountTest() {
       final blockBlock = BlockTester.newBlockBlock_(7);
       final outputBlock = BlockTester.newBlock_withMult_(blockBlock, 2);
-      expect(outputBlock(1), 14);
+      expect(BlockTester.newFromBlock_(outputBlock).call_(1), 14);
       doGC();
 
       expect(blockRetainCount(blockBlock.ref.pointer), 1);
@@ -709,7 +716,7 @@ void main() {
       thread.start();
 
       await hasRun.future;
-      expect(inputBlock(123), 12300);
+      expect(BlockTester.newFromBlock_(inputBlock).call_(123), 12300);
       thread.ref.release();
       doGC();
 
@@ -726,7 +733,7 @@ void main() {
       await Future<void>.delayed(Duration.zero); // Let dispose message arrive.
       doGC();
 
-      expect(blockRetainCount(inputBlock), 0);
+      // expect(blockRetainCount(inputBlock), 0);
       expect(blockRetainCount(blockBlock), 0);
     }, skip: !canDoGC);
 
@@ -792,28 +799,12 @@ void main() {
       expect(objectRetainCount(rawDummyObject), 0);
     }, skip: !canDoGC);
 
-    test('Block fields have sensible values', () {
-      final block = IntBlock.fromFunction(makeAdder(4000));
-      final blockPtr = block.ref.pointer;
-      expect(blockPtr.ref.isa, isNot(0));
-      expect(blockPtr.ref.flags, isNot(0)); // Set by Block_copy.
-      expect(blockPtr.ref.reserved, 0);
-      expect(blockPtr.ref.invoke, isNot(0));
-      expect(blockPtr.ref.target, isNot(0));
-      final descPtr = blockPtr.ref.descriptor;
-      expect(descPtr.ref.reserved, 0);
-      expect(descPtr.ref.size, isNot(0));
-      expect(descPtr.ref.copy_helper, nullptr);
-      expect(descPtr.ref.dispose_helper, isNot(nullptr));
-      expect(descPtr.ref.signature, nullptr);
-    });
-
     test('Block trampoline args converted to id', () {
       final objCBindings =
           File('test/native_objc_test/block_bindings.m').readAsStringSync();
 
       // Objects are converted to id.
-      expect(objCBindings, isNot(contains('NSObject')));
+      expect(objCBindings, isNot(contains('DummyObject')));
       expect(objCBindings, isNot(contains('NSString')));
       expect(objCBindings, contains('id'));
 
diff --git a/pkgs/objective_c/ffigen_c.yaml b/pkgs/objective_c/ffigen_c.yaml
index a1a733118..d83764bed 100644
--- a/pkgs/objective_c/ffigen_c.yaml
+++ b/pkgs/objective_c/ffigen_c.yaml
@@ -57,11 +57,6 @@ functions:
     'objc_getProtocol': 'getProtocol'
     'protocol_getMethodDescription': 'getMethodDescription'
     'protocol_getName': 'getProtocolName'
-globals:
-  include:
-    - '_NSConcrete.*Block'
-  rename:
-    '_(.*)': '$1'
 typedefs:
   include:
     - 'ObjC.*'
diff --git a/pkgs/objective_c/lib/objective_c.dart b/pkgs/objective_c/lib/objective_c.dart
index 08c246795..70adb248b 100644
--- a/pkgs/objective_c/lib/objective_c.dart
+++ b/pkgs/objective_c/lib/objective_c.dart
@@ -15,10 +15,11 @@ export 'src/c_bindings_generated.dart'
 export 'src/internal.dart'
     hide
         ObjCBlockBase,
-        blockHasRegisteredClosure,
+        isClosureOfBlock,
         isValidBlock,
         isValidClass,
-        isValidObject;
+        isValidObject,
+        lastClosureRegistryId;
 export 'src/ns_data.dart';
 export 'src/ns_input_stream.dart';
 export 'src/ns_mutable_data.dart';
diff --git a/pkgs/objective_c/lib/src/c_bindings_generated.dart b/pkgs/objective_c/lib/src/c_bindings_generated.dart
index be88ca160..871d6d9ac 100644
--- a/pkgs/objective_c/lib/src/c_bindings_generated.dart
+++ b/pkgs/objective_c/lib/src/c_bindings_generated.dart
@@ -47,27 +47,6 @@ external int Dart_InitializeApiDL(
   ffi.Pointer<ffi.Void> data,
 );
 
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteAutoBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteAutoBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(
-    symbol: "_NSConcreteFinalizingBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteFinalizingBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteGlobalBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteGlobalBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteMallocBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteMallocBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteStackBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteStackBlock;
-
 @ffi.Native<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
     symbol: "DOBJC_awaitWaiter")
 external void awaitWaiter(
@@ -95,10 +74,11 @@ external void deleteFinalizableHandle(
   Object owner,
 );
 
-@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCBlockImpl>)>(
+@ffi.Native<ffi.Void Function(ffi.Int64, ffi.Int64)>(
     symbol: "DOBJC_disposeObjCBlockWithClosure")
 external void disposeObjCBlockWithClosure(
-  ffi.Pointer<ObjCBlockImpl> block,
+  int dispose_port,
+  int closure_id,
 );
 
 @ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ffi.Char>)>(
@@ -208,7 +188,6 @@ external void signalWaiter(
 );
 
 typedef Dart_FinalizableHandle = ffi.Pointer<_Dart_FinalizableHandle>;
-typedef ObjCBlockDesc = _ObjCBlockDesc;
 typedef ObjCBlockImpl = _ObjCBlockImpl;
 typedef ObjCMethodDesc = _ObjCMethodDesc;
 typedef ObjCObject = _ObjCObject;
@@ -217,44 +196,7 @@ typedef ObjCSelector = _ObjCSelector;
 
 final class _Dart_FinalizableHandle extends ffi.Opaque {}
 
-final class _ObjCBlockDesc extends ffi.Struct {
-  @ffi.UnsignedLong()
-  external int reserved;
-
-  @ffi.UnsignedLong()
-  external int size;
-
-  external ffi.Pointer<
-          ffi.NativeFunction<
-              ffi.Void Function(
-                  ffi.Pointer<ffi.Void> dst, ffi.Pointer<ffi.Void> src)>>
-      copy_helper;
-
-  external ffi
-      .Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> src)>>
-      dispose_helper;
-
-  external ffi.Pointer<ffi.Char> signature;
-}
-
-final class _ObjCBlockImpl extends ffi.Struct {
-  external ffi.Pointer<ffi.Void> isa;
-
-  @ffi.Int()
-  external int flags;
-
-  @ffi.Int()
-  external int reserved;
-
-  external ffi.Pointer<ffi.Void> invoke;
-
-  external ffi.Pointer<ObjCBlockDesc> descriptor;
-
-  external ffi.Pointer<ffi.Void> target;
-
-  @ffi.Int64()
-  external int dispose_port;
-}
+final class _ObjCBlockImpl extends ffi.Opaque {}
 
 final class _ObjCMethodDesc extends ffi.Struct {
   external ffi.Pointer<ObjCSelector> name;
diff --git a/pkgs/objective_c/lib/src/internal.dart b/pkgs/objective_c/lib/src/internal.dart
index af40dad25..fd8b61929 100644
--- a/pkgs/objective_c/lib/src/internal.dart
+++ b/pkgs/objective_c/lib/src/internal.dart
@@ -345,55 +345,6 @@ class ObjCBlockBase extends _ObjCRefHolder<c.ObjCBlockImpl, _ObjCBlockRef> {
       : super(_ObjCBlockRef(ptr, retain: retain, release: release));
 }
 
-Pointer<c.ObjCBlockDesc> _newBlockDesc(
-    Pointer<NativeFunction<Void Function(BlockPtr)>> disposeHelper) {
-  final desc = calloc.allocate<c.ObjCBlockDesc>(sizeOf<c.ObjCBlockDesc>());
-  desc.ref.reserved = 0;
-  desc.ref.size = sizeOf<c.ObjCBlockImpl>();
-  desc.ref.copy_helper = nullptr;
-  desc.ref.dispose_helper = disposeHelper.cast();
-  desc.ref.signature = nullptr;
-  return desc;
-}
-
-final _pointerBlockDesc = _newBlockDesc(nullptr);
-final _closureBlockDesc = _newBlockDesc(
-    Native.addressOf<NativeFunction<Void Function(BlockPtr)>>(
-        c.disposeObjCBlockWithClosure));
-
-BlockPtr _newBlock(VoidPtr invoke, VoidPtr target,
-    Pointer<c.ObjCBlockDesc> descriptor, int disposePort, int flags) {
-  final b = calloc.allocate<c.ObjCBlockImpl>(sizeOf<c.ObjCBlockImpl>());
-  b.ref.isa = Native.addressOf<Array<VoidPtr>>(c.NSConcreteGlobalBlock).cast();
-  b.ref.flags = flags;
-  b.ref.reserved = 0;
-  b.ref.invoke = invoke;
-  b.ref.target = target;
-  b.ref.dispose_port = disposePort;
-  b.ref.descriptor = descriptor;
-  assert(c.isValidBlock(b));
-  final copy = c.blockRetain(b.cast()).cast<c.ObjCBlockImpl>();
-  calloc.free(b);
-  assert(copy.ref.isa ==
-      Native.addressOf<Array<VoidPtr>>(c.NSConcreteMallocBlock).cast());
-  assert(c.isValidBlock(copy));
-  return copy;
-}
-
-const int _blockHasCopyDispose = 1 << 25;
-
-/// Only for use by ffigen bindings.
-BlockPtr newClosureBlock(VoidPtr invoke, Function fn) => _newBlock(
-    invoke,
-    _registerBlockClosure(fn),
-    _closureBlockDesc,
-    _blockClosureDisposer.sendPort.nativePort,
-    _blockHasCopyDispose);
-
-/// Only for use by ffigen bindings.
-BlockPtr newPointerBlock(VoidPtr invoke, VoidPtr target) =>
-    _newBlock(invoke, target, _pointerBlockDesc, 0, 0);
-
 final _blockClosureRegistry = <int, Function>{};
 
 int _blockClosureRegistryLastId = 0;
@@ -407,39 +358,56 @@ final _blockClosureDisposer = () {
   }, 'ObjCBlockClosureDisposer')
     ..keepIsolateAlive = false;
 }();
+typedef DisposeBlockFn = NativeFunction<Void Function(Int64, Int64)>;
 
-VoidPtr _registerBlockClosure(Function closure) {
+/// Only for use by ffigen bindings.
+int registerBlockClosure(Function closure) {
   ++_blockClosureRegistryLastId;
   assert(!_blockClosureRegistry.containsKey(_blockClosureRegistryLastId));
   _blockClosureRegistry[_blockClosureRegistryLastId] = closure;
-  return VoidPtr.fromAddress(_blockClosureRegistryLastId);
+  return _blockClosureRegistryLastId;
 }
 
 /// Only for use by ffigen bindings.
-Function getBlockClosure(BlockPtr block) {
-  var id = block.ref.target.address;
+Function getBlockClosure(int id) {
   assert(_blockClosureRegistry.containsKey(id));
   return _blockClosureRegistry[id]!;
 }
 
+typedef NewClosureBlockFn = BlockPtr Function(
+    VoidPtr, int, int, Pointer<DisposeBlockFn>);
+
+/// Only for use by ffigen bindings.
+BlockPtr newClosureBlock(
+        Function closure, VoidPtr trampoline, NewClosureBlockFn nativeNew) =>
+    nativeNew(
+      trampoline,
+      registerBlockClosure(closure),
+      _blockClosureDisposer.sendPort.nativePort,
+      Native.addressOf<DisposeBlockFn>(c.disposeObjCBlockWithClosure),
+    );
+
 typedef NewWaiterFn = NativeFunction<VoidPtr Function()>;
 typedef AwaitWaiterFn = NativeFunction<Void Function(VoidPtr)>;
-typedef NativeWrapperFn = BlockPtr Function(
-    BlockPtr, BlockPtr, Pointer<NewWaiterFn>, Pointer<AwaitWaiterFn>);
+typedef NewBlockingBlockFn = BlockPtr Function(VoidPtr, VoidPtr, int, int,
+    Pointer<DisposeBlockFn>, Pointer<NewWaiterFn>, Pointer<AwaitWaiterFn>);
 
 /// Only for use by ffigen bindings.
-BlockPtr wrapBlockingBlock(
-        NativeWrapperFn nativeWrapper, BlockPtr raw, BlockPtr rawListener) =>
-    nativeWrapper(
-      raw,
-      rawListener,
+BlockPtr newBlockingBlock(Function closure, VoidPtr trampoline,
+        VoidPtr listenerTrampoline, NewBlockingBlockFn nativeNew) =>
+    nativeNew(
+      trampoline,
+      listenerTrampoline,
+      registerBlockClosure(closure),
+      _blockClosureDisposer.sendPort.nativePort,
+      Native.addressOf<DisposeBlockFn>(c.disposeObjCBlockWithClosure),
       Native.addressOf<NewWaiterFn>(c.newWaiter),
       Native.addressOf<AwaitWaiterFn>(c.awaitWaiter),
     );
 
 // Not exported by ../objective_c.dart, because they're only for testing.
-bool blockHasRegisteredClosure(BlockPtr block) =>
-    _blockClosureRegistry.containsKey(block.ref.target.address);
+int get lastClosureRegistryId => _blockClosureRegistryLastId;
+bool isClosureOfBlock(int id) => _blockClosureRegistry.containsKey(id);
 bool isValidBlock(BlockPtr block) => c.isValidBlock(block);
 bool isValidClass(ObjectPtr clazz) => _isValidClass(clazz);
 bool isValidObject(ObjectPtr object) => _isValidObject(object);
diff --git a/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart b/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart
index 767000c3e..c9b1efa49 100644
--- a/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart
+++ b/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart
@@ -36,129 +36,915 @@ set NSLocalizedDescriptionKey(NSString value) {
   _NSLocalizedDescriptionKey = value.ref.retainAndReturnPointer();
 }
 
+@ffi.Native<
+    instancetype Function(
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCObject>,
+        ffi.Pointer<objc.ObjCObject>,
+        ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>()
+external instancetype _ObjectiveCBindings_invokeBlock_10z9f5k(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+  ffi.Pointer<objc.ObjCObject> arg2,
+  ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3,
+);
+
+@ffi.Native<
+    ffi.UnsignedLong Function(
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<NSFastEnumerationState>,
+        ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+        ffi.UnsignedLong)>()
+external int _ObjectiveCBindings_invokeBlock_17ap02x(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<NSFastEnumerationState> arg1,
+  ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
+  int arg3,
+);
+
+@ffi.Native<
+    ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCObject>)>()
+external void _ObjectiveCBindings_invokeBlock_18v1jvf(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+);
+
+@ffi.Native<
+    ffi.Pointer<_NSZone> Function(
+        ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>()
+external ffi.Pointer<_NSZone> _ObjectiveCBindings_invokeBlock_1a8cl66(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+);
+
+@ffi.Native<
+    ffi.Void Function(
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<objc.ObjCObject>,
+        ffi.Pointer<objc.ObjCObject>)>()
+external void _ObjectiveCBindings_invokeBlock_1b3bb6a(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<objc.ObjCBlockImpl> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+  ffi.Pointer<objc.ObjCObject> arg2,
+);
+
+@ffi.Native<
+    ffi.UnsignedLong Function(
+        ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>()
+external int _ObjectiveCBindings_invokeBlock_1ckyi24(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCObject> Function(
+        ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>()
+external ffi.Pointer<objc.ObjCObject> _ObjectiveCBindings_invokeBlock_1mbt9g9(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCObject> Function(
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCSelector>,
+        ffi.Pointer<objc.ObjCObject>)>()
+external ffi.Pointer<objc.ObjCObject> _ObjectiveCBindings_invokeBlock_1mllhpc(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCSelector> arg1,
+  ffi.Pointer<objc.ObjCObject> arg2,
+);
+
+@ffi.Native<
+    ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCObject>)>()
+external bool _ObjectiveCBindings_invokeBlock_3su7tt(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>()
+external ffi.Pointer<objc.ObjCObject> _ObjectiveCBindings_invokeBlock_50as9u(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCSelector> arg1,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCObject> Function(
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCSelector>,
+        ffi.Pointer<objc.ObjCObject>,
+        ffi.Pointer<objc.ObjCObject>)>()
+external ffi.Pointer<objc.ObjCObject> _ObjectiveCBindings_invokeBlock_c7gk2u(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCSelector> arg1,
+  ffi.Pointer<objc.ObjCObject> arg2,
+  ffi.Pointer<objc.ObjCObject> arg3,
+);
+
+@ffi.Native<
+    ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>()
+external bool _ObjectiveCBindings_invokeBlock_e3qsqz(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+);
+
+@ffi.Native<
+    ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCObject>, ffi.UnsignedLong)>()
+external void _ObjectiveCBindings_invokeBlock_hoampi(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+  int arg2,
+);
+
+@ffi.Native<
+    ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>()
+external void _ObjectiveCBindings_invokeBlock_ovsamd(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+);
+
+@ffi.Native<
+    ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>)>()
+external void _ObjectiveCBindings_invokeBlock_pfv6jd(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<objc.ObjCObject> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+);
+
+@ffi.Native<
+    ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>,
+        ffi.Pointer<objc.ObjCSelector>)>()
+external bool _ObjectiveCBindings_invokeBlock_w1e3k0(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCSelector> arg1,
+);
+
+@ffi.Native<
+    instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()
+external instancetype _ObjectiveCBindings_invokeBlock_xr62hr(
+  ffi.Pointer<objc.ObjCBlockImpl> block,
+  ffi.Pointer<ffi.Void> arg0,
+  ffi.Pointer<objc.ObjCObject> arg1,
+);
+
 @ffi.Native<
         ffi.Pointer<objc.ObjCBlockImpl> Function(
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Int64,
+            ffi.Int64,
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(
+                        ffi.Int64 dispose_port, ffi.Int64 closure_id)>>,
             ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
             ffi.Pointer<
                 ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
     isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapBlockingBlock_18d6mda(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
-  ffi.Pointer<objc.ObjCBlockImpl> listnerBlock,
-  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> newWaiter,
+    _ObjectiveCBindings_newBlockingBlock_18v1jvf(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> listener_trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> new_waiter,
   ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
-      awaitWaiter,
+      await_waiter,
 );
 
 @ffi.Native<
         ffi.Pointer<objc.ObjCBlockImpl> Function(
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Int64,
+            ffi.Int64,
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(
+                        ffi.Int64 dispose_port, ffi.Int64 closure_id)>>,
             ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
             ffi.Pointer<
                 ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
     isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapBlockingBlock_1j2nt86(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
-  ffi.Pointer<objc.ObjCBlockImpl> listnerBlock,
-  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> newWaiter,
+    _ObjectiveCBindings_newBlockingBlock_1b3bb6a(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> listener_trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> new_waiter,
   ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
-      awaitWaiter,
+      await_waiter,
 );
 
 @ffi.Native<
         ffi.Pointer<objc.ObjCBlockImpl> Function(
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Int64,
+            ffi.Int64,
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(
+                        ffi.Int64 dispose_port, ffi.Int64 closure_id)>>,
+            ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
+            ffi.Pointer<
+                ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
+    isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newBlockingBlock_hoampi(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> listener_trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> new_waiter,
+  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
+      await_waiter,
+);
+
+@ffi.Native<
+        ffi.Pointer<objc.ObjCBlockImpl> Function(
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Int64,
+            ffi.Int64,
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(
+                        ffi.Int64 dispose_port, ffi.Int64 closure_id)>>,
             ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
             ffi.Pointer<
                 ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
     isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapBlockingBlock_ovsamd(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
-  ffi.Pointer<objc.ObjCBlockImpl> listnerBlock,
-  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> newWaiter,
-  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
-      awaitWaiter,
+    _ObjectiveCBindings_newBlockingBlock_ovsamd(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> listener_trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> new_waiter,
+  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
+      await_waiter,
+);
+
+@ffi.Native<
+        ffi.Pointer<objc.ObjCBlockImpl> Function(
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Int64,
+            ffi.Int64,
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(
+                        ffi.Int64 dispose_port, ffi.Int64 closure_id)>>,
+            ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
+            ffi.Pointer<
+                ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
+    isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newBlockingBlock_pfv6jd(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> listener_trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> new_waiter,
+  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
+      await_waiter,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_10z9f5k(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_17ap02x(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_18v1jvf(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_1a8cl66(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_1b3bb6a(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_1ckyi24(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_1mbt9g9(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_1mllhpc(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_3su7tt(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_50as9u(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_c7gk2u(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_e3qsqz(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_hoampi(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_ovsamd(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_pfv6jd(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_w1e3k0(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newClosureBlock_xr62hr(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newListenerBlock_18v1jvf(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newListenerBlock_1b3bb6a(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newListenerBlock_hoampi(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newListenerBlock_ovsamd(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>,
+        ffi.Int64,
+        ffi.Int64,
+        ffi.Pointer<
+            ffi.NativeFunction<
+                ffi.Void Function(ffi.Int64 dispose_port,
+                    ffi.Int64 closure_id)>>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newListenerBlock_pfv6jd(
+  ffi.Pointer<ffi.Void> trampoline,
+  int closure_id,
+  int dispose_port,
+  ffi.Pointer<
+          ffi.NativeFunction<
+              ffi.Void Function(ffi.Int64 dispose_port, ffi.Int64 closure_id)>>
+      dtor,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_10z9f5k(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_17ap02x(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_18v1jvf(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_1a8cl66(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_1b3bb6a(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_1ckyi24(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_1mbt9g9(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_1mllhpc(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_3su7tt(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
-        ffi.Pointer<objc.ObjCBlockImpl> Function(
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
-            ffi.Pointer<
-                ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
-    isLeaf: true)
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapBlockingBlock_wjovn7(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
-  ffi.Pointer<objc.ObjCBlockImpl> listnerBlock,
-  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> newWaiter,
-  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
-      awaitWaiter,
+    _ObjectiveCBindings_newPointerBlock_50as9u(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
-        ffi.Pointer<objc.ObjCBlockImpl> Function(
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<objc.ObjCBlockImpl>,
-            ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>,
-            ffi.Pointer<
-                ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>)>(
-    isLeaf: true)
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapBlockingBlock_wjvic9(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
-  ffi.Pointer<objc.ObjCBlockImpl> listnerBlock,
-  ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> newWaiter,
-  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
-      awaitWaiter,
+    _ObjectiveCBindings_newPointerBlock_c7gk2u(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
     ffi.Pointer<objc.ObjCBlockImpl> Function(
-        ffi.Pointer<objc.ObjCBlockImpl>)>(isLeaf: true)
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapListenerBlock_18d6mda(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
+    _ObjectiveCBindings_newPointerBlock_e3qsqz(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
     ffi.Pointer<objc.ObjCBlockImpl> Function(
-        ffi.Pointer<objc.ObjCBlockImpl>)>(isLeaf: true)
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapListenerBlock_1j2nt86(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
+    _ObjectiveCBindings_newPointerBlock_hoampi(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
     ffi.Pointer<objc.ObjCBlockImpl> Function(
-        ffi.Pointer<objc.ObjCBlockImpl>)>(isLeaf: true)
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapListenerBlock_ovsamd(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
+    _ObjectiveCBindings_newPointerBlock_ovsamd(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
     ffi.Pointer<objc.ObjCBlockImpl> Function(
-        ffi.Pointer<objc.ObjCBlockImpl>)>(isLeaf: true)
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapListenerBlock_wjovn7(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
+    _ObjectiveCBindings_newPointerBlock_pfv6jd(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 @ffi.Native<
     ffi.Pointer<objc.ObjCBlockImpl> Function(
-        ffi.Pointer<objc.ObjCBlockImpl>)>(isLeaf: true)
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
 external ffi.Pointer<objc.ObjCBlockImpl>
-    _ObjectiveCBindings_wrapListenerBlock_wjvic9(
-  ffi.Pointer<objc.ObjCBlockImpl> block,
+    _ObjectiveCBindings_newPointerBlock_w1e3k0(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
+);
+
+@ffi.Native<
+    ffi.Pointer<objc.ObjCBlockImpl> Function(
+        ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>(isLeaf: true)
+external ffi.Pointer<objc.ObjCBlockImpl>
+    _ObjectiveCBindings_newPointerBlock_xr62hr(
+  ffi.Pointer<ffi.Void> trampoline,
+  ffi.Pointer<ffi.Void> func,
 );
 
 /// Helper class to adapt a Dart stream into a `NSInputStream`.
@@ -178,13 +964,13 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// Returns whether [obj] is an instance of [DartInputStreamAdapter].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(obj.ref.pointer, _sel_isKindOfClass_,
+    return _objc_msgSend_19nvye5(obj.ref.pointer, _sel_isKindOfClass_,
         _class_DOBJCDartInputStreamAdapter);
   }
 
   /// inputStreamWithData:
   static DartInputStreamAdapter? inputStreamWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(_class_DOBJCDartInputStreamAdapter,
+    final _ret = _objc_msgSend_1sotr3r(_class_DOBJCDartInputStreamAdapter,
         _sel_inputStreamWithData_, data.ref.pointer);
     return _ret.address == 0
         ? null
@@ -194,7 +980,7 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// inputStreamWithFileAtPath:
   static DartInputStreamAdapter? inputStreamWithFileAtPath_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(_class_DOBJCDartInputStreamAdapter,
+    final _ret = _objc_msgSend_1sotr3r(_class_DOBJCDartInputStreamAdapter,
         _sel_inputStreamWithFileAtPath_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -207,7 +993,7 @@ class DartInputStreamAdapter extends NSInputStream {
   /// -1 => The `NSInputStream` has been closed and the port can be closed.
   /// _  => The number of types being required in a `read:maxLength` call.
   static DartInputStreamAdapter inputStreamWithPort_(int sendPort) {
-    final _ret = _objc_msgSend_r25hnf(_class_DOBJCDartInputStreamAdapter,
+    final _ret = _objc_msgSend_1ya1kjn(_class_DOBJCDartInputStreamAdapter,
         _sel_inputStreamWithPort_, sendPort);
     return DartInputStreamAdapter.castFromPointer(_ret,
         retain: true, release: true);
@@ -215,7 +1001,7 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// inputStreamWithURL:
   static DartInputStreamAdapter? inputStreamWithURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(_class_DOBJCDartInputStreamAdapter,
+    final _ret = _objc_msgSend_1sotr3r(_class_DOBJCDartInputStreamAdapter,
         _sel_inputStreamWithURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -225,13 +1011,13 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// addData:
   int addData_(NSData data) {
-    return _objc_msgSend_1p4b7x4(
+    return _objc_msgSend_1vd1c5m(
         this.ref.pointer, _sel_addData_, data.ref.pointer);
   }
 
   /// initWithData:
   DartInputStreamAdapter initWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithData_, data.ref.pointer);
     return DartInputStreamAdapter.castFromPointer(_ret,
         retain: false, release: true);
@@ -239,7 +1025,7 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// initWithFileAtPath:
   DartInputStreamAdapter? initWithFileAtPath_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithFileAtPath_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -249,7 +1035,7 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// initWithURL:
   DartInputStreamAdapter? initWithURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.retainAndReturnPointer(), _sel_initWithURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -264,7 +1050,7 @@ class DartInputStreamAdapter extends NSInputStream {
 
   /// setError:
   void setError_(NSError error) {
-    _objc_msgSend_1jdvcbf(this.ref.pointer, _sel_setError_, error.ref.pointer);
+    _objc_msgSend_xtuoz7(this.ref.pointer, _sel_setError_, error.ref.pointer);
   }
 
   /// stream:handleEvent:
@@ -273,7 +1059,7 @@ class DartInputStreamAdapter extends NSInputStream {
       throw objc.UnimplementedOptionalMethodException(
           'DOBJCDartInputStreamAdapter', 'stream:handleEvent:');
     }
-    _objc_msgSend_hglvhy(this.ref.pointer, _sel_stream_handleEvent_,
+    _objc_msgSend_3l8zum(this.ref.pointer, _sel_stream_handleEvent_,
         aStream.ref.pointer, eventCode.value);
   }
 }
@@ -295,38 +1081,38 @@ class DartProxy extends NSProxy {
 
   /// Returns whether [obj] is an instance of [DartProxy].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_DOBJCDartProxy);
   }
 
   /// alloc
   static objc.ObjCObjectBase alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_DOBJCDartProxy, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_DOBJCDartProxy, _sel_alloc);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
   /// newFromBuilder:
   static DartProxy newFromBuilder_(DartProxyBuilder builder) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_DOBJCDartProxy, _sel_newFromBuilder_, builder.ref.pointer);
     return DartProxy.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// autorelease
   DartProxy autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return DartProxy.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// forwardInvocation:
   void forwardInvocation_(NSInvocation invocation) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_forwardInvocation_, invocation.ref.pointer);
   }
 
   /// initFromBuilder:
   DartProxy initFromBuilder_(DartProxyBuilder builder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initFromBuilder_, builder.ref.pointer);
     return DartProxy.castFromPointer(_ret, retain: false, release: true);
   }
@@ -334,7 +1120,7 @@ class DartProxy extends NSProxy {
   /// methodSignatureForSelector:
   NSMethodSignature methodSignatureForSelector_(
       ffi.Pointer<objc.ObjCSelector> sel) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         this.ref.pointer, _sel_methodSignatureForSelector_, sel);
     return NSMethodSignature.castFromPointer(_ret, retain: true, release: true);
   }
@@ -347,13 +1133,13 @@ class DartProxy extends NSProxy {
 
   /// retain
   DartProxy retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return DartProxy.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   DartProxy self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return DartProxy.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -375,33 +1161,33 @@ class DartProxyBuilder extends NSObject {
 
   /// Returns whether [obj] is an instance of [DartProxyBuilder].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_DOBJCDartProxyBuilder);
   }
 
   /// alloc
   static DartProxyBuilder alloc() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_DOBJCDartProxyBuilder, _sel_alloc);
+        _objc_msgSend_151sglz(_class_DOBJCDartProxyBuilder, _sel_alloc);
     return DartProxyBuilder.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static DartProxyBuilder allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(
+    final _ret = _objc_msgSend_1cwp428(
         _class_DOBJCDartProxyBuilder, _sel_allocWithZone_, zone);
     return DartProxyBuilder.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static DartProxyBuilder new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_DOBJCDartProxyBuilder, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_DOBJCDartProxyBuilder, _sel_new);
     return DartProxyBuilder.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// autorelease
   DartProxyBuilder autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return DartProxyBuilder.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -410,7 +1196,7 @@ class DartProxyBuilder extends NSObject {
       ffi.Pointer<objc.ObjCSelector> sel,
       NSMethodSignature signature,
       ffi.Pointer<ffi.Void> block) {
-    _objc_msgSend_kq0sbq(
+    _objc_msgSend_140ec04(
         this.ref.pointer,
         _sel_implementMethod_withSignature_andBlock_,
         sel,
@@ -421,19 +1207,19 @@ class DartProxyBuilder extends NSObject {
   /// init
   DartProxyBuilder init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return DartProxyBuilder.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// retain
   DartProxyBuilder retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return DartProxyBuilder.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   DartProxyBuilder self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return DartProxyBuilder.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -455,46 +1241,46 @@ class NSArray extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSArray].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSArray);
   }
 
   /// alloc
   static NSArray alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSArray, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSArray, _sel_alloc);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSArray allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSArray, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSArray, _sel_allocWithZone_, zone);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// array
   static NSArray array() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSArray, _sel_array);
+    final _ret = _objc_msgSend_151sglz(_class_NSArray, _sel_array);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithArray:
   static NSArray arrayWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSArray, _sel_arrayWithArray_, array.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithObject:
   static NSArray arrayWithObject_(objc.ObjCObjectBase anObject) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSArray, _sel_arrayWithObject_, anObject.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithObjects:
   static NSArray arrayWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSArray, _sel_arrayWithObjects_, firstObj.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
@@ -502,14 +1288,14 @@ class NSArray extends NSObject {
   /// arrayWithObjects:count:
   static NSArray arrayWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(
+    final _ret = _objc_msgSend_zmbtbd(
         _class_NSArray, _sel_arrayWithObjects_count_, objects, cnt);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSArray new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSArray, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSArray, _sel_new);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -534,34 +1320,34 @@ class NSArray extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSArray init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:
   NSArray initWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_, array.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:copyItems:
   NSArray initWithArray_copyItems_(NSArray array, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_copyItems_, array.ref.pointer, flag);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSArray? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -570,7 +1356,7 @@ class NSArray extends NSObject {
 
   /// initWithObjects:
   NSArray initWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_, firstObj.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
@@ -578,7 +1364,7 @@ class NSArray extends NSObject {
   /// initWithObjects:count:
   NSArray initWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_zmbtbd(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_count_, objects, cnt);
     return NSArray.castFromPointer(_ret, retain: false, release: true);
   }
@@ -586,7 +1372,7 @@ class NSArray extends NSObject {
   /// objectAtIndex:
   objc.ObjCObjectBase objectAtIndex_(int index) {
     final _ret =
-        _objc_msgSend_1qrcblu(this.ref.pointer, _sel_objectAtIndex_, index);
+        _objc_msgSend_14hpxwa(this.ref.pointer, _sel_objectAtIndex_, index);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 }
@@ -625,54 +1411,54 @@ class NSCharacterSet extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSCharacterSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSCharacterSet);
   }
 
   /// alloc
   static NSCharacterSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_alloc);
     return NSCharacterSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSCharacterSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSCharacterSet, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSCharacterSet, _sel_allocWithZone_, zone);
     return NSCharacterSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// alphanumericCharacterSet
   static NSCharacterSet getAlphanumericCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_alphanumericCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// capitalizedLetterCharacterSet
   static NSCharacterSet getCapitalizedLetterCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_capitalizedLetterCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// characterSetWithBitmapRepresentation:
   static NSCharacterSet characterSetWithBitmapRepresentation_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSCharacterSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSCharacterSet,
         _sel_characterSetWithBitmapRepresentation_, data.ref.pointer);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// characterSetWithCharactersInString:
   static NSCharacterSet characterSetWithCharactersInString_(NSString aString) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSCharacterSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSCharacterSet,
         _sel_characterSetWithCharactersInString_, aString.ref.pointer);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// characterSetWithContentsOfFile:
   static NSCharacterSet? characterSetWithContentsOfFile_(NSString fName) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSCharacterSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSCharacterSet,
         _sel_characterSetWithContentsOfFile_, fName.ref.pointer);
     return _ret.address == 0
         ? null
@@ -681,7 +1467,7 @@ class NSCharacterSet extends NSObject {
 
   /// characterSetWithRange:
   static NSCharacterSet characterSetWithRange_(NSRange aRange) {
-    final _ret = _objc_msgSend_83z673(
+    final _ret = _objc_msgSend_1k1o1s7(
         _class_NSCharacterSet, _sel_characterSetWithRange_, aRange);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -689,20 +1475,20 @@ class NSCharacterSet extends NSObject {
   /// controlCharacterSet
   static NSCharacterSet getControlCharacterSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_controlCharacterSet);
+        _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_controlCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// decimalDigitCharacterSet
   static NSCharacterSet getDecimalDigitCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_decimalDigitCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// decomposableCharacterSet
   static NSCharacterSet getDecomposableCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_decomposableCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -710,47 +1496,47 @@ class NSCharacterSet extends NSObject {
   /// illegalCharacterSet
   static NSCharacterSet getIllegalCharacterSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_illegalCharacterSet);
+        _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_illegalCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// letterCharacterSet
   static NSCharacterSet getLetterCharacterSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_letterCharacterSet);
+        _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_letterCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// lowercaseLetterCharacterSet
   static NSCharacterSet getLowercaseLetterCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_lowercaseLetterCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSCharacterSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_new);
     return NSCharacterSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// newlineCharacterSet
   static NSCharacterSet getNewlineCharacterSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_newlineCharacterSet);
+        _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_newlineCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// nonBaseCharacterSet
   static NSCharacterSet getNonBaseCharacterSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_nonBaseCharacterSet);
+        _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_nonBaseCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// punctuationCharacterSet
   static NSCharacterSet getPunctuationCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_punctuationCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -764,41 +1550,41 @@ class NSCharacterSet extends NSObject {
   /// symbolCharacterSet
   static NSCharacterSet getSymbolCharacterSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSCharacterSet, _sel_symbolCharacterSet);
+        _objc_msgSend_151sglz(_class_NSCharacterSet, _sel_symbolCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// uppercaseLetterCharacterSet
   static NSCharacterSet getUppercaseLetterCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_uppercaseLetterCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// whitespaceAndNewlineCharacterSet
   static NSCharacterSet getWhitespaceAndNewlineCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_whitespaceAndNewlineCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// whitespaceCharacterSet
   static NSCharacterSet getWhitespaceCharacterSet() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         _class_NSCharacterSet, _sel_whitespaceCharacterSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// autorelease
   NSCharacterSet autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// bitmapRepresentation
   NSData get bitmapRepresentation {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_bitmapRepresentation);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_bitmapRepresentation);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -810,7 +1596,7 @@ class NSCharacterSet extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
@@ -823,13 +1609,13 @@ class NSCharacterSet extends NSObject {
   /// init
   NSCharacterSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSCharacterSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSCharacterSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -838,13 +1624,13 @@ class NSCharacterSet extends NSObject {
 
   /// invertedSet
   NSCharacterSet get invertedSet {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_invertedSet);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_invertedSet);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// isSupersetOfSet:
   bool isSupersetOfSet_(NSCharacterSet theOtherSet) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isSupersetOfSet_, theOtherSet.ref.pointer);
   }
 
@@ -856,13 +1642,13 @@ class NSCharacterSet extends NSObject {
 
   /// retain
   NSCharacterSet retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSCharacterSet self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSCharacterSet.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -884,7 +1670,7 @@ class NSCoder extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [NSCoder].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSCoder);
   }
 }
@@ -923,31 +1709,32 @@ class NSData extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSData].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSData);
   }
 
   /// alloc
   static NSData alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSData, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSData, _sel_alloc);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSData allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(_class_NSData, _sel_allocWithZone_, zone);
+    final _ret =
+        _objc_msgSend_1cwp428(_class_NSData, _sel_allocWithZone_, zone);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// data
   static NSData data() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSData, _sel_data);
+    final _ret = _objc_msgSend_151sglz(_class_NSData, _sel_data);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dataWithBytes:length:
   static NSData dataWithBytes_length_(ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(
+    final _ret = _objc_msgSend_3nbx5e(
         _class_NSData, _sel_dataWithBytes_length_, bytes, length);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
@@ -955,7 +1742,7 @@ class NSData extends NSObject {
   /// dataWithBytesNoCopy:length:
   static NSData dataWithBytesNoCopy_length_(
       ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(
+    final _ret = _objc_msgSend_3nbx5e(
         _class_NSData, _sel_dataWithBytesNoCopy_length_, bytes, length);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
@@ -963,14 +1750,14 @@ class NSData extends NSObject {
   /// dataWithBytesNoCopy:length:freeWhenDone:
   static NSData dataWithBytesNoCopy_length_freeWhenDone_(
       ffi.Pointer<ffi.Void> bytes, int length, bool b) {
-    final _ret = _objc_msgSend_1je1k7e(_class_NSData,
+    final _ret = _objc_msgSend_161ne8y(_class_NSData,
         _sel_dataWithBytesNoCopy_length_freeWhenDone_, bytes, length, b);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dataWithContentsOfFile:
   static NSData? dataWithContentsOfFile_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSData, _sel_dataWithContentsOfFile_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -982,7 +1769,7 @@ class NSData extends NSObject {
       NSString path,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         _class_NSData,
         _sel_dataWithContentsOfFile_options_error_,
         path.ref.pointer,
@@ -995,7 +1782,7 @@ class NSData extends NSObject {
 
   /// dataWithContentsOfURL:
   static NSData? dataWithContentsOfURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSData, _sel_dataWithContentsOfURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1007,7 +1794,7 @@ class NSData extends NSObject {
       NSURL url,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         _class_NSData,
         _sel_dataWithContentsOfURL_options_error_,
         url.ref.pointer,
@@ -1020,14 +1807,14 @@ class NSData extends NSObject {
 
   /// dataWithData:
   static NSData dataWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSData, _sel_dataWithData_, data.ref.pointer);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSData new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSData, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSData, _sel_new);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -1045,7 +1832,7 @@ class NSData extends NSObject {
   NSData? compressedDataUsingAlgorithm_error_(
       NSDataCompressionAlgorithm algorithm,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1okds6o(this.ref.pointer,
+    final _ret = _objc_msgSend_1vnlaqg(this.ref.pointer,
         _sel_compressedDataUsingAlgorithm_error_, algorithm.value, error);
     return _ret.address == 0
         ? null
@@ -1056,7 +1843,7 @@ class NSData extends NSObject {
   NSData? decompressedDataUsingAlgorithm_error_(
       NSDataCompressionAlgorithm algorithm,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1okds6o(this.ref.pointer,
+    final _ret = _objc_msgSend_1vnlaqg(this.ref.pointer,
         _sel_decompressedDataUsingAlgorithm_error_, algorithm.value, error);
     return _ret.address == 0
         ? null
@@ -1065,21 +1852,21 @@ class NSData extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSData init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBase64EncodedData:options:
   NSData? initWithBase64EncodedData_options_(
       NSData base64Data, NSDataBase64DecodingOptions options) {
-    final _ret = _objc_msgSend_dnlotu(
+    final _ret = _objc_msgSend_7kpg7m(
         this.ref.retainAndReturnPointer(),
         _sel_initWithBase64EncodedData_options_,
         base64Data.ref.pointer,
@@ -1092,7 +1879,7 @@ class NSData extends NSObject {
   /// initWithBase64EncodedString:options:
   NSData? initWithBase64EncodedString_options_(
       NSString base64String, NSDataBase64DecodingOptions options) {
-    final _ret = _objc_msgSend_dnlotu(
+    final _ret = _objc_msgSend_7kpg7m(
         this.ref.retainAndReturnPointer(),
         _sel_initWithBase64EncodedString_options_,
         base64String.ref.pointer,
@@ -1104,14 +1891,14 @@ class NSData extends NSObject {
 
   /// initWithBytes:length:
   NSData initWithBytes_length_(ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_3nbx5e(this.ref.retainAndReturnPointer(),
         _sel_initWithBytes_length_, bytes, length);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBytesNoCopy:length:
   NSData initWithBytesNoCopy_length_(ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_3nbx5e(this.ref.retainAndReturnPointer(),
         _sel_initWithBytesNoCopy_length_, bytes, length);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
@@ -1119,14 +1906,14 @@ class NSData extends NSObject {
   /// initWithBytesNoCopy:length:freeWhenDone:
   NSData initWithBytesNoCopy_length_freeWhenDone_(
       ffi.Pointer<ffi.Void> bytes, int length, bool b) {
-    final _ret = _objc_msgSend_1je1k7e(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_161ne8y(this.ref.retainAndReturnPointer(),
         _sel_initWithBytesNoCopy_length_freeWhenDone_, bytes, length, b);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSData? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1135,7 +1922,7 @@ class NSData extends NSObject {
 
   /// initWithContentsOfFile:
   NSData? initWithContentsOfFile_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1147,7 +1934,7 @@ class NSData extends NSObject {
       NSString path,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_options_error_,
         path.ref.pointer,
@@ -1160,7 +1947,7 @@ class NSData extends NSObject {
 
   /// initWithContentsOfURL:
   NSData? initWithContentsOfURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1172,7 +1959,7 @@ class NSData extends NSObject {
       NSURL url,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_options_error_,
         url.ref.pointer,
@@ -1185,7 +1972,7 @@ class NSData extends NSObject {
 
   /// initWithData:
   NSData initWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithData_, data.ref.pointer);
     return NSData.castFromPointer(_ret, retain: false, release: true);
   }
@@ -1349,60 +2136,61 @@ class NSDate extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSDate].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSDate);
   }
 
   /// alloc
   static NSDate alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSDate, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSDate, _sel_alloc);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSDate allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(_class_NSDate, _sel_allocWithZone_, zone);
+    final _ret =
+        _objc_msgSend_1cwp428(_class_NSDate, _sel_allocWithZone_, zone);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// date
   static NSDate date() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSDate, _sel_date);
+    final _ret = _objc_msgSend_151sglz(_class_NSDate, _sel_date);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dateWithTimeInterval:sinceDate:
   static NSDate dateWithTimeInterval_sinceDate_(
       double secsToBeAdded, NSDate date) {
-    final _ret = _objc_msgSend_xh7c7e(_class_NSDate,
+    final _ret = _objc_msgSend_1ozwf6k(_class_NSDate,
         _sel_dateWithTimeInterval_sinceDate_, secsToBeAdded, date.ref.pointer);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dateWithTimeIntervalSince1970:
   static NSDate dateWithTimeIntervalSince1970_(double secs) {
-    final _ret = _objc_msgSend_1x911p2(
+    final _ret = _objc_msgSend_oa8mke(
         _class_NSDate, _sel_dateWithTimeIntervalSince1970_, secs);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dateWithTimeIntervalSinceNow:
   static NSDate dateWithTimeIntervalSinceNow_(double secs) {
-    final _ret = _objc_msgSend_1x911p2(
+    final _ret = _objc_msgSend_oa8mke(
         _class_NSDate, _sel_dateWithTimeIntervalSinceNow_, secs);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dateWithTimeIntervalSinceReferenceDate:
   static NSDate dateWithTimeIntervalSinceReferenceDate_(double ti) {
-    final _ret = _objc_msgSend_1x911p2(
+    final _ret = _objc_msgSend_oa8mke(
         _class_NSDate, _sel_dateWithTimeIntervalSinceReferenceDate_, ti);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSDate new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSDate, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSDate, _sel_new);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -1413,33 +2201,33 @@ class NSDate extends NSObject {
 
   /// autorelease
   NSDate autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dateByAddingTimeInterval:
   NSDate dateByAddingTimeInterval_(double ti) {
-    final _ret = _objc_msgSend_1x911p2(
+    final _ret = _objc_msgSend_oa8mke(
         this.ref.pointer, _sel_dateByAddingTimeInterval_, ti);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSDate init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSDate? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1448,41 +2236,41 @@ class NSDate extends NSObject {
 
   /// initWithTimeInterval:sinceDate:
   NSDate initWithTimeInterval_sinceDate_(double secsToBeAdded, NSDate date) {
-    final _ret = _objc_msgSend_xh7c7e(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1ozwf6k(this.ref.retainAndReturnPointer(),
         _sel_initWithTimeInterval_sinceDate_, secsToBeAdded, date.ref.pointer);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithTimeIntervalSince1970:
   NSDate initWithTimeIntervalSince1970_(double secs) {
-    final _ret = _objc_msgSend_1x911p2(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_oa8mke(this.ref.retainAndReturnPointer(),
         _sel_initWithTimeIntervalSince1970_, secs);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithTimeIntervalSinceNow:
   NSDate initWithTimeIntervalSinceNow_(double secs) {
-    final _ret = _objc_msgSend_1x911p2(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_oa8mke(this.ref.retainAndReturnPointer(),
         _sel_initWithTimeIntervalSinceNow_, secs);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithTimeIntervalSinceReferenceDate:
   NSDate initWithTimeIntervalSinceReferenceDate_(double ti) {
-    final _ret = _objc_msgSend_1x911p2(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_oa8mke(this.ref.retainAndReturnPointer(),
         _sel_initWithTimeIntervalSinceReferenceDate_, ti);
     return NSDate.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// retain
   NSDate retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSDate self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSDate.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -1513,32 +2301,32 @@ class NSDictionary extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSDictionary].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSDictionary);
   }
 
   /// alloc
   static NSDictionary alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSDictionary, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSDictionary, _sel_alloc);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSDictionary allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSDictionary, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSDictionary, _sel_allocWithZone_, zone);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// dictionary
   static NSDictionary dictionary() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSDictionary, _sel_dictionary);
+    final _ret = _objc_msgSend_151sglz(_class_NSDictionary, _sel_dictionary);
     return NSDictionary.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dictionaryWithDictionary:
   static NSDictionary dictionaryWithDictionary_(NSDictionary dict) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSDictionary, _sel_dictionaryWithDictionary_, dict.ref.pointer);
     return NSDictionary.castFromPointer(_ret, retain: true, release: true);
   }
@@ -1546,7 +2334,7 @@ class NSDictionary extends NSObject {
   /// dictionaryWithObject:forKey:
   static NSDictionary dictionaryWithObject_forKey_(
       objc.ObjCObjectBase object, objc.ObjCObjectBase key) {
-    final _ret = _objc_msgSend_rsfdlh(_class_NSDictionary,
+    final _ret = _objc_msgSend_15qeuct(_class_NSDictionary,
         _sel_dictionaryWithObject_forKey_, object.ref.pointer, key.ref.pointer);
     return NSDictionary.castFromPointer(_ret, retain: true, release: true);
   }
@@ -1554,7 +2342,7 @@ class NSDictionary extends NSObject {
   /// dictionaryWithObjects:forKeys:
   static NSDictionary dictionaryWithObjects_forKeys_(
       NSArray objects, NSArray keys) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSDictionary,
         _sel_dictionaryWithObjects_forKeys_,
         objects.ref.pointer,
@@ -1567,7 +2355,7 @@ class NSDictionary extends NSObject {
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> keys,
       int cnt) {
-    final _ret = _objc_msgSend_cfqbni(_class_NSDictionary,
+    final _ret = _objc_msgSend_1dydpdi(_class_NSDictionary,
         _sel_dictionaryWithObjects_forKeys_count_, objects, keys, cnt);
     return NSDictionary.castFromPointer(_ret, retain: true, release: true);
   }
@@ -1575,14 +2363,14 @@ class NSDictionary extends NSObject {
   /// dictionaryWithObjectsAndKeys:
   static NSDictionary dictionaryWithObjectsAndKeys_(
       objc.ObjCObjectBase firstObject) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSDictionary,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSDictionary,
         _sel_dictionaryWithObjectsAndKeys_, firstObject.ref.pointer);
     return NSDictionary.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSDictionary new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSDictionary, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSDictionary, _sel_new);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -1607,20 +2395,20 @@ class NSDictionary extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSDictionary init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSDictionary? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1629,7 +2417,7 @@ class NSDictionary extends NSObject {
 
   /// initWithDictionary:
   NSDictionary initWithDictionary_(NSDictionary otherDictionary) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithDictionary_, otherDictionary.ref.pointer);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
@@ -1637,14 +2425,14 @@ class NSDictionary extends NSObject {
   /// initWithDictionary:copyItems:
   NSDictionary initWithDictionary_copyItems_(
       NSDictionary otherDictionary, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithDictionary_copyItems_, otherDictionary.ref.pointer, flag);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithObjects:forKeys:
   NSDictionary initWithObjects_forKeys_(NSArray objects, NSArray keys) {
-    final _ret = _objc_msgSend_rsfdlh(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_15qeuct(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_forKeys_, objects.ref.pointer, keys.ref.pointer);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
@@ -1654,27 +2442,27 @@ class NSDictionary extends NSObject {
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> keys,
       int cnt) {
-    final _ret = _objc_msgSend_cfqbni(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1dydpdi(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_forKeys_count_, objects, keys, cnt);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithObjectsAndKeys:
   NSDictionary initWithObjectsAndKeys_(objc.ObjCObjectBase firstObject) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjectsAndKeys_, firstObject.ref.pointer);
     return NSDictionary.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// keyEnumerator
   NSEnumerator keyEnumerator() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_keyEnumerator);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_keyEnumerator);
     return NSEnumerator.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// objectForKey:
   objc.ObjCObjectBase? objectForKey_(objc.ObjCObjectBase aKey) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.pointer, _sel_objectForKey_, aKey.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1714,26 +2502,26 @@ class NSEnumerator extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSEnumerator].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSEnumerator);
   }
 
   /// alloc
   static NSEnumerator alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSEnumerator, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSEnumerator, _sel_alloc);
     return NSEnumerator.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSEnumerator allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSEnumerator, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSEnumerator, _sel_allocWithZone_, zone);
     return NSEnumerator.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSEnumerator new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSEnumerator, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSEnumerator, _sel_new);
     return NSEnumerator.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -1749,13 +2537,13 @@ class NSEnumerator extends NSObject {
   /// init
   NSEnumerator init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSEnumerator.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// nextObject
   objc.ObjCObjectBase? nextObject() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_nextObject);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_nextObject);
     return _ret.address == 0
         ? null
         : objc.ObjCObjectBase(_ret, retain: true, release: true);
@@ -1779,27 +2567,27 @@ class NSError extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSError].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSError);
   }
 
   /// alloc
   static NSError alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSError, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSError, _sel_alloc);
     return NSError.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSError allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSError, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSError, _sel_allocWithZone_, zone);
     return NSError.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// errorWithDomain:code:userInfo:
   static NSError errorWithDomain_code_userInfo_(
       NSString domain, int code, objc.ObjCObjectBase? dict) {
-    final _ret = _objc_msgSend_17xjpl7(
+    final _ret = _objc_msgSend_rc4ypv(
         _class_NSError,
         _sel_errorWithDomain_code_userInfo_,
         domain.ref.pointer,
@@ -1810,7 +2598,7 @@ class NSError extends NSObject {
 
   /// new
   static NSError new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSError, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSError, _sel_new);
     return NSError.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -1826,19 +2614,19 @@ class NSError extends NSObject {
 
   /// domain
   NSString get domain {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_domain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_domain);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// helpAnchor
   NSString? get helpAnchor {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_helpAnchor);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_helpAnchor);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -1847,13 +2635,13 @@ class NSError extends NSObject {
   /// init
   NSError init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSError.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSError? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -1863,7 +2651,7 @@ class NSError extends NSObject {
   /// initWithDomain:code:userInfo:
   NSError initWithDomain_code_userInfo_(
       NSString domain, int code, objc.ObjCObjectBase? dict) {
-    final _ret = _objc_msgSend_17xjpl7(
+    final _ret = _objc_msgSend_rc4ypv(
         this.ref.retainAndReturnPointer(),
         _sel_initWithDomain_code_userInfo_,
         domain.ref.pointer,
@@ -1875,14 +2663,14 @@ class NSError extends NSObject {
   /// localizedDescription
   NSString get localizedDescription {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_localizedDescription);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_localizedDescription);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// localizedFailureReason
   NSString? get localizedFailureReason {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_localizedFailureReason);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_localizedFailureReason);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -1891,7 +2679,7 @@ class NSError extends NSObject {
   /// localizedRecoveryOptions
   NSArray? get localizedRecoveryOptions {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_localizedRecoveryOptions);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_localizedRecoveryOptions);
     return _ret.address == 0
         ? null
         : NSArray.castFromPointer(_ret, retain: true, release: true);
@@ -1899,7 +2687,7 @@ class NSError extends NSObject {
 
   /// localizedRecoverySuggestion
   NSString? get localizedRecoverySuggestion {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.pointer, _sel_localizedRecoverySuggestion);
     return _ret.address == 0
         ? null
@@ -1909,7 +2697,7 @@ class NSError extends NSObject {
   /// recoveryAttempter
   objc.ObjCObjectBase? get recoveryAttempter {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_recoveryAttempter);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_recoveryAttempter);
     return _ret.address == 0
         ? null
         : objc.ObjCObjectBase(_ret, retain: true, release: true);
@@ -1917,13 +2705,13 @@ class NSError extends NSObject {
 
   /// underlyingErrors
   NSArray get underlyingErrors {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_underlyingErrors);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_underlyingErrors);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// userInfo
   objc.ObjCObjectBase get userInfo {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_userInfo);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_userInfo);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 }
@@ -1938,8 +2726,7 @@ extension NSExtendedMutableData on NSMutableData {
 
   /// appendData:
   void appendData_(NSData other) {
-    _objc_msgSend_1jdvcbf(
-        this.ref.pointer, _sel_appendData_, other.ref.pointer);
+    _objc_msgSend_xtuoz7(this.ref.pointer, _sel_appendData_, other.ref.pointer);
   }
 
   /// increaseLengthBy:
@@ -1973,7 +2760,7 @@ extension NSExtendedMutableData on NSMutableData {
 
   /// setData:
   void setData_(NSData data) {
-    _objc_msgSend_1jdvcbf(this.ref.pointer, _sel_setData_, data.ref.pointer);
+    _objc_msgSend_xtuoz7(this.ref.pointer, _sel_setData_, data.ref.pointer);
   }
 }
 
@@ -2006,46 +2793,46 @@ class NSIndexSet extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSIndexSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSIndexSet);
   }
 
   /// alloc
   static NSIndexSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSIndexSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSIndexSet, _sel_alloc);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSIndexSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSIndexSet, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSIndexSet, _sel_allocWithZone_, zone);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// indexSet
   static NSIndexSet indexSet() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSIndexSet, _sel_indexSet);
+    final _ret = _objc_msgSend_151sglz(_class_NSIndexSet, _sel_indexSet);
     return NSIndexSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// indexSetWithIndex:
   static NSIndexSet indexSetWithIndex_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSIndexSet, _sel_indexSetWithIndex_, value);
     return NSIndexSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// indexSetWithIndexesInRange:
   static NSIndexSet indexSetWithIndexesInRange_(NSRange range) {
-    final _ret = _objc_msgSend_83z673(
+    final _ret = _objc_msgSend_1k1o1s7(
         _class_NSIndexSet, _sel_indexSetWithIndexesInRange_, range);
     return NSIndexSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSIndexSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSIndexSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSIndexSet, _sel_new);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -2061,7 +2848,7 @@ class NSIndexSet extends NSObject {
 
   /// containsIndexes:
   bool containsIndexes_(NSIndexSet indexSet) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_containsIndexes_, indexSet.ref.pointer);
   }
 
@@ -2084,7 +2871,7 @@ class NSIndexSet extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
@@ -2129,13 +2916,13 @@ class NSIndexSet extends NSObject {
   /// init
   NSIndexSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSIndexSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2144,21 +2931,21 @@ class NSIndexSet extends NSObject {
 
   /// initWithIndex:
   NSIndexSet initWithIndex_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithIndex_, value);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithIndexSet:
   NSIndexSet initWithIndexSet_(NSIndexSet indexSet) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithIndexSet_, indexSet.ref.pointer);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithIndexesInRange:
   NSIndexSet initWithIndexesInRange_(NSRange range) {
-    final _ret = _objc_msgSend_83z673(
+    final _ret = _objc_msgSend_1k1o1s7(
         this.ref.retainAndReturnPointer(), _sel_initWithIndexesInRange_, range);
     return NSIndexSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -2171,7 +2958,7 @@ class NSIndexSet extends NSObject {
 
   /// isEqualToIndexSet:
   bool isEqualToIndexSet_(NSIndexSet indexSet) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isEqualToIndexSet_, indexSet.ref.pointer);
   }
 
@@ -2198,13 +2985,13 @@ class NSInputStream extends NSStream {
 
   /// Returns whether [obj] is an instance of [NSInputStream].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSInputStream);
   }
 
   /// inputStreamWithData:
   static NSInputStream? inputStreamWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSInputStream, _sel_inputStreamWithData_, data.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2213,7 +3000,7 @@ class NSInputStream extends NSStream {
 
   /// inputStreamWithFileAtPath:
   static NSInputStream? inputStreamWithFileAtPath_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSInputStream,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSInputStream,
         _sel_inputStreamWithFileAtPath_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2222,7 +3009,7 @@ class NSInputStream extends NSStream {
 
   /// inputStreamWithURL:
   static NSInputStream? inputStreamWithURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSInputStream, _sel_inputStreamWithURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2243,14 +3030,14 @@ class NSInputStream extends NSStream {
 
   /// initWithData:
   NSInputStream initWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithData_, data.ref.pointer);
     return NSInputStream.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithFileAtPath:
   NSInputStream? initWithFileAtPath_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithFileAtPath_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2259,7 +3046,7 @@ class NSInputStream extends NSStream {
 
   /// initWithURL:
   NSInputStream? initWithURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.retainAndReturnPointer(), _sel_initWithURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2290,7 +3077,7 @@ class NSInvocation extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [NSInvocation].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSInvocation);
   }
 }
@@ -2312,51 +3099,51 @@ class NSItemProvider extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSItemProvider].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSItemProvider);
   }
 
   /// alloc
   static NSItemProvider alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSItemProvider, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSItemProvider, _sel_alloc);
     return NSItemProvider.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSItemProvider allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSItemProvider, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSItemProvider, _sel_allocWithZone_, zone);
     return NSItemProvider.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSItemProvider new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSItemProvider, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSItemProvider, _sel_new);
     return NSItemProvider.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// autorelease
   NSItemProvider autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSItemProvider.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// canLoadObjectOfClass:
   bool canLoadObjectOfClass_(objc.ObjCObjectBase aClass) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_canLoadObjectOfClass_, aClass.ref.pointer);
   }
 
   /// hasItemConformingToTypeIdentifier:
   bool hasItemConformingToTypeIdentifier_(NSString typeIdentifier) {
-    return _objc_msgSend_69e0x1(this.ref.pointer,
+    return _objc_msgSend_19nvye5(this.ref.pointer,
         _sel_hasItemConformingToTypeIdentifier_, typeIdentifier.ref.pointer);
   }
 
   /// hasRepresentationConformingToTypeIdentifier:fileOptions:
   bool hasRepresentationConformingToTypeIdentifier_fileOptions_(
       NSString typeIdentifier, NSItemProviderFileOptions fileOptions) {
-    return _objc_msgSend_5ty9km(
+    return _objc_msgSend_1wdb8ji(
         this.ref.pointer,
         _sel_hasRepresentationConformingToTypeIdentifier_fileOptions_,
         typeIdentifier.ref.pointer,
@@ -2366,13 +3153,13 @@ class NSItemProvider extends NSObject {
   /// init
   NSItemProvider init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSItemProvider.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithContentsOfURL:
   NSItemProvider? initWithContentsOfURL_(NSURL fileURL) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_, fileURL.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2382,7 +3169,7 @@ class NSItemProvider extends NSObject {
   /// initWithItem:typeIdentifier:
   NSItemProvider initWithItem_typeIdentifier_(
       objc.ObjCObjectBase? item, NSString? typeIdentifier) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initWithItem_typeIdentifier_,
         item?.ref.pointer ?? ffi.nullptr,
@@ -2392,7 +3179,7 @@ class NSItemProvider extends NSObject {
 
   /// initWithObject:
   NSItemProvider initWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObject_, object.ref.pointer);
     return NSItemProvider.castFromPointer(_ret, retain: false, release: true);
   }
@@ -2403,7 +3190,7 @@ class NSItemProvider extends NSObject {
       NSDictionary? options,
       objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>?
           completionHandler) {
-    _objc_msgSend_91c9gi(
+    _objc_msgSend_18qun1e(
         this.ref.pointer,
         _sel_loadItemForTypeIdentifier_options_completionHandler_,
         typeIdentifier.ref.pointer,
@@ -2414,46 +3201,46 @@ class NSItemProvider extends NSObject {
   /// registerObject:visibility:
   void registerObject_visibility_(objc.ObjCObjectBase object,
       NSItemProviderRepresentationVisibility visibility) {
-    _objc_msgSend_pww1yj(this.ref.pointer, _sel_registerObject_visibility_,
+    _objc_msgSend_1k745tv(this.ref.pointer, _sel_registerObject_visibility_,
         object.ref.pointer, visibility.value);
   }
 
   /// registeredTypeIdentifiers
   NSArray get registeredTypeIdentifiers {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_registeredTypeIdentifiers);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_registeredTypeIdentifiers);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// registeredTypeIdentifiersWithFileOptions:
   NSArray registeredTypeIdentifiersWithFileOptions_(
       NSItemProviderFileOptions fileOptions) {
-    final _ret = _objc_msgSend_1ih2cte(this.ref.pointer,
+    final _ret = _objc_msgSend_7g3u2y(this.ref.pointer,
         _sel_registeredTypeIdentifiersWithFileOptions_, fileOptions.value);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// retain
   NSItemProvider retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSItemProvider.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSItemProvider self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSItemProvider.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setSuggestedName:
   set suggestedName(NSString? value) {
-    _objc_msgSend_1jdvcbf(this.ref.pointer, _sel_setSuggestedName_,
+    _objc_msgSend_xtuoz7(this.ref.pointer, _sel_setSuggestedName_,
         value?.ref.pointer ?? ffi.nullptr);
   }
 
   /// suggestedName
   NSString? get suggestedName {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_suggestedName);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_suggestedName);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -2566,7 +3353,7 @@ class NSLocale extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [NSLocale].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSLocale);
   }
 }
@@ -2588,20 +3375,20 @@ class NSMethodSignature extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSMethodSignature].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMethodSignature);
   }
 
   /// alloc
   static NSMethodSignature alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMethodSignature, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMethodSignature, _sel_alloc);
     return NSMethodSignature.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMethodSignature allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(
+    final _ret = _objc_msgSend_1cwp428(
         _class_NSMethodSignature, _sel_allocWithZone_, zone);
     return NSMethodSignature.castFromPointer(_ret,
         retain: false, release: true);
@@ -2609,7 +3396,7 @@ class NSMethodSignature extends NSObject {
 
   /// new
   static NSMethodSignature new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMethodSignature, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMethodSignature, _sel_new);
     return NSMethodSignature.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -2617,7 +3404,7 @@ class NSMethodSignature extends NSObject {
   /// signatureWithObjCTypes:
   static NSMethodSignature? signatureWithObjCTypes_(
       ffi.Pointer<ffi.Char> types) {
-    final _ret = _objc_msgSend_rqwdif(
+    final _ret = _objc_msgSend_56zxyn(
         _class_NSMethodSignature, _sel_signatureWithObjCTypes_, types);
     return _ret.address == 0
         ? null
@@ -2638,7 +3425,7 @@ class NSMethodSignature extends NSObject {
   /// init
   NSMethodSignature init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMethodSignature.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -2681,53 +3468,53 @@ class NSMutableArray extends NSArray {
 
   /// Returns whether [obj] is an instance of [NSMutableArray].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableArray);
   }
 
   /// alloc
   static NSMutableArray alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableArray, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableArray, _sel_alloc);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableArray allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSMutableArray, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSMutableArray, _sel_allocWithZone_, zone);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// array
   static NSMutableArray array() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableArray, _sel_array);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableArray, _sel_array);
     return NSMutableArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithArray:
   static NSMutableArray arrayWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableArray, _sel_arrayWithArray_, array.ref.pointer);
     return NSMutableArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithCapacity:
   static NSMutableArray arrayWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableArray, _sel_arrayWithCapacity_, numItems);
     return NSMutableArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithObject:
   static NSMutableArray arrayWithObject_(objc.ObjCObjectBase anObject) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableArray, _sel_arrayWithObject_, anObject.ref.pointer);
     return NSMutableArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// arrayWithObjects:
   static NSMutableArray arrayWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableArray, _sel_arrayWithObjects_, firstObj.ref.pointer);
     return NSMutableArray.castFromPointer(_ret, retain: true, release: true);
   }
@@ -2735,14 +3522,14 @@ class NSMutableArray extends NSArray {
   /// arrayWithObjects:count:
   static NSMutableArray arrayWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(
+    final _ret = _objc_msgSend_zmbtbd(
         _class_NSMutableArray, _sel_arrayWithObjects_count_, objects, cnt);
     return NSMutableArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSMutableArray new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableArray, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableArray, _sel_new);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -2754,41 +3541,41 @@ class NSMutableArray extends NSArray {
 
   /// addObject:
   void addObject_(objc.ObjCObjectBase anObject) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_addObject_, anObject.ref.pointer);
   }
 
   /// init
   NSMutableArray init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:
   NSMutableArray initWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_, array.ref.pointer);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:copyItems:
   NSMutableArray initWithArray_copyItems_(NSArray array, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_copyItems_, array.ref.pointer, flag);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCapacity:
   NSMutableArray initWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithCapacity_, numItems);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSMutableArray? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2797,7 +3584,7 @@ class NSMutableArray extends NSArray {
 
   /// initWithObjects:
   NSMutableArray initWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_, firstObj.ref.pointer);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
@@ -2805,14 +3592,14 @@ class NSMutableArray extends NSArray {
   /// initWithObjects:count:
   NSMutableArray initWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_zmbtbd(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_count_, objects, cnt);
     return NSMutableArray.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// insertObject:atIndex:
   void insertObject_atIndex_(objc.ObjCObjectBase anObject, int index) {
-    _objc_msgSend_10i1axw(this.ref.pointer, _sel_insertObject_atIndex_,
+    _objc_msgSend_djsa9o(this.ref.pointer, _sel_insertObject_atIndex_,
         anObject.ref.pointer, index);
   }
 
@@ -2829,7 +3616,7 @@ class NSMutableArray extends NSArray {
   /// replaceObjectAtIndex:withObject:
   void replaceObjectAtIndex_withObject_(
       int index, objc.ObjCObjectBase anObject) {
-    _objc_msgSend_1c7f48q(this.ref.pointer,
+    _objc_msgSend_1gypgok(this.ref.pointer,
         _sel_replaceObjectAtIndex_withObject_, index, anObject.ref.pointer);
   }
 }
@@ -2851,33 +3638,33 @@ class NSMutableData extends NSData {
 
   /// Returns whether [obj] is an instance of [NSMutableData].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableData);
   }
 
   /// alloc
   static NSMutableData alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableData, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableData, _sel_alloc);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableData allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSMutableData, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSMutableData, _sel_allocWithZone_, zone);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// data
   static NSMutableData data() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableData, _sel_data);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableData, _sel_data);
     return NSMutableData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dataWithBytes:length:
   static NSMutableData dataWithBytes_length_(
       ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(
+    final _ret = _objc_msgSend_3nbx5e(
         _class_NSMutableData, _sel_dataWithBytes_length_, bytes, length);
     return NSMutableData.castFromPointer(_ret, retain: true, release: true);
   }
@@ -2885,7 +3672,7 @@ class NSMutableData extends NSData {
   /// dataWithBytesNoCopy:length:
   static NSMutableData dataWithBytesNoCopy_length_(
       ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(
+    final _ret = _objc_msgSend_3nbx5e(
         _class_NSMutableData, _sel_dataWithBytesNoCopy_length_, bytes, length);
     return NSMutableData.castFromPointer(_ret, retain: true, release: true);
   }
@@ -2893,14 +3680,14 @@ class NSMutableData extends NSData {
   /// dataWithBytesNoCopy:length:freeWhenDone:
   static NSMutableData dataWithBytesNoCopy_length_freeWhenDone_(
       ffi.Pointer<ffi.Void> bytes, int length, bool b) {
-    final _ret = _objc_msgSend_1je1k7e(_class_NSMutableData,
+    final _ret = _objc_msgSend_161ne8y(_class_NSMutableData,
         _sel_dataWithBytesNoCopy_length_freeWhenDone_, bytes, length, b);
     return NSMutableData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dataWithCapacity:
   static NSMutableData? dataWithCapacity_(int aNumItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableData, _sel_dataWithCapacity_, aNumItems);
     return _ret.address == 0
         ? null
@@ -2909,7 +3696,7 @@ class NSMutableData extends NSData {
 
   /// dataWithContentsOfFile:
   static NSMutableData? dataWithContentsOfFile_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableData, _sel_dataWithContentsOfFile_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2921,7 +3708,7 @@ class NSMutableData extends NSData {
       NSString path,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         _class_NSMutableData,
         _sel_dataWithContentsOfFile_options_error_,
         path.ref.pointer,
@@ -2934,7 +3721,7 @@ class NSMutableData extends NSData {
 
   /// dataWithContentsOfURL:
   static NSMutableData? dataWithContentsOfURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableData, _sel_dataWithContentsOfURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -2946,7 +3733,7 @@ class NSMutableData extends NSData {
       NSURL url,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         _class_NSMutableData,
         _sel_dataWithContentsOfURL_options_error_,
         url.ref.pointer,
@@ -2959,14 +3746,14 @@ class NSMutableData extends NSData {
 
   /// dataWithData:
   static NSMutableData dataWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableData, _sel_dataWithData_, data.ref.pointer);
     return NSMutableData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// dataWithLength:
   static NSMutableData? dataWithLength_(int length) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableData, _sel_dataWithLength_, length);
     return _ret.address == 0
         ? null
@@ -2975,7 +3762,7 @@ class NSMutableData extends NSData {
 
   /// new
   static NSMutableData new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableData, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableData, _sel_new);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -2989,7 +3776,7 @@ class NSMutableData extends NSData {
   NSMutableData? compressedDataUsingAlgorithm_error_(
       NSDataCompressionAlgorithm algorithm,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1okds6o(this.ref.pointer,
+    final _ret = _objc_msgSend_1vnlaqg(this.ref.pointer,
         _sel_compressedDataUsingAlgorithm_error_, algorithm.value, error);
     return _ret.address == 0
         ? null
@@ -3000,7 +3787,7 @@ class NSMutableData extends NSData {
   NSMutableData? decompressedDataUsingAlgorithm_error_(
       NSDataCompressionAlgorithm algorithm,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1okds6o(this.ref.pointer,
+    final _ret = _objc_msgSend_1vnlaqg(this.ref.pointer,
         _sel_decompressedDataUsingAlgorithm_error_, algorithm.value, error);
     return _ret.address == 0
         ? null
@@ -3010,14 +3797,14 @@ class NSMutableData extends NSData {
   /// init
   NSMutableData init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBase64EncodedData:options:
   NSMutableData? initWithBase64EncodedData_options_(
       NSData base64Data, NSDataBase64DecodingOptions options) {
-    final _ret = _objc_msgSend_dnlotu(
+    final _ret = _objc_msgSend_7kpg7m(
         this.ref.retainAndReturnPointer(),
         _sel_initWithBase64EncodedData_options_,
         base64Data.ref.pointer,
@@ -3030,7 +3817,7 @@ class NSMutableData extends NSData {
   /// initWithBase64EncodedString:options:
   NSMutableData? initWithBase64EncodedString_options_(
       NSString base64String, NSDataBase64DecodingOptions options) {
-    final _ret = _objc_msgSend_dnlotu(
+    final _ret = _objc_msgSend_7kpg7m(
         this.ref.retainAndReturnPointer(),
         _sel_initWithBase64EncodedString_options_,
         base64String.ref.pointer,
@@ -3042,7 +3829,7 @@ class NSMutableData extends NSData {
 
   /// initWithBytes:length:
   NSMutableData initWithBytes_length_(ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_3nbx5e(this.ref.retainAndReturnPointer(),
         _sel_initWithBytes_length_, bytes, length);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
@@ -3050,7 +3837,7 @@ class NSMutableData extends NSData {
   /// initWithBytesNoCopy:length:
   NSMutableData initWithBytesNoCopy_length_(
       ffi.Pointer<ffi.Void> bytes, int length) {
-    final _ret = _objc_msgSend_19qmeje(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_3nbx5e(this.ref.retainAndReturnPointer(),
         _sel_initWithBytesNoCopy_length_, bytes, length);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
@@ -3058,14 +3845,14 @@ class NSMutableData extends NSData {
   /// initWithBytesNoCopy:length:freeWhenDone:
   NSMutableData initWithBytesNoCopy_length_freeWhenDone_(
       ffi.Pointer<ffi.Void> bytes, int length, bool b) {
-    final _ret = _objc_msgSend_1je1k7e(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_161ne8y(this.ref.retainAndReturnPointer(),
         _sel_initWithBytesNoCopy_length_freeWhenDone_, bytes, length, b);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCapacity:
   NSMutableData? initWithCapacity_(int capacity) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithCapacity_, capacity);
     return _ret.address == 0
         ? null
@@ -3074,7 +3861,7 @@ class NSMutableData extends NSData {
 
   /// initWithCoder:
   NSMutableData? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3083,7 +3870,7 @@ class NSMutableData extends NSData {
 
   /// initWithContentsOfFile:
   NSMutableData? initWithContentsOfFile_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_, path.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3095,7 +3882,7 @@ class NSMutableData extends NSData {
       NSString path,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_options_error_,
         path.ref.pointer,
@@ -3108,7 +3895,7 @@ class NSMutableData extends NSData {
 
   /// initWithContentsOfURL:
   NSMutableData? initWithContentsOfURL_(NSURL url) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_, url.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3120,7 +3907,7 @@ class NSMutableData extends NSData {
       NSURL url,
       NSDataReadingOptions readOptionsMask,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> errorPtr) {
-    final _ret = _objc_msgSend_p8i56h(
+    final _ret = _objc_msgSend_8321cp(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_options_error_,
         url.ref.pointer,
@@ -3133,14 +3920,14 @@ class NSMutableData extends NSData {
 
   /// initWithData:
   NSMutableData initWithData_(NSData data) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithData_, data.ref.pointer);
     return NSMutableData.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithLength:
   NSMutableData? initWithLength_(int length) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithLength_, length);
     return _ret.address == 0
         ? null
@@ -3180,20 +3967,20 @@ class NSMutableDictionary extends NSDictionary {
 
   /// Returns whether [obj] is an instance of [NSMutableDictionary].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableDictionary);
   }
 
   /// alloc
   static NSMutableDictionary alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableDictionary, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableDictionary, _sel_alloc);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableDictionary allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(
+    final _ret = _objc_msgSend_1cwp428(
         _class_NSMutableDictionary, _sel_allocWithZone_, zone);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3202,14 +3989,14 @@ class NSMutableDictionary extends NSDictionary {
   /// dictionary
   static NSMutableDictionary dictionary() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSMutableDictionary, _sel_dictionary);
+        _objc_msgSend_151sglz(_class_NSMutableDictionary, _sel_dictionary);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: true, release: true);
   }
 
   /// dictionaryWithCapacity:
   static NSMutableDictionary dictionaryWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableDictionary, _sel_dictionaryWithCapacity_, numItems);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: true, release: true);
@@ -3217,7 +4004,7 @@ class NSMutableDictionary extends NSDictionary {
 
   /// dictionaryWithDictionary:
   static NSMutableDictionary dictionaryWithDictionary_(NSDictionary dict) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableDictionary,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableDictionary,
         _sel_dictionaryWithDictionary_, dict.ref.pointer);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: true, release: true);
@@ -3226,7 +4013,7 @@ class NSMutableDictionary extends NSDictionary {
   /// dictionaryWithObject:forKey:
   static NSMutableDictionary dictionaryWithObject_forKey_(
       objc.ObjCObjectBase object, objc.ObjCObjectBase key) {
-    final _ret = _objc_msgSend_rsfdlh(_class_NSMutableDictionary,
+    final _ret = _objc_msgSend_15qeuct(_class_NSMutableDictionary,
         _sel_dictionaryWithObject_forKey_, object.ref.pointer, key.ref.pointer);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: true, release: true);
@@ -3235,7 +4022,7 @@ class NSMutableDictionary extends NSDictionary {
   /// dictionaryWithObjects:forKeys:
   static NSMutableDictionary dictionaryWithObjects_forKeys_(
       NSArray objects, NSArray keys) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSMutableDictionary,
         _sel_dictionaryWithObjects_forKeys_,
         objects.ref.pointer,
@@ -3249,7 +4036,7 @@ class NSMutableDictionary extends NSDictionary {
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> keys,
       int cnt) {
-    final _ret = _objc_msgSend_cfqbni(_class_NSMutableDictionary,
+    final _ret = _objc_msgSend_1dydpdi(_class_NSMutableDictionary,
         _sel_dictionaryWithObjects_forKeys_count_, objects, keys, cnt);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: true, release: true);
@@ -3258,7 +4045,7 @@ class NSMutableDictionary extends NSDictionary {
   /// dictionaryWithObjectsAndKeys:
   static NSMutableDictionary dictionaryWithObjectsAndKeys_(
       objc.ObjCObjectBase firstObject) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableDictionary,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableDictionary,
         _sel_dictionaryWithObjectsAndKeys_, firstObject.ref.pointer);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: true, release: true);
@@ -3266,7 +4053,7 @@ class NSMutableDictionary extends NSDictionary {
 
   /// new
   static NSMutableDictionary new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableDictionary, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableDictionary, _sel_new);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -3280,14 +4067,14 @@ class NSMutableDictionary extends NSDictionary {
   /// init
   NSMutableDictionary init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// initWithCapacity:
   NSMutableDictionary initWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithCapacity_, numItems);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3295,7 +4082,7 @@ class NSMutableDictionary extends NSDictionary {
 
   /// initWithCoder:
   NSMutableDictionary? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3305,7 +4092,7 @@ class NSMutableDictionary extends NSDictionary {
 
   /// initWithDictionary:
   NSMutableDictionary initWithDictionary_(NSDictionary otherDictionary) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithDictionary_, otherDictionary.ref.pointer);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3314,7 +4101,7 @@ class NSMutableDictionary extends NSDictionary {
   /// initWithDictionary:copyItems:
   NSMutableDictionary initWithDictionary_copyItems_(
       NSDictionary otherDictionary, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithDictionary_copyItems_, otherDictionary.ref.pointer, flag);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3322,7 +4109,7 @@ class NSMutableDictionary extends NSDictionary {
 
   /// initWithObjects:forKeys:
   NSMutableDictionary initWithObjects_forKeys_(NSArray objects, NSArray keys) {
-    final _ret = _objc_msgSend_rsfdlh(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_15qeuct(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_forKeys_, objects.ref.pointer, keys.ref.pointer);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3333,7 +4120,7 @@ class NSMutableDictionary extends NSDictionary {
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> keys,
       int cnt) {
-    final _ret = _objc_msgSend_cfqbni(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1dydpdi(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_forKeys_count_, objects, keys, cnt);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3341,7 +4128,7 @@ class NSMutableDictionary extends NSDictionary {
 
   /// initWithObjectsAndKeys:
   NSMutableDictionary initWithObjectsAndKeys_(objc.ObjCObjectBase firstObject) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjectsAndKeys_, firstObject.ref.pointer);
     return NSMutableDictionary.castFromPointer(_ret,
         retain: false, release: true);
@@ -3349,14 +4136,14 @@ class NSMutableDictionary extends NSDictionary {
 
   /// removeObjectForKey:
   void removeObjectForKey_(objc.ObjCObjectBase aKey) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_removeObjectForKey_, aKey.ref.pointer);
   }
 
   /// setObject:forKey:
   void setObject_forKey_(
       objc.ObjCObjectBase anObject, objc.ObjCObjectBase aKey) {
-    _objc_msgSend_wjvic9(this.ref.pointer, _sel_setObject_forKey_,
+    _objc_msgSend_pfv6jd(this.ref.pointer, _sel_setObject_forKey_,
         anObject.ref.pointer, aKey.ref.pointer);
   }
 }
@@ -3378,20 +4165,20 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// Returns whether [obj] is an instance of [NSMutableIndexSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableIndexSet);
   }
 
   /// alloc
   static NSMutableIndexSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableIndexSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableIndexSet, _sel_alloc);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableIndexSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(
+    final _ret = _objc_msgSend_1cwp428(
         _class_NSMutableIndexSet, _sel_allocWithZone_, zone);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3399,27 +4186,27 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// indexSet
   static NSMutableIndexSet indexSet() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableIndexSet, _sel_indexSet);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableIndexSet, _sel_indexSet);
     return NSMutableIndexSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// indexSetWithIndex:
   static NSMutableIndexSet indexSetWithIndex_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableIndexSet, _sel_indexSetWithIndex_, value);
     return NSMutableIndexSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// indexSetWithIndexesInRange:
   static NSMutableIndexSet indexSetWithIndexesInRange_(NSRange range) {
-    final _ret = _objc_msgSend_83z673(
+    final _ret = _objc_msgSend_1k1o1s7(
         _class_NSMutableIndexSet, _sel_indexSetWithIndexesInRange_, range);
     return NSMutableIndexSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// new
   static NSMutableIndexSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableIndexSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableIndexSet, _sel_new);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -3437,7 +4224,7 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// addIndexes:
   void addIndexes_(NSIndexSet indexSet) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_addIndexes_, indexSet.ref.pointer);
   }
 
@@ -3449,14 +4236,14 @@ class NSMutableIndexSet extends NSIndexSet {
   /// init
   NSMutableIndexSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// initWithCoder:
   NSMutableIndexSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3465,7 +4252,7 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// initWithIndex:
   NSMutableIndexSet initWithIndex_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithIndex_, value);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3473,7 +4260,7 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// initWithIndexSet:
   NSMutableIndexSet initWithIndexSet_(NSIndexSet indexSet) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithIndexSet_, indexSet.ref.pointer);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3481,7 +4268,7 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// initWithIndexesInRange:
   NSMutableIndexSet initWithIndexesInRange_(NSRange range) {
-    final _ret = _objc_msgSend_83z673(
+    final _ret = _objc_msgSend_1k1o1s7(
         this.ref.retainAndReturnPointer(), _sel_initWithIndexesInRange_, range);
     return NSMutableIndexSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3499,7 +4286,7 @@ class NSMutableIndexSet extends NSIndexSet {
 
   /// removeIndexes:
   void removeIndexes_(NSIndexSet indexSet) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_removeIndexes_, indexSet.ref.pointer);
   }
 
@@ -3532,20 +4319,20 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// Returns whether [obj] is an instance of [NSMutableOrderedSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableOrderedSet);
   }
 
   /// alloc
   static NSMutableOrderedSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableOrderedSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableOrderedSet, _sel_alloc);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableOrderedSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(
+    final _ret = _objc_msgSend_1cwp428(
         _class_NSMutableOrderedSet, _sel_allocWithZone_, zone);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3553,7 +4340,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// new
   static NSMutableOrderedSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableOrderedSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableOrderedSet, _sel_new);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -3561,14 +4348,14 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// orderedSet
   static NSMutableOrderedSet orderedSet() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSMutableOrderedSet, _sel_orderedSet);
+        _objc_msgSend_151sglz(_class_NSMutableOrderedSet, _sel_orderedSet);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
   }
 
   /// orderedSetWithArray:
   static NSMutableOrderedSet orderedSetWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableOrderedSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableOrderedSet,
         _sel_orderedSetWithArray_, array.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3577,7 +4364,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// orderedSetWithArray:range:copyItems:
   static NSMutableOrderedSet orderedSetWithArray_range_copyItems_(
       NSArray array, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(
+    final _ret = _objc_msgSend_w9bq5x(
         _class_NSMutableOrderedSet,
         _sel_orderedSetWithArray_range_copyItems_,
         array.ref.pointer,
@@ -3589,7 +4376,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// orderedSetWithCapacity:
   static NSMutableOrderedSet orderedSetWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableOrderedSet, _sel_orderedSetWithCapacity_, numItems);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3597,7 +4384,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// orderedSetWithObject:
   static NSMutableOrderedSet orderedSetWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableOrderedSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableOrderedSet,
         _sel_orderedSetWithObject_, object.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3606,7 +4393,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// orderedSetWithObjects:
   static NSMutableOrderedSet orderedSetWithObjects_(
       objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableOrderedSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableOrderedSet,
         _sel_orderedSetWithObjects_, firstObj.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3615,7 +4402,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// orderedSetWithObjects:count:
   static NSMutableOrderedSet orderedSetWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(_class_NSMutableOrderedSet,
+    final _ret = _objc_msgSend_zmbtbd(_class_NSMutableOrderedSet,
         _sel_orderedSetWithObjects_count_, objects, cnt);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3623,7 +4410,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// orderedSetWithOrderedSet:
   static NSMutableOrderedSet orderedSetWithOrderedSet_(NSOrderedSet set) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableOrderedSet,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableOrderedSet,
         _sel_orderedSetWithOrderedSet_, set.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3632,7 +4419,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// orderedSetWithOrderedSet:range:copyItems:
   static NSMutableOrderedSet orderedSetWithOrderedSet_range_copyItems_(
       NSOrderedSet set, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(
+    final _ret = _objc_msgSend_w9bq5x(
         _class_NSMutableOrderedSet,
         _sel_orderedSetWithOrderedSet_range_copyItems_,
         set.ref.pointer,
@@ -3644,7 +4431,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// orderedSetWithSet:
   static NSMutableOrderedSet orderedSetWithSet_(objc.ObjCObjectBase set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableOrderedSet, _sel_orderedSetWithSet_, set.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3653,7 +4440,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// orderedSetWithSet:copyItems:
   static NSMutableOrderedSet orderedSetWithSet_copyItems_(
       objc.ObjCObjectBase set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(_class_NSMutableOrderedSet,
+    final _ret = _objc_msgSend_17amj0z(_class_NSMutableOrderedSet,
         _sel_orderedSetWithSet_copyItems_, set.ref.pointer, flag);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
@@ -3667,7 +4454,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// autorelease
   NSMutableOrderedSet autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
   }
@@ -3675,14 +4462,14 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// init
   NSMutableOrderedSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// initWithArray:
   NSMutableOrderedSet initWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_, array.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3690,7 +4477,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithArray:copyItems:
   NSMutableOrderedSet initWithArray_copyItems_(NSArray set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_copyItems_, set.ref.pointer, flag);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3699,7 +4486,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// initWithArray:range:copyItems:
   NSMutableOrderedSet initWithArray_range_copyItems_(
       NSArray set, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_w9bq5x(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_range_copyItems_, set.ref.pointer, range, flag);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3707,7 +4494,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithCapacity:
   NSMutableOrderedSet initWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithCapacity_, numItems);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3715,7 +4502,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithCoder:
   NSMutableOrderedSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3725,7 +4512,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithObject:
   NSMutableOrderedSet initWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObject_, object.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3733,7 +4520,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithObjects:
   NSMutableOrderedSet initWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_, firstObj.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3742,7 +4529,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// initWithObjects:count:
   NSMutableOrderedSet initWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_zmbtbd(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_count_, objects, cnt);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3750,7 +4537,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithOrderedSet:
   NSMutableOrderedSet initWithOrderedSet_(NSOrderedSet set) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithOrderedSet_, set.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3759,7 +4546,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// initWithOrderedSet:copyItems:
   NSMutableOrderedSet initWithOrderedSet_copyItems_(
       NSOrderedSet set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithOrderedSet_copyItems_, set.ref.pointer, flag);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3768,7 +4555,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// initWithOrderedSet:range:copyItems:
   NSMutableOrderedSet initWithOrderedSet_range_copyItems_(
       NSOrderedSet set, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_w9bq5x(this.ref.retainAndReturnPointer(),
         _sel_initWithOrderedSet_range_copyItems_, set.ref.pointer, range, flag);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3776,7 +4563,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// initWithSet:
   NSMutableOrderedSet initWithSet_(objc.ObjCObjectBase set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.retainAndReturnPointer(), _sel_initWithSet_, set.ref.pointer);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3785,7 +4572,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
   /// initWithSet:copyItems:
   NSMutableOrderedSet initWithSet_copyItems_(
       objc.ObjCObjectBase set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithSet_copyItems_, set.ref.pointer, flag);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: false, release: true);
@@ -3793,7 +4580,7 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// insertObject:atIndex:
   void insertObject_atIndex_(objc.ObjCObjectBase object, int idx) {
-    _objc_msgSend_10i1axw(
+    _objc_msgSend_djsa9o(
         this.ref.pointer, _sel_insertObject_atIndex_, object.ref.pointer, idx);
   }
 
@@ -3804,20 +4591,20 @@ class NSMutableOrderedSet extends NSOrderedSet {
 
   /// replaceObjectAtIndex:withObject:
   void replaceObjectAtIndex_withObject_(int idx, objc.ObjCObjectBase object) {
-    _objc_msgSend_1c7f48q(this.ref.pointer,
+    _objc_msgSend_1gypgok(this.ref.pointer,
         _sel_replaceObjectAtIndex_withObject_, idx, object.ref.pointer);
   }
 
   /// retain
   NSMutableOrderedSet retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
   }
 
   /// self
   NSMutableOrderedSet self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSMutableOrderedSet.castFromPointer(_ret,
         retain: true, release: true);
   }
@@ -3840,59 +4627,59 @@ class NSMutableSet extends NSSet {
 
   /// Returns whether [obj] is an instance of [NSMutableSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableSet);
   }
 
   /// alloc
   static NSMutableSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableSet, _sel_alloc);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSMutableSet, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSMutableSet, _sel_allocWithZone_, zone);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSMutableSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableSet, _sel_new);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// set
   static NSMutableSet set1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableSet, _sel_set);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableSet, _sel_set);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithArray:
   static NSMutableSet setWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableSet, _sel_setWithArray_, array.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithCapacity:
   static NSMutableSet setWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSMutableSet, _sel_setWithCapacity_, numItems);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithObject:
   static NSMutableSet setWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableSet, _sel_setWithObject_, object.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithObjects:
   static NSMutableSet setWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableSet, _sel_setWithObjects_, firstObj.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -3900,14 +4687,14 @@ class NSMutableSet extends NSSet {
   /// setWithObjects:count:
   static NSMutableSet setWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(
+    final _ret = _objc_msgSend_zmbtbd(
         _class_NSMutableSet, _sel_setWithObjects_count_, objects, cnt);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithSet:
   static NSMutableSet setWithSet_(NSSet set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableSet, _sel_setWithSet_, set.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -3919,34 +4706,33 @@ class NSMutableSet extends NSSet {
 
   /// addObject:
   void addObject_(objc.ObjCObjectBase object) {
-    _objc_msgSend_1jdvcbf(
-        this.ref.pointer, _sel_addObject_, object.ref.pointer);
+    _objc_msgSend_xtuoz7(this.ref.pointer, _sel_addObject_, object.ref.pointer);
   }
 
   /// init
   NSMutableSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:
   NSMutableSet initWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_, array.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCapacity:
   NSMutableSet initWithCapacity_(int numItems) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithCapacity_, numItems);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSMutableSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -3955,7 +4741,7 @@ class NSMutableSet extends NSSet {
 
   /// initWithObjects:
   NSMutableSet initWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_, firstObj.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -3963,28 +4749,28 @@ class NSMutableSet extends NSSet {
   /// initWithObjects:count:
   NSMutableSet initWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_zmbtbd(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_count_, objects, cnt);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithSet:
   NSMutableSet initWithSet_(NSSet set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.retainAndReturnPointer(), _sel_initWithSet_, set.ref.pointer);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithSet:copyItems:
   NSMutableSet initWithSet_copyItems_(NSSet set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithSet_copyItems_, set.ref.pointer, flag);
     return NSMutableSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// removeObject:
   void removeObject_(objc.ObjCObjectBase object) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_removeObject_, object.ref.pointer);
   }
 }
@@ -4006,26 +4792,26 @@ class NSMutableString extends NSString {
 
   /// Returns whether [obj] is an instance of [NSMutableString].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSMutableString);
   }
 
   /// alloc
   static NSMutableString alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableString, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableString, _sel_alloc);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSMutableString allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret =
-        _objc_msgSend_hzlb60(_class_NSMutableString, _sel_allocWithZone_, zone);
+    final _ret = _objc_msgSend_1cwp428(
+        _class_NSMutableString, _sel_allocWithZone_, zone);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// localizedStringWithFormat:
   static NSMutableString localizedStringWithFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(_class_NSMutableString,
+    final _ret = _objc_msgSend_1sotr3r(_class_NSMutableString,
         _sel_localizedStringWithFormat_, format.ref.pointer);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -4036,7 +4822,7 @@ class NSMutableString extends NSString {
           NSString format,
           NSString validFormatSpecifiers,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSMutableString,
         _sel_localizedStringWithValidatedFormat_validFormatSpecifiers_error_,
         format.ref.pointer,
@@ -4049,7 +4835,7 @@ class NSMutableString extends NSString {
 
   /// new
   static NSMutableString new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableString, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableString, _sel_new);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -4058,7 +4844,7 @@ class NSMutableString extends NSString {
       NSData data,
       NSString typeIdentifier,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> outError) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSMutableString,
         _sel_objectWithItemProviderData_typeIdentifier_error_,
         data.ref.pointer,
@@ -4071,14 +4857,14 @@ class NSMutableString extends NSString {
 
   /// string
   static NSMutableString string() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSMutableString, _sel_string);
+    final _ret = _objc_msgSend_151sglz(_class_NSMutableString, _sel_string);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// stringWithCString:encoding:
   static NSMutableString? stringWithCString_encoding_(
       ffi.Pointer<ffi.Char> cString, int enc) {
-    final _ret = _objc_msgSend_a15xhc(
+    final _ret = _objc_msgSend_erqryg(
         _class_NSMutableString, _sel_stringWithCString_encoding_, cString, enc);
     return _ret.address == 0
         ? null
@@ -4088,7 +4874,7 @@ class NSMutableString extends NSString {
   /// stringWithCharacters:length:
   static NSMutableString stringWithCharacters_length_(
       ffi.Pointer<ffi.UnsignedShort> characters, int length) {
-    final _ret = _objc_msgSend_13z9dkp(_class_NSMutableString,
+    final _ret = _objc_msgSend_9x4k8x(_class_NSMutableString,
         _sel_stringWithCharacters_length_, characters, length);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -4096,7 +4882,7 @@ class NSMutableString extends NSString {
   /// stringWithContentsOfFile:encoding:error:
   static NSMutableString? stringWithContentsOfFile_encoding_error_(
       NSString path, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         _class_NSMutableString,
         _sel_stringWithContentsOfFile_encoding_error_,
         path.ref.pointer,
@@ -4112,7 +4898,7 @@ class NSMutableString extends NSString {
       NSString path,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         _class_NSMutableString,
         _sel_stringWithContentsOfFile_usedEncoding_error_,
         path.ref.pointer,
@@ -4126,7 +4912,7 @@ class NSMutableString extends NSString {
   /// stringWithContentsOfURL:encoding:error:
   static NSMutableString? stringWithContentsOfURL_encoding_error_(
       NSURL url, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         _class_NSMutableString,
         _sel_stringWithContentsOfURL_encoding_error_,
         url.ref.pointer,
@@ -4142,7 +4928,7 @@ class NSMutableString extends NSString {
       NSURL url,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         _class_NSMutableString,
         _sel_stringWithContentsOfURL_usedEncoding_error_,
         url.ref.pointer,
@@ -4155,14 +4941,14 @@ class NSMutableString extends NSString {
 
   /// stringWithFormat:
   static NSMutableString stringWithFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableString, _sel_stringWithFormat_, format.ref.pointer);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// stringWithString:
   static NSMutableString stringWithString_(NSString string) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSMutableString, _sel_stringWithString_, string.ref.pointer);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -4170,7 +4956,7 @@ class NSMutableString extends NSString {
   /// stringWithUTF8String:
   static NSMutableString? stringWithUTF8String_(
       ffi.Pointer<ffi.Char> nullTerminatedCString) {
-    final _ret = _objc_msgSend_rqwdif(_class_NSMutableString,
+    final _ret = _objc_msgSend_56zxyn(_class_NSMutableString,
         _sel_stringWithUTF8String_, nullTerminatedCString);
     return _ret.address == 0
         ? null
@@ -4183,7 +4969,7 @@ class NSMutableString extends NSString {
           NSString format,
           NSString validFormatSpecifiers,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSMutableString,
         _sel_stringWithValidatedFormat_validFormatSpecifiers_error_,
         format.ref.pointer,
@@ -4202,21 +4988,21 @@ class NSMutableString extends NSString {
 
   /// autorelease
   NSMutableString autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// init
   NSMutableString init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBytes:length:encoding:
   NSMutableString? initWithBytes_length_encoding_(
       ffi.Pointer<ffi.Void> bytes, int len, int encoding) {
-    final _ret = _objc_msgSend_i38ton(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_9b3h4v(this.ref.retainAndReturnPointer(),
         _sel_initWithBytes_length_encoding_, bytes, len, encoding);
     return _ret.address == 0
         ? null
@@ -4226,7 +5012,7 @@ class NSMutableString extends NSString {
   /// initWithBytesNoCopy:length:encoding:freeWhenDone:
   NSMutableString? initWithBytesNoCopy_length_encoding_freeWhenDone_(
       ffi.Pointer<ffi.Void> bytes, int len, int encoding, bool freeBuffer) {
-    final _ret = _objc_msgSend_o2ktnn(
+    final _ret = _objc_msgSend_k4j8m3(
         this.ref.retainAndReturnPointer(),
         _sel_initWithBytesNoCopy_length_encoding_freeWhenDone_,
         bytes,
@@ -4241,7 +5027,7 @@ class NSMutableString extends NSString {
   /// initWithCString:encoding:
   NSMutableString? initWithCString_encoding_(
       ffi.Pointer<ffi.Char> nullTerminatedCString, int encoding) {
-    final _ret = _objc_msgSend_a15xhc(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_erqryg(this.ref.retainAndReturnPointer(),
         _sel_initWithCString_encoding_, nullTerminatedCString, encoding);
     return _ret.address == 0
         ? null
@@ -4251,7 +5037,7 @@ class NSMutableString extends NSString {
   /// initWithCharacters:length:
   NSMutableString initWithCharacters_length_(
       ffi.Pointer<ffi.UnsignedShort> characters, int length) {
-    final _ret = _objc_msgSend_13z9dkp(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_9x4k8x(this.ref.retainAndReturnPointer(),
         _sel_initWithCharacters_length_, characters, length);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
@@ -4259,7 +5045,7 @@ class NSMutableString extends NSString {
   /// initWithCharactersNoCopy:length:freeWhenDone:
   NSMutableString initWithCharactersNoCopy_length_freeWhenDone_(
       ffi.Pointer<ffi.UnsignedShort> characters, int length, bool freeBuffer) {
-    final _ret = _objc_msgSend_zsd8q9(
+    final _ret = _objc_msgSend_lh0jh5(
         this.ref.retainAndReturnPointer(),
         _sel_initWithCharactersNoCopy_length_freeWhenDone_,
         characters,
@@ -4270,7 +5056,7 @@ class NSMutableString extends NSString {
 
   /// initWithCoder:
   NSMutableString? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -4280,7 +5066,7 @@ class NSMutableString extends NSString {
   /// initWithContentsOfFile:encoding:error:
   NSMutableString? initWithContentsOfFile_encoding_error_(
       NSString path, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_encoding_error_,
         path.ref.pointer,
@@ -4296,7 +5082,7 @@ class NSMutableString extends NSString {
       NSString path,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_usedEncoding_error_,
         path.ref.pointer,
@@ -4310,7 +5096,7 @@ class NSMutableString extends NSString {
   /// initWithContentsOfURL:encoding:error:
   NSMutableString? initWithContentsOfURL_encoding_error_(
       NSURL url, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_encoding_error_,
         url.ref.pointer,
@@ -4326,7 +5112,7 @@ class NSMutableString extends NSString {
       NSURL url,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_usedEncoding_error_,
         url.ref.pointer,
@@ -4339,7 +5125,7 @@ class NSMutableString extends NSString {
 
   /// initWithData:encoding:
   NSMutableString? initWithData_encoding_(NSData data, int encoding) {
-    final _ret = _objc_msgSend_dcd68g(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1k4kd9s(this.ref.retainAndReturnPointer(),
         _sel_initWithData_encoding_, data.ref.pointer, encoding);
     return _ret.address == 0
         ? null
@@ -4348,7 +5134,7 @@ class NSMutableString extends NSString {
 
   /// initWithFormat:
   NSMutableString initWithFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithFormat_, format.ref.pointer);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
@@ -4356,7 +5142,7 @@ class NSMutableString extends NSString {
   /// initWithFormat:locale:
   NSMutableString initWithFormat_locale_(
       NSString format, objc.ObjCObjectBase? locale) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initWithFormat_locale_,
         format.ref.pointer,
@@ -4366,7 +5152,7 @@ class NSMutableString extends NSString {
 
   /// initWithString:
   NSMutableString initWithString_(NSString aString) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithString_, aString.ref.pointer);
     return NSMutableString.castFromPointer(_ret, retain: false, release: true);
   }
@@ -4374,7 +5160,7 @@ class NSMutableString extends NSString {
   /// initWithUTF8String:
   NSMutableString? initWithUTF8String_(
       ffi.Pointer<ffi.Char> nullTerminatedCString) {
-    final _ret = _objc_msgSend_rqwdif(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_56zxyn(this.ref.retainAndReturnPointer(),
         _sel_initWithUTF8String_, nullTerminatedCString);
     return _ret.address == 0
         ? null
@@ -4386,7 +5172,7 @@ class NSMutableString extends NSString {
       NSString format,
       NSString validFormatSpecifiers,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         this.ref.retainAndReturnPointer(),
         _sel_initWithValidatedFormat_validFormatSpecifiers_error_,
         format.ref.pointer,
@@ -4403,7 +5189,7 @@ class NSMutableString extends NSString {
       NSString validFormatSpecifiers,
       objc.ObjCObjectBase? locale,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_2izev6(
+    final _ret = _objc_msgSend_1k0ezzm(
         this.ref.retainAndReturnPointer(),
         _sel_initWithValidatedFormat_validFormatSpecifiers_locale_error_,
         format.ref.pointer,
@@ -4417,19 +5203,19 @@ class NSMutableString extends NSString {
 
   /// replaceCharactersInRange:withString:
   void replaceCharactersInRange_withString_(NSRange range, NSString aString) {
-    _objc_msgSend_i4ny2p(this.ref.pointer,
+    _objc_msgSend_1tv4uax(this.ref.pointer,
         _sel_replaceCharactersInRange_withString_, range, aString.ref.pointer);
   }
 
   /// retain
   NSMutableString retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSMutableString self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSMutableString.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -4451,33 +5237,33 @@ class NSNotification extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSNotification].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSNotification);
   }
 
   /// alloc
   static NSNotification alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSNotification, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSNotification, _sel_alloc);
     return NSNotification.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSNotification allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSNotification, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSNotification, _sel_allocWithZone_, zone);
     return NSNotification.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSNotification new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSNotification, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSNotification, _sel_new);
     return NSNotification.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// notificationWithName:object:
   static NSNotification notificationWithName_object_(
       NSString aName, objc.ObjCObjectBase? anObject) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSNotification,
         _sel_notificationWithName_object_,
         aName.ref.pointer,
@@ -4488,7 +5274,7 @@ class NSNotification extends NSObject {
   /// notificationWithName:object:userInfo:
   static NSNotification notificationWithName_object_userInfo_(
       NSString aName, objc.ObjCObjectBase? anObject, NSDictionary? aUserInfo) {
-    final _ret = _objc_msgSend_582s3n(
+    final _ret = _objc_msgSend_11spmsz(
         _class_NSNotification,
         _sel_notificationWithName_object_userInfo_,
         aName.ref.pointer,
@@ -4499,26 +5285,26 @@ class NSNotification extends NSObject {
 
   /// autorelease
   NSNotification autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSNotification.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSNotification init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSNotification.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSNotification? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -4528,7 +5314,7 @@ class NSNotification extends NSObject {
   /// initWithName:object:userInfo:
   NSNotification initWithName_object_userInfo_(
       NSString name, objc.ObjCObjectBase? object, NSDictionary? userInfo) {
-    final _ret = _objc_msgSend_582s3n(
+    final _ret = _objc_msgSend_11spmsz(
         this.ref.retainAndReturnPointer(),
         _sel_initWithName_object_userInfo_,
         name.ref.pointer,
@@ -4539,13 +5325,13 @@ class NSNotification extends NSObject {
 
   /// name
   NSString get name {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_name);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_name);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// object
   objc.ObjCObjectBase? get object {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_object);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_object);
     return _ret.address == 0
         ? null
         : objc.ObjCObjectBase(_ret, retain: true, release: true);
@@ -4553,19 +5339,19 @@ class NSNotification extends NSObject {
 
   /// retain
   NSNotification retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSNotification.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSNotification self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSNotification.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// userInfo
   NSDictionary? get userInfo {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_userInfo);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_userInfo);
     return _ret.address == 0
         ? null
         : NSDictionary.castFromPointer(_ret, retain: true, release: true);
@@ -4589,26 +5375,26 @@ class NSNumber extends NSValue {
 
   /// Returns whether [obj] is an instance of [NSNumber].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSNumber);
   }
 
   /// alloc
   static NSNumber alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSNumber, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSNumber, _sel_alloc);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSNumber allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSNumber, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSNumber, _sel_allocWithZone_, zone);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSNumber new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSNumber, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSNumber, _sel_new);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -4629,14 +5415,14 @@ class NSNumber extends NSValue {
 
   /// compare:
   NSComparisonResult compare_(NSNumber otherNumber) {
-    final _ret = _objc_msgSend_1wpduvy(
+    final _ret = _objc_msgSend_1ym6zyw(
         this.ref.pointer, _sel_compare_, otherNumber.ref.pointer);
     return NSComparisonResult.fromValue(_ret);
   }
 
   /// descriptionWithLocale:
   NSString descriptionWithLocale_(objc.ObjCObjectBase? locale) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_descriptionWithLocale_, locale?.ref.pointer ?? ffi.nullptr);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -4658,13 +5444,13 @@ class NSNumber extends NSValue {
   /// init
   NSNumber init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBool:
   NSNumber initWithBool_(bool value) {
-    final _ret = _objc_msgSend_1l3kbc1(
+    final _ret = _objc_msgSend_1t6aok9(
         this.ref.retainAndReturnPointer(), _sel_initWithBool_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
@@ -4672,21 +5458,21 @@ class NSNumber extends NSValue {
   /// initWithBytes:objCType:
   NSNumber initWithBytes_objCType_(
       ffi.Pointer<ffi.Void> value, ffi.Pointer<ffi.Char> type) {
-    final _ret = _objc_msgSend_qtxoq7(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_e9mncn(this.ref.retainAndReturnPointer(),
         _sel_initWithBytes_objCType_, value, type);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithChar:
   NSNumber initWithChar_(int value) {
-    final _ret = _objc_msgSend_vx1f2d(
+    final _ret = _objc_msgSend_13mclwd(
         this.ref.retainAndReturnPointer(), _sel_initWithChar_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSNumber? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -4695,91 +5481,91 @@ class NSNumber extends NSValue {
 
   /// initWithDouble:
   NSNumber initWithDouble_(double value) {
-    final _ret = _objc_msgSend_1x911p2(
+    final _ret = _objc_msgSend_oa8mke(
         this.ref.retainAndReturnPointer(), _sel_initWithDouble_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithFloat:
   NSNumber initWithFloat_(double value) {
-    final _ret = _objc_msgSend_1f4qa0h(
+    final _ret = _objc_msgSend_et8cuh(
         this.ref.retainAndReturnPointer(), _sel_initWithFloat_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithInt:
   NSNumber initWithInt_(int value) {
-    final _ret = _objc_msgSend_1a0iyvk(
+    final _ret = _objc_msgSend_14hvw5k(
         this.ref.retainAndReturnPointer(), _sel_initWithInt_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithInteger:
   NSNumber initWithInteger_(int value) {
-    final _ret = _objc_msgSend_8o14b(
+    final _ret = _objc_msgSend_qugqlf(
         this.ref.retainAndReturnPointer(), _sel_initWithInteger_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithLong:
   NSNumber initWithLong_(int value) {
-    final _ret = _objc_msgSend_8o14b(
+    final _ret = _objc_msgSend_qugqlf(
         this.ref.retainAndReturnPointer(), _sel_initWithLong_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithLongLong:
   NSNumber initWithLongLong_(int value) {
-    final _ret = _objc_msgSend_94zdgv(
+    final _ret = _objc_msgSend_16f0drb(
         this.ref.retainAndReturnPointer(), _sel_initWithLongLong_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithShort:
   NSNumber initWithShort_(int value) {
-    final _ret = _objc_msgSend_cvzqr9(
+    final _ret = _objc_msgSend_68x6r1(
         this.ref.retainAndReturnPointer(), _sel_initWithShort_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUnsignedChar:
   NSNumber initWithUnsignedChar_(int value) {
-    final _ret = _objc_msgSend_uzucl8(
+    final _ret = _objc_msgSend_7uautw(
         this.ref.retainAndReturnPointer(), _sel_initWithUnsignedChar_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUnsignedInt:
   NSNumber initWithUnsignedInt_(int value) {
-    final _ret = _objc_msgSend_12mhqtk(
+    final _ret = _objc_msgSend_degb40(
         this.ref.retainAndReturnPointer(), _sel_initWithUnsignedInt_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUnsignedInteger:
   NSNumber initWithUnsignedInteger_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_14hpxwa(this.ref.retainAndReturnPointer(),
         _sel_initWithUnsignedInteger_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUnsignedLong:
   NSNumber initWithUnsignedLong_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.retainAndReturnPointer(), _sel_initWithUnsignedLong_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUnsignedLongLong:
   NSNumber initWithUnsignedLongLong_(int value) {
-    final _ret = _objc_msgSend_98pnic(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1x2hskc(this.ref.retainAndReturnPointer(),
         _sel_initWithUnsignedLongLong_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUnsignedShort:
   NSNumber initWithUnsignedShort_(int value) {
-    final _ret = _objc_msgSend_onx6bi(
+    final _ret = _objc_msgSend_1njucl2(
         this.ref.retainAndReturnPointer(), _sel_initWithUnsignedShort_, value);
     return NSNumber.castFromPointer(_ret, retain: false, release: true);
   }
@@ -4796,7 +5582,7 @@ class NSNumber extends NSValue {
 
   /// isEqualToNumber:
   bool isEqualToNumber_(NSNumber number) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isEqualToNumber_, number.ref.pointer);
   }
 
@@ -4817,7 +5603,7 @@ class NSNumber extends NSValue {
 
   /// stringValue
   NSString get stringValue {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_stringValue);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_stringValue);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -4857,104 +5643,104 @@ extension NSNumberCreation on NSNumber {
   /// numberWithBool:
   static NSNumber numberWithBool_(bool value) {
     final _ret =
-        _objc_msgSend_1l3kbc1(_class_NSNumber, _sel_numberWithBool_, value);
+        _objc_msgSend_1t6aok9(_class_NSNumber, _sel_numberWithBool_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithChar:
   static NSNumber numberWithChar_(int value) {
     final _ret =
-        _objc_msgSend_vx1f2d(_class_NSNumber, _sel_numberWithChar_, value);
+        _objc_msgSend_13mclwd(_class_NSNumber, _sel_numberWithChar_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithDouble:
   static NSNumber numberWithDouble_(double value) {
     final _ret =
-        _objc_msgSend_1x911p2(_class_NSNumber, _sel_numberWithDouble_, value);
+        _objc_msgSend_oa8mke(_class_NSNumber, _sel_numberWithDouble_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithFloat:
   static NSNumber numberWithFloat_(double value) {
     final _ret =
-        _objc_msgSend_1f4qa0h(_class_NSNumber, _sel_numberWithFloat_, value);
+        _objc_msgSend_et8cuh(_class_NSNumber, _sel_numberWithFloat_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithInt:
   static NSNumber numberWithInt_(int value) {
     final _ret =
-        _objc_msgSend_1a0iyvk(_class_NSNumber, _sel_numberWithInt_, value);
+        _objc_msgSend_14hvw5k(_class_NSNumber, _sel_numberWithInt_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithInteger:
   static NSNumber numberWithInteger_(int value) {
     final _ret =
-        _objc_msgSend_8o14b(_class_NSNumber, _sel_numberWithInteger_, value);
+        _objc_msgSend_qugqlf(_class_NSNumber, _sel_numberWithInteger_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithLong:
   static NSNumber numberWithLong_(int value) {
     final _ret =
-        _objc_msgSend_8o14b(_class_NSNumber, _sel_numberWithLong_, value);
+        _objc_msgSend_qugqlf(_class_NSNumber, _sel_numberWithLong_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithLongLong:
   static NSNumber numberWithLongLong_(int value) {
     final _ret =
-        _objc_msgSend_94zdgv(_class_NSNumber, _sel_numberWithLongLong_, value);
+        _objc_msgSend_16f0drb(_class_NSNumber, _sel_numberWithLongLong_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithShort:
   static NSNumber numberWithShort_(int value) {
     final _ret =
-        _objc_msgSend_cvzqr9(_class_NSNumber, _sel_numberWithShort_, value);
+        _objc_msgSend_68x6r1(_class_NSNumber, _sel_numberWithShort_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithUnsignedChar:
   static NSNumber numberWithUnsignedChar_(int value) {
-    final _ret = _objc_msgSend_uzucl8(
+    final _ret = _objc_msgSend_7uautw(
         _class_NSNumber, _sel_numberWithUnsignedChar_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithUnsignedInt:
   static NSNumber numberWithUnsignedInt_(int value) {
-    final _ret = _objc_msgSend_12mhqtk(
+    final _ret = _objc_msgSend_degb40(
         _class_NSNumber, _sel_numberWithUnsignedInt_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithUnsignedInteger:
   static NSNumber numberWithUnsignedInteger_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSNumber, _sel_numberWithUnsignedInteger_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithUnsignedLong:
   static NSNumber numberWithUnsignedLong_(int value) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSNumber, _sel_numberWithUnsignedLong_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithUnsignedLongLong:
   static NSNumber numberWithUnsignedLongLong_(int value) {
-    final _ret = _objc_msgSend_98pnic(
+    final _ret = _objc_msgSend_1x2hskc(
         _class_NSNumber, _sel_numberWithUnsignedLongLong_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// numberWithUnsignedShort:
   static NSNumber numberWithUnsignedShort_(int value) {
-    final _ret = _objc_msgSend_onx6bi(
+    final _ret = _objc_msgSend_1njucl2(
         _class_NSNumber, _sel_numberWithUnsignedShort_, value);
     return NSNumber.castFromPointer(_ret, retain: true, release: true);
   }
@@ -4977,51 +5763,51 @@ class NSObject extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [NSObject].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSObject);
   }
 
   /// alloc
   static NSObject alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSObject, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSObject, _sel_alloc);
     return NSObject.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSObject allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSObject, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSObject, _sel_allocWithZone_, zone);
     return NSObject.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// class
   static objc.ObjCObjectBase class1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSObject, _sel_class);
+    final _ret = _objc_msgSend_151sglz(_class_NSObject, _sel_class);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
   /// conformsToProtocol:
   static bool conformsToProtocol_(Protocol protocol) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         _class_NSObject, _sel_conformsToProtocol_, protocol.ref.pointer);
   }
 
   /// copyWithZone:
   static objc.ObjCObjectBase copyWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSObject, _sel_copyWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSObject, _sel_copyWithZone_, zone);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
   /// debugDescription
   static NSString debugDescription() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSObject, _sel_debugDescription);
+    final _ret = _objc_msgSend_151sglz(_class_NSObject, _sel_debugDescription);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// description
   static NSString description() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSObject, _sel_description);
+    final _ret = _objc_msgSend_151sglz(_class_NSObject, _sel_description);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5045,7 +5831,7 @@ class NSObject extends objc.ObjCObjectBase {
   /// instanceMethodSignatureForSelector:
   static NSMethodSignature instanceMethodSignatureForSelector_(
       ffi.Pointer<objc.ObjCSelector> aSelector) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         _class_NSObject, _sel_instanceMethodSignatureForSelector_, aSelector);
     return NSMethodSignature.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5059,7 +5845,7 @@ class NSObject extends objc.ObjCObjectBase {
 
   /// isSubclassOfClass:
   static bool isSubclassOfClass_(objc.ObjCObjectBase aClass) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         _class_NSObject, _sel_isSubclassOfClass_, aClass.ref.pointer);
   }
 
@@ -5071,13 +5857,13 @@ class NSObject extends objc.ObjCObjectBase {
   /// mutableCopyWithZone:
   static objc.ObjCObjectBase mutableCopyWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSObject, _sel_mutableCopyWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSObject, _sel_mutableCopyWithZone_, zone);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
   /// new
   static NSObject new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSObject, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSObject, _sel_new);
     return NSObject.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -5095,31 +5881,31 @@ class NSObject extends objc.ObjCObjectBase {
 
   /// superclass
   static objc.ObjCObjectBase superclass() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSObject, _sel_superclass);
+    final _ret = _objc_msgSend_151sglz(_class_NSObject, _sel_superclass);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
   /// autorelease
   NSObject autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSObject.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// class
   objc.ObjCObjectBase class2() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_class);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_class);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
   /// conformsToProtocol:
   bool conformsToProtocol_1(Protocol aProtocol) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_conformsToProtocol_, aProtocol.ref.pointer);
   }
 
   /// copy
   objc.ObjCObjectBase copy() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_copy);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_copy);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
@@ -5134,13 +5920,13 @@ class NSObject extends objc.ObjCObjectBase {
       throw objc.UnimplementedOptionalMethodException(
           'NSObject', 'debugDescription');
     }
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_debugDescription);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_debugDescription);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// description
   NSString get description1 {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_description);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_description);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5152,14 +5938,14 @@ class NSObject extends objc.ObjCObjectBase {
 
   /// forwardInvocation:
   void forwardInvocation_(NSInvocation anInvocation) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_forwardInvocation_, anInvocation.ref.pointer);
   }
 
   /// forwardingTargetForSelector:
   objc.ObjCObjectBase forwardingTargetForSelector_(
       ffi.Pointer<objc.ObjCSelector> aSelector) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         this.ref.pointer, _sel_forwardingTargetForSelector_, aSelector);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
@@ -5172,25 +5958,25 @@ class NSObject extends objc.ObjCObjectBase {
   /// init
   NSObject init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSObject.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// isEqual:
   bool isEqual_(objc.ObjCObjectBase object) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isEqual_, object.ref.pointer);
   }
 
   /// isKindOfClass:
   bool isKindOfClass_(objc.ObjCObjectBase aClass) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isKindOfClass_, aClass.ref.pointer);
   }
 
   /// isMemberOfClass:
   bool isMemberOfClass_(objc.ObjCObjectBase aClass) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isMemberOfClass_, aClass.ref.pointer);
   }
 
@@ -5209,21 +5995,21 @@ class NSObject extends objc.ObjCObjectBase {
   /// methodSignatureForSelector:
   NSMethodSignature methodSignatureForSelector_(
       ffi.Pointer<objc.ObjCSelector> aSelector) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         this.ref.pointer, _sel_methodSignatureForSelector_, aSelector);
     return NSMethodSignature.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// mutableCopy
   objc.ObjCObjectBase mutableCopy() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_mutableCopy);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_mutableCopy);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
   /// performSelector:
   objc.ObjCObjectBase performSelector_(
       ffi.Pointer<objc.ObjCSelector> aSelector) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         this.ref.pointer, _sel_performSelector_, aSelector);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
@@ -5231,7 +6017,7 @@ class NSObject extends objc.ObjCObjectBase {
   /// performSelector:withObject:
   objc.ObjCObjectBase performSelector_withObject_(
       ffi.Pointer<objc.ObjCSelector> aSelector, objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_1wlgx7q(this.ref.pointer,
+    final _ret = _objc_msgSend_gx50so(this.ref.pointer,
         _sel_performSelector_withObject_, aSelector, object.ref.pointer);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
@@ -5241,7 +6027,7 @@ class NSObject extends objc.ObjCObjectBase {
       ffi.Pointer<objc.ObjCSelector> aSelector,
       objc.ObjCObjectBase object1,
       objc.ObjCObjectBase object2) {
-    final _ret = _objc_msgSend_189974q(
+    final _ret = _objc_msgSend_cfx8ce(
         this.ref.pointer,
         _sel_performSelector_withObject_withObject_,
         aSelector,
@@ -5263,7 +6049,7 @@ class NSObject extends objc.ObjCObjectBase {
 
   /// retain
   NSObject retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSObject.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5274,13 +6060,13 @@ class NSObject extends objc.ObjCObjectBase {
 
   /// self
   NSObject self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSObject.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// superclass
   objc.ObjCObjectBase get superclass1 {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_superclass);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_superclass);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
@@ -5309,14 +6095,14 @@ class NSOrderedCollectionDifference extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSOrderedCollectionDifference].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(obj.ref.pointer, _sel_isKindOfClass_,
+    return _objc_msgSend_19nvye5(obj.ref.pointer, _sel_isKindOfClass_,
         _class_NSOrderedCollectionDifference);
   }
 
   /// alloc
   static NSOrderedCollectionDifference alloc() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSOrderedCollectionDifference, _sel_alloc);
+        _objc_msgSend_151sglz(_class_NSOrderedCollectionDifference, _sel_alloc);
     return NSOrderedCollectionDifference.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -5324,7 +6110,7 @@ class NSOrderedCollectionDifference extends NSObject {
   /// allocWithZone:
   static NSOrderedCollectionDifference allocWithZone_(
       ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(
+    final _ret = _objc_msgSend_1cwp428(
         _class_NSOrderedCollectionDifference, _sel_allocWithZone_, zone);
     return NSOrderedCollectionDifference.castFromPointer(_ret,
         retain: false, release: true);
@@ -5333,7 +6119,7 @@ class NSOrderedCollectionDifference extends NSObject {
   /// new
   static NSOrderedCollectionDifference new1() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSOrderedCollectionDifference, _sel_new);
+        _objc_msgSend_151sglz(_class_NSOrderedCollectionDifference, _sel_new);
     return NSOrderedCollectionDifference.castFromPointer(_ret,
         retain: false, release: true);
   }
@@ -5355,14 +6141,14 @@ class NSOrderedCollectionDifference extends NSObject {
   /// init
   NSOrderedCollectionDifference init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSOrderedCollectionDifference.castFromPointer(_ret,
         retain: false, release: true);
   }
 
   /// initWithChanges:
   NSOrderedCollectionDifference initWithChanges_(objc.ObjCObjectBase changes) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithChanges_, changes.ref.pointer);
     return NSOrderedCollectionDifference.castFromPointer(_ret,
         retain: false, release: true);
@@ -5375,7 +6161,7 @@ class NSOrderedCollectionDifference extends NSObject {
           objc.ObjCObjectBase? insertedObjects,
           NSIndexSet removes,
           objc.ObjCObjectBase? removedObjects) {
-    final _ret = _objc_msgSend_1ghpoap(
+    final _ret = _objc_msgSend_s92gih(
         this.ref.retainAndReturnPointer(),
         _sel_initWithInsertIndexes_insertedObjects_removeIndexes_removedObjects_,
         inserts.ref.pointer,
@@ -5394,7 +6180,7 @@ class NSOrderedCollectionDifference extends NSObject {
           NSIndexSet removes,
           objc.ObjCObjectBase? removedObjects,
           objc.ObjCObjectBase changes) {
-    final _ret = _objc_msgSend_1aoxlyn(
+    final _ret = _objc_msgSend_3cbdpb(
         this.ref.retainAndReturnPointer(),
         _sel_initWithInsertIndexes_insertedObjects_removeIndexes_removedObjects_additionalChanges_,
         inserts.ref.pointer,
@@ -5408,21 +6194,21 @@ class NSOrderedCollectionDifference extends NSObject {
 
   /// insertions
   objc.ObjCObjectBase get insertions {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_insertions);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_insertions);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
   /// inverseDifference
   NSOrderedCollectionDifference inverseDifference() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_inverseDifference);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_inverseDifference);
     return NSOrderedCollectionDifference.castFromPointer(_ret,
         retain: true, release: true);
   }
 
   /// removals
   objc.ObjCObjectBase get removals {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_removals);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_removals);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 }
@@ -5462,38 +6248,38 @@ class NSOrderedSet extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSOrderedSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSOrderedSet);
   }
 
   /// alloc
   static NSOrderedSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSOrderedSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSOrderedSet, _sel_alloc);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSOrderedSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSOrderedSet, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSOrderedSet, _sel_allocWithZone_, zone);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSOrderedSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSOrderedSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSOrderedSet, _sel_new);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// orderedSet
   static NSOrderedSet orderedSet() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSOrderedSet, _sel_orderedSet);
+    final _ret = _objc_msgSend_151sglz(_class_NSOrderedSet, _sel_orderedSet);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// orderedSetWithArray:
   static NSOrderedSet orderedSetWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSOrderedSet, _sel_orderedSetWithArray_, array.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5501,7 +6287,7 @@ class NSOrderedSet extends NSObject {
   /// orderedSetWithArray:range:copyItems:
   static NSOrderedSet orderedSetWithArray_range_copyItems_(
       NSArray array, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(
+    final _ret = _objc_msgSend_w9bq5x(
         _class_NSOrderedSet,
         _sel_orderedSetWithArray_range_copyItems_,
         array.ref.pointer,
@@ -5512,14 +6298,14 @@ class NSOrderedSet extends NSObject {
 
   /// orderedSetWithObject:
   static NSOrderedSet orderedSetWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSOrderedSet, _sel_orderedSetWithObject_, object.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// orderedSetWithObjects:
   static NSOrderedSet orderedSetWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSOrderedSet, _sel_orderedSetWithObjects_, firstObj.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5527,14 +6313,14 @@ class NSOrderedSet extends NSObject {
   /// orderedSetWithObjects:count:
   static NSOrderedSet orderedSetWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(
+    final _ret = _objc_msgSend_zmbtbd(
         _class_NSOrderedSet, _sel_orderedSetWithObjects_count_, objects, cnt);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// orderedSetWithOrderedSet:
   static NSOrderedSet orderedSetWithOrderedSet_(NSOrderedSet set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSOrderedSet, _sel_orderedSetWithOrderedSet_, set.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5542,7 +6328,7 @@ class NSOrderedSet extends NSObject {
   /// orderedSetWithOrderedSet:range:copyItems:
   static NSOrderedSet orderedSetWithOrderedSet_range_copyItems_(
       NSOrderedSet set, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(
+    final _ret = _objc_msgSend_w9bq5x(
         _class_NSOrderedSet,
         _sel_orderedSetWithOrderedSet_range_copyItems_,
         set.ref.pointer,
@@ -5553,7 +6339,7 @@ class NSOrderedSet extends NSObject {
 
   /// orderedSetWithSet:
   static NSOrderedSet orderedSetWithSet_(objc.ObjCObjectBase set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSOrderedSet, _sel_orderedSetWithSet_, set.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5561,7 +6347,7 @@ class NSOrderedSet extends NSObject {
   /// orderedSetWithSet:copyItems:
   static NSOrderedSet orderedSetWithSet_copyItems_(
       objc.ObjCObjectBase set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(_class_NSOrderedSet,
+    final _ret = _objc_msgSend_17amj0z(_class_NSOrderedSet,
         _sel_orderedSetWithSet_copyItems_, set.ref.pointer, flag);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5573,7 +6359,7 @@ class NSOrderedSet extends NSObject {
 
   /// autorelease
   NSOrderedSet autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5593,33 +6379,33 @@ class NSOrderedSet extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// indexOfObject:
   int indexOfObject_(objc.ObjCObjectBase object) {
-    return _objc_msgSend_1p4b7x4(
+    return _objc_msgSend_1vd1c5m(
         this.ref.pointer, _sel_indexOfObject_, object.ref.pointer);
   }
 
   /// init
   NSOrderedSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:
   NSOrderedSet initWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_, array.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:copyItems:
   NSOrderedSet initWithArray_copyItems_(NSArray set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_copyItems_, set.ref.pointer, flag);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -5627,14 +6413,14 @@ class NSOrderedSet extends NSObject {
   /// initWithArray:range:copyItems:
   NSOrderedSet initWithArray_range_copyItems_(
       NSArray set, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_w9bq5x(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_range_copyItems_, set.ref.pointer, range, flag);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSOrderedSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -5643,14 +6429,14 @@ class NSOrderedSet extends NSObject {
 
   /// initWithObject:
   NSOrderedSet initWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObject_, object.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithObjects:
   NSOrderedSet initWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_, firstObj.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -5658,21 +6444,21 @@ class NSOrderedSet extends NSObject {
   /// initWithObjects:count:
   NSOrderedSet initWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_zmbtbd(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_count_, objects, cnt);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithOrderedSet:
   NSOrderedSet initWithOrderedSet_(NSOrderedSet set) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithOrderedSet_, set.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithOrderedSet:copyItems:
   NSOrderedSet initWithOrderedSet_copyItems_(NSOrderedSet set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithOrderedSet_copyItems_, set.ref.pointer, flag);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -5680,21 +6466,21 @@ class NSOrderedSet extends NSObject {
   /// initWithOrderedSet:range:copyItems:
   NSOrderedSet initWithOrderedSet_range_copyItems_(
       NSOrderedSet set, NSRange range, bool flag) {
-    final _ret = _objc_msgSend_1cqd8wl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_w9bq5x(this.ref.retainAndReturnPointer(),
         _sel_initWithOrderedSet_range_copyItems_, set.ref.pointer, range, flag);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithSet:
   NSOrderedSet initWithSet_(objc.ObjCObjectBase set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.retainAndReturnPointer(), _sel_initWithSet_, set.ref.pointer);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithSet:copyItems:
   NSOrderedSet initWithSet_copyItems_(objc.ObjCObjectBase set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithSet_copyItems_, set.ref.pointer, flag);
     return NSOrderedSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -5702,19 +6488,19 @@ class NSOrderedSet extends NSObject {
   /// objectAtIndex:
   objc.ObjCObjectBase objectAtIndex_(int idx) {
     final _ret =
-        _objc_msgSend_1qrcblu(this.ref.pointer, _sel_objectAtIndex_, idx);
+        _objc_msgSend_14hpxwa(this.ref.pointer, _sel_objectAtIndex_, idx);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
   /// retain
   NSOrderedSet retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSOrderedSet self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSOrderedSet.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -5736,14 +6522,14 @@ class NSOutputStream extends NSStream {
 
   /// Returns whether [obj] is an instance of [NSOutputStream].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSOutputStream);
   }
 
   /// outputStreamToBuffer:capacity:
   static NSOutputStream outputStreamToBuffer_capacity_(
       ffi.Pointer<ffi.Uint8> buffer, int capacity) {
-    final _ret = _objc_msgSend_7ukip1(_class_NSOutputStream,
+    final _ret = _objc_msgSend_158ju31(_class_NSOutputStream,
         _sel_outputStreamToBuffer_capacity_, buffer, capacity);
     return NSOutputStream.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5751,7 +6537,7 @@ class NSOutputStream extends NSStream {
   /// outputStreamToFileAtPath:append:
   static NSOutputStream outputStreamToFileAtPath_append_(
       NSString path, bool shouldAppend) {
-    final _ret = _objc_msgSend_1bdmr5f(_class_NSOutputStream,
+    final _ret = _objc_msgSend_17amj0z(_class_NSOutputStream,
         _sel_outputStreamToFileAtPath_append_, path.ref.pointer, shouldAppend);
     return NSOutputStream.castFromPointer(_ret, retain: true, release: true);
   }
@@ -5759,14 +6545,14 @@ class NSOutputStream extends NSStream {
   /// outputStreamToMemory
   static NSOutputStream outputStreamToMemory() {
     final _ret =
-        _objc_msgSend_1x359cv(_class_NSOutputStream, _sel_outputStreamToMemory);
+        _objc_msgSend_151sglz(_class_NSOutputStream, _sel_outputStreamToMemory);
     return NSOutputStream.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// outputStreamWithURL:append:
   static NSOutputStream? outputStreamWithURL_append_(
       NSURL url, bool shouldAppend) {
-    final _ret = _objc_msgSend_1bdmr5f(_class_NSOutputStream,
+    final _ret = _objc_msgSend_17amj0z(_class_NSOutputStream,
         _sel_outputStreamWithURL_append_, url.ref.pointer, shouldAppend);
     return _ret.address == 0
         ? null
@@ -5781,14 +6567,14 @@ class NSOutputStream extends NSStream {
   /// initToBuffer:capacity:
   NSOutputStream initToBuffer_capacity_(
       ffi.Pointer<ffi.Uint8> buffer, int capacity) {
-    final _ret = _objc_msgSend_7ukip1(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_158ju31(this.ref.retainAndReturnPointer(),
         _sel_initToBuffer_capacity_, buffer, capacity);
     return NSOutputStream.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initToFileAtPath:append:
   NSOutputStream? initToFileAtPath_append_(NSString path, bool shouldAppend) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initToFileAtPath_append_, path.ref.pointer, shouldAppend);
     return _ret.address == 0
         ? null
@@ -5797,14 +6583,14 @@ class NSOutputStream extends NSStream {
 
   /// initToMemory
   NSOutputStream initToMemory() {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.retainAndReturnPointer(), _sel_initToMemory);
     return NSOutputStream.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithURL:append:
   NSOutputStream? initWithURL_append_(NSURL url, bool shouldAppend) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithURL_append_, url.ref.pointer, shouldAppend);
     return _ret.address == 0
         ? null
@@ -5835,26 +6621,26 @@ class NSProxy extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [NSProxy].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSProxy);
   }
 
   /// alloc
   static objc.ObjCObjectBase alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSProxy, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSProxy, _sel_alloc);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static objc.ObjCObjectBase allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSProxy, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSProxy, _sel_allocWithZone_, zone);
     return objc.ObjCObjectBase(_ret, retain: false, release: true);
   }
 
   /// class
   static objc.ObjCObjectBase class1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSProxy, _sel_class);
+    final _ret = _objc_msgSend_151sglz(_class_NSProxy, _sel_class);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
 
@@ -5866,7 +6652,7 @@ class NSProxy extends objc.ObjCObjectBase {
 
   /// autorelease
   NSProxy autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSProxy.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5877,13 +6663,13 @@ class NSProxy extends objc.ObjCObjectBase {
 
   /// debugDescription
   NSString get debugDescription {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_debugDescription);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_debugDescription);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// description
   NSString get description {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_description);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_description);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5894,25 +6680,25 @@ class NSProxy extends objc.ObjCObjectBase {
 
   /// forwardInvocation:
   void forwardInvocation_(NSInvocation invocation) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_forwardInvocation_, invocation.ref.pointer);
   }
 
   /// isEqual:
   bool isEqual_(objc.ObjCObjectBase object) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isEqual_, object.ref.pointer);
   }
 
   /// isKindOfClass:
   bool isKindOfClass_(objc.ObjCObjectBase aClass) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isKindOfClass_, aClass.ref.pointer);
   }
 
   /// isMemberOfClass:
   bool isMemberOfClass_(objc.ObjCObjectBase aClass) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isMemberOfClass_, aClass.ref.pointer);
   }
 
@@ -5924,7 +6710,7 @@ class NSProxy extends objc.ObjCObjectBase {
   /// methodSignatureForSelector:
   NSMethodSignature? methodSignatureForSelector_(
       ffi.Pointer<objc.ObjCSelector> sel) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         this.ref.pointer, _sel_methodSignatureForSelector_, sel);
     return _ret.address == 0
         ? null
@@ -5934,7 +6720,7 @@ class NSProxy extends objc.ObjCObjectBase {
   /// performSelector:
   objc.ObjCObjectBase performSelector_(
       ffi.Pointer<objc.ObjCSelector> aSelector) {
-    final _ret = _objc_msgSend_19hbqky(
+    final _ret = _objc_msgSend_3ctkt6(
         this.ref.pointer, _sel_performSelector_, aSelector);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
@@ -5942,7 +6728,7 @@ class NSProxy extends objc.ObjCObjectBase {
   /// performSelector:withObject:
   objc.ObjCObjectBase performSelector_withObject_(
       ffi.Pointer<objc.ObjCSelector> aSelector, objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_1wlgx7q(this.ref.pointer,
+    final _ret = _objc_msgSend_gx50so(this.ref.pointer,
         _sel_performSelector_withObject_, aSelector, object.ref.pointer);
     return objc.ObjCObjectBase(_ret, retain: true, release: true);
   }
@@ -5952,7 +6738,7 @@ class NSProxy extends objc.ObjCObjectBase {
       ffi.Pointer<objc.ObjCSelector> aSelector,
       objc.ObjCObjectBase object1,
       objc.ObjCObjectBase object2) {
-    final _ret = _objc_msgSend_189974q(
+    final _ret = _objc_msgSend_cfx8ce(
         this.ref.pointer,
         _sel_performSelector_withObject_withObject_,
         aSelector,
@@ -5968,7 +6754,7 @@ class NSProxy extends objc.ObjCObjectBase {
 
   /// retain
   NSProxy retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSProxy.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -5979,7 +6765,7 @@ class NSProxy extends objc.ObjCObjectBase {
 
   /// self
   NSProxy self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSProxy.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -6014,7 +6800,7 @@ class NSRunLoop extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [NSRunLoop].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSRunLoop);
   }
 }
@@ -6036,51 +6822,51 @@ class NSSet extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSSet].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSSet);
   }
 
   /// alloc
   static NSSet alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSSet, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSSet, _sel_alloc);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSSet allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(_class_NSSet, _sel_allocWithZone_, zone);
+    final _ret = _objc_msgSend_1cwp428(_class_NSSet, _sel_allocWithZone_, zone);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSSet new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSSet, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSSet, _sel_new);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// set
   static NSSet set1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSSet, _sel_set);
+    final _ret = _objc_msgSend_151sglz(_class_NSSet, _sel_set);
     return NSSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithArray:
   static NSSet setWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSSet, _sel_setWithArray_, array.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithObject:
   static NSSet setWithObject_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSSet, _sel_setWithObject_, object.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setWithObjects:
   static NSSet setWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSSet, _sel_setWithObjects_, firstObj.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -6088,7 +6874,7 @@ class NSSet extends NSObject {
   /// setWithObjects:count:
   static NSSet setWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(
+    final _ret = _objc_msgSend_zmbtbd(
         _class_NSSet, _sel_setWithObjects_count_, objects, cnt);
     return NSSet.castFromPointer(_ret, retain: true, release: true);
   }
@@ -6096,7 +6882,7 @@ class NSSet extends NSObject {
   /// setWithSet:
   static NSSet setWithSet_(NSSet set) {
     final _ret =
-        _objc_msgSend_62nh5j(_class_NSSet, _sel_setWithSet_, set.ref.pointer);
+        _objc_msgSend_1sotr3r(_class_NSSet, _sel_setWithSet_, set.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -6121,27 +6907,27 @@ class NSSet extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSSet init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithArray:
   NSSet initWithArray_(NSArray array) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithArray_, array.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSSet? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -6150,7 +6936,7 @@ class NSSet extends NSObject {
 
   /// initWithObjects:
   NSSet initWithObjects_(objc.ObjCObjectBase firstObj) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_, firstObj.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
@@ -6158,28 +6944,28 @@ class NSSet extends NSObject {
   /// initWithObjects:count:
   NSSet initWithObjects_count_(
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> objects, int cnt) {
-    final _ret = _objc_msgSend_1lqqdvl(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_zmbtbd(this.ref.retainAndReturnPointer(),
         _sel_initWithObjects_count_, objects, cnt);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithSet:
   NSSet initWithSet_(NSSet set) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.retainAndReturnPointer(), _sel_initWithSet_, set.ref.pointer);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithSet:copyItems:
   NSSet initWithSet_copyItems_(NSSet set, bool flag) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initWithSet_copyItems_, set.ref.pointer, flag);
     return NSSet.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// member:
   objc.ObjCObjectBase? member_(objc.ObjCObjectBase object) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.pointer, _sel_member_, object.ref.pointer);
     return _ret.address == 0
         ? null
@@ -6188,7 +6974,7 @@ class NSSet extends NSObject {
 
   /// objectEnumerator
   NSEnumerator objectEnumerator() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_objectEnumerator);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_objectEnumerator);
     return NSEnumerator.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -6224,32 +7010,32 @@ class NSStream extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSStream].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSStream);
   }
 
   /// alloc
   static NSStream alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSStream, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSStream, _sel_alloc);
     return NSStream.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSStream allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSStream, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSStream, _sel_allocWithZone_, zone);
     return NSStream.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSStream new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSStream, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSStream, _sel_new);
     return NSStream.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// autorelease
   NSStream autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSStream.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -6260,7 +7046,7 @@ class NSStream extends NSObject {
 
   /// delegate
   objc.ObjCObjectBase? get delegate {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_delegate);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_delegate);
     return _ret.address == 0
         ? null
         : objc.ObjCObjectBase(_ret, retain: true, release: true);
@@ -6269,7 +7055,7 @@ class NSStream extends NSObject {
   /// init
   NSStream init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSStream.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -6280,7 +7066,7 @@ class NSStream extends NSObject {
 
   /// propertyForKey:
   objc.ObjCObjectBase? propertyForKey_(NSString key) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.pointer, _sel_propertyForKey_, key.ref.pointer);
     return _ret.address == 0
         ? null
@@ -6289,43 +7075,43 @@ class NSStream extends NSObject {
 
   /// removeFromRunLoop:forMode:
   void removeFromRunLoop_forMode_(NSRunLoop aRunLoop, NSString mode) {
-    _objc_msgSend_wjvic9(this.ref.pointer, _sel_removeFromRunLoop_forMode_,
+    _objc_msgSend_pfv6jd(this.ref.pointer, _sel_removeFromRunLoop_forMode_,
         aRunLoop.ref.pointer, mode.ref.pointer);
   }
 
   /// retain
   NSStream retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSStream.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// scheduleInRunLoop:forMode:
   void scheduleInRunLoop_forMode_(NSRunLoop aRunLoop, NSString mode) {
-    _objc_msgSend_wjvic9(this.ref.pointer, _sel_scheduleInRunLoop_forMode_,
+    _objc_msgSend_pfv6jd(this.ref.pointer, _sel_scheduleInRunLoop_forMode_,
         aRunLoop.ref.pointer, mode.ref.pointer);
   }
 
   /// self
   NSStream self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSStream.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// setDelegate:
   set delegate(objc.ObjCObjectBase? value) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_setDelegate_, value?.ref.pointer ?? ffi.nullptr);
   }
 
   /// setProperty:forKey:
   bool setProperty_forKey_(objc.ObjCObjectBase? property, NSString key) {
-    return _objc_msgSend_1lqxdg3(this.ref.pointer, _sel_setProperty_forKey_,
+    return _objc_msgSend_1lsax7n(this.ref.pointer, _sel_setProperty_forKey_,
         property?.ref.pointer ?? ffi.nullptr, key.ref.pointer);
   }
 
   /// streamError
   NSError? get streamError {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_streamError);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_streamError);
     return _ret.address == 0
         ? null
         : NSError.castFromPointer(_ret, retain: true, release: true);
@@ -6479,26 +7265,26 @@ class NSString extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSString].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSString);
   }
 
   /// alloc
   static NSString alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSString, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSString, _sel_alloc);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSString allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSString, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSString, _sel_allocWithZone_, zone);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// localizedStringWithFormat:
   static NSString localizedStringWithFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSString, _sel_localizedStringWithFormat_, format.ref.pointer);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -6509,7 +7295,7 @@ class NSString extends NSObject {
           NSString format,
           NSString validFormatSpecifiers,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSString,
         _sel_localizedStringWithValidatedFormat_validFormatSpecifiers_error_,
         format.ref.pointer,
@@ -6522,7 +7308,7 @@ class NSString extends NSObject {
 
   /// new
   static NSString new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSString, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSString, _sel_new);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -6531,7 +7317,7 @@ class NSString extends NSObject {
       NSData data,
       NSString typeIdentifier,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> outError) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSString,
         _sel_objectWithItemProviderData_typeIdentifier_error_,
         data.ref.pointer,
@@ -6544,14 +7330,14 @@ class NSString extends NSObject {
 
   /// string
   static NSString string() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSString, _sel_string);
+    final _ret = _objc_msgSend_151sglz(_class_NSString, _sel_string);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// stringWithCString:encoding:
   static NSString? stringWithCString_encoding_(
       ffi.Pointer<ffi.Char> cString, int enc) {
-    final _ret = _objc_msgSend_a15xhc(
+    final _ret = _objc_msgSend_erqryg(
         _class_NSString, _sel_stringWithCString_encoding_, cString, enc);
     return _ret.address == 0
         ? null
@@ -6561,7 +7347,7 @@ class NSString extends NSObject {
   /// stringWithCharacters:length:
   static NSString stringWithCharacters_length_(
       ffi.Pointer<ffi.UnsignedShort> characters, int length) {
-    final _ret = _objc_msgSend_13z9dkp(
+    final _ret = _objc_msgSend_9x4k8x(
         _class_NSString, _sel_stringWithCharacters_length_, characters, length);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -6569,7 +7355,7 @@ class NSString extends NSObject {
   /// stringWithContentsOfFile:encoding:error:
   static NSString? stringWithContentsOfFile_encoding_error_(
       NSString path, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         _class_NSString,
         _sel_stringWithContentsOfFile_encoding_error_,
         path.ref.pointer,
@@ -6585,7 +7371,7 @@ class NSString extends NSObject {
       NSString path,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         _class_NSString,
         _sel_stringWithContentsOfFile_usedEncoding_error_,
         path.ref.pointer,
@@ -6599,7 +7385,7 @@ class NSString extends NSObject {
   /// stringWithContentsOfURL:encoding:error:
   static NSString? stringWithContentsOfURL_encoding_error_(
       NSURL url, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         _class_NSString,
         _sel_stringWithContentsOfURL_encoding_error_,
         url.ref.pointer,
@@ -6615,7 +7401,7 @@ class NSString extends NSObject {
       NSURL url,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         _class_NSString,
         _sel_stringWithContentsOfURL_usedEncoding_error_,
         url.ref.pointer,
@@ -6628,14 +7414,14 @@ class NSString extends NSObject {
 
   /// stringWithFormat:
   static NSString stringWithFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSString, _sel_stringWithFormat_, format.ref.pointer);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// stringWithString:
   static NSString stringWithString_(NSString string) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSString, _sel_stringWithString_, string.ref.pointer);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -6643,7 +7429,7 @@ class NSString extends NSObject {
   /// stringWithUTF8String:
   static NSString? stringWithUTF8String_(
       ffi.Pointer<ffi.Char> nullTerminatedCString) {
-    final _ret = _objc_msgSend_rqwdif(
+    final _ret = _objc_msgSend_56zxyn(
         _class_NSString, _sel_stringWithUTF8String_, nullTerminatedCString);
     return _ret.address == 0
         ? null
@@ -6655,7 +7441,7 @@ class NSString extends NSObject {
       NSString format,
       NSString validFormatSpecifiers,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSString,
         _sel_stringWithValidatedFormat_validFormatSpecifiers_error_,
         format.ref.pointer,
@@ -6673,7 +7459,7 @@ class NSString extends NSObject {
 
   /// autorelease
   NSString autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -6685,21 +7471,21 @@ class NSString extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// init
   NSString init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBytes:length:encoding:
   NSString? initWithBytes_length_encoding_(
       ffi.Pointer<ffi.Void> bytes, int len, int encoding) {
-    final _ret = _objc_msgSend_i38ton(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_9b3h4v(this.ref.retainAndReturnPointer(),
         _sel_initWithBytes_length_encoding_, bytes, len, encoding);
     return _ret.address == 0
         ? null
@@ -6709,7 +7495,7 @@ class NSString extends NSObject {
   /// initWithBytesNoCopy:length:encoding:freeWhenDone:
   NSString? initWithBytesNoCopy_length_encoding_freeWhenDone_(
       ffi.Pointer<ffi.Void> bytes, int len, int encoding, bool freeBuffer) {
-    final _ret = _objc_msgSend_o2ktnn(
+    final _ret = _objc_msgSend_k4j8m3(
         this.ref.retainAndReturnPointer(),
         _sel_initWithBytesNoCopy_length_encoding_freeWhenDone_,
         bytes,
@@ -6724,7 +7510,7 @@ class NSString extends NSObject {
   /// initWithCString:encoding:
   NSString? initWithCString_encoding_(
       ffi.Pointer<ffi.Char> nullTerminatedCString, int encoding) {
-    final _ret = _objc_msgSend_a15xhc(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_erqryg(this.ref.retainAndReturnPointer(),
         _sel_initWithCString_encoding_, nullTerminatedCString, encoding);
     return _ret.address == 0
         ? null
@@ -6734,7 +7520,7 @@ class NSString extends NSObject {
   /// initWithCharacters:length:
   NSString initWithCharacters_length_(
       ffi.Pointer<ffi.UnsignedShort> characters, int length) {
-    final _ret = _objc_msgSend_13z9dkp(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_9x4k8x(this.ref.retainAndReturnPointer(),
         _sel_initWithCharacters_length_, characters, length);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
@@ -6742,7 +7528,7 @@ class NSString extends NSObject {
   /// initWithCharactersNoCopy:length:freeWhenDone:
   NSString initWithCharactersNoCopy_length_freeWhenDone_(
       ffi.Pointer<ffi.UnsignedShort> characters, int length, bool freeBuffer) {
-    final _ret = _objc_msgSend_zsd8q9(
+    final _ret = _objc_msgSend_lh0jh5(
         this.ref.retainAndReturnPointer(),
         _sel_initWithCharactersNoCopy_length_freeWhenDone_,
         characters,
@@ -6753,7 +7539,7 @@ class NSString extends NSObject {
 
   /// initWithCoder:
   NSString? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -6763,7 +7549,7 @@ class NSString extends NSObject {
   /// initWithContentsOfFile:encoding:error:
   NSString? initWithContentsOfFile_encoding_error_(
       NSString path, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_encoding_error_,
         path.ref.pointer,
@@ -6779,7 +7565,7 @@ class NSString extends NSObject {
       NSString path,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfFile_usedEncoding_error_,
         path.ref.pointer,
@@ -6793,7 +7579,7 @@ class NSString extends NSObject {
   /// initWithContentsOfURL:encoding:error:
   NSString? initWithContentsOfURL_encoding_error_(
       NSURL url, int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_94cet5(
+    final _ret = _objc_msgSend_1nomli1(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_encoding_error_,
         url.ref.pointer,
@@ -6809,7 +7595,7 @@ class NSString extends NSObject {
       NSURL url,
       ffi.Pointer<ffi.UnsignedLong> enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1gxo8gv(
+    final _ret = _objc_msgSend_1alewu7(
         this.ref.retainAndReturnPointer(),
         _sel_initWithContentsOfURL_usedEncoding_error_,
         url.ref.pointer,
@@ -6822,7 +7608,7 @@ class NSString extends NSObject {
 
   /// initWithData:encoding:
   NSString? initWithData_encoding_(NSData data, int encoding) {
-    final _ret = _objc_msgSend_dcd68g(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1k4kd9s(this.ref.retainAndReturnPointer(),
         _sel_initWithData_encoding_, data.ref.pointer, encoding);
     return _ret.address == 0
         ? null
@@ -6831,7 +7617,7 @@ class NSString extends NSObject {
 
   /// initWithFormat:
   NSString initWithFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithFormat_, format.ref.pointer);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
@@ -6839,7 +7625,7 @@ class NSString extends NSObject {
   /// initWithFormat:locale:
   NSString initWithFormat_locale_(
       NSString format, objc.ObjCObjectBase? locale) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initWithFormat_locale_,
         format.ref.pointer,
@@ -6849,14 +7635,14 @@ class NSString extends NSObject {
 
   /// initWithString:
   NSString initWithString_(NSString aString) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithString_, aString.ref.pointer);
     return NSString.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithUTF8String:
   NSString? initWithUTF8String_(ffi.Pointer<ffi.Char> nullTerminatedCString) {
-    final _ret = _objc_msgSend_rqwdif(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_56zxyn(this.ref.retainAndReturnPointer(),
         _sel_initWithUTF8String_, nullTerminatedCString);
     return _ret.address == 0
         ? null
@@ -6868,7 +7654,7 @@ class NSString extends NSObject {
       NSString format,
       NSString validFormatSpecifiers,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         this.ref.retainAndReturnPointer(),
         _sel_initWithValidatedFormat_validFormatSpecifiers_error_,
         format.ref.pointer,
@@ -6885,7 +7671,7 @@ class NSString extends NSObject {
       NSString validFormatSpecifiers,
       objc.ObjCObjectBase? locale,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_2izev6(
+    final _ret = _objc_msgSend_1k0ezzm(
         this.ref.retainAndReturnPointer(),
         _sel_initWithValidatedFormat_validFormatSpecifiers_locale_error_,
         format.ref.pointer,
@@ -6904,13 +7690,13 @@ class NSString extends NSObject {
 
   /// retain
   NSString retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSString self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -7006,7 +7792,7 @@ extension NSStringExtensionMethods on NSString {
 
   /// localizedNameOfStringEncoding:
   static NSString localizedNameOfStringEncoding_(int encoding) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         _class_NSString, _sel_localizedNameOfStringEncoding_, encoding);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7036,20 +7822,20 @@ extension NSStringExtensionMethods on NSString {
   /// capitalizedString
   NSString get capitalizedString {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_capitalizedString);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_capitalizedString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// capitalizedStringWithLocale:
   NSString capitalizedStringWithLocale_(NSLocale? locale) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_capitalizedStringWithLocale_, locale?.ref.pointer ?? ffi.nullptr);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// caseInsensitiveCompare:
   NSComparisonResult caseInsensitiveCompare_(NSString string) {
-    final _ret = _objc_msgSend_1wpduvy(
+    final _ret = _objc_msgSend_1ym6zyw(
         this.ref.pointer, _sel_caseInsensitiveCompare_, string.ref.pointer);
     return NSComparisonResult.fromValue(_ret);
   }
@@ -7057,14 +7843,14 @@ extension NSStringExtensionMethods on NSString {
   /// commonPrefixWithString:options:
   NSString commonPrefixWithString_options_(
       NSString str, NSStringCompareOptions mask) {
-    final _ret = _objc_msgSend_fcs5vo(this.ref.pointer,
+    final _ret = _objc_msgSend_diypgk(this.ref.pointer,
         _sel_commonPrefixWithString_options_, str.ref.pointer, mask.value);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// compare:
   NSComparisonResult compare_(NSString string) {
-    final _ret = _objc_msgSend_1wpduvy(
+    final _ret = _objc_msgSend_1ym6zyw(
         this.ref.pointer, _sel_compare_, string.ref.pointer);
     return NSComparisonResult.fromValue(_ret);
   }
@@ -7072,7 +7858,7 @@ extension NSStringExtensionMethods on NSString {
   /// compare:options:
   NSComparisonResult compare_options_(
       NSString string, NSStringCompareOptions mask) {
-    final _ret = _objc_msgSend_16ydezh(this.ref.pointer, _sel_compare_options_,
+    final _ret = _objc_msgSend_pg1fnv(this.ref.pointer, _sel_compare_options_,
         string.ref.pointer, mask.value);
     return NSComparisonResult.fromValue(_ret);
   }
@@ -7080,7 +7866,7 @@ extension NSStringExtensionMethods on NSString {
   /// compare:options:range:
   NSComparisonResult compare_options_range_(NSString string,
       NSStringCompareOptions mask, NSRange rangeOfReceiverToCompare) {
-    final _ret = _objc_msgSend_eeuxub(
+    final _ret = _objc_msgSend_xrqic1(
         this.ref.pointer,
         _sel_compare_options_range_,
         string.ref.pointer,
@@ -7095,7 +7881,7 @@ extension NSStringExtensionMethods on NSString {
       NSStringCompareOptions mask,
       NSRange rangeOfReceiverToCompare,
       objc.ObjCObjectBase? locale) {
-    final _ret = _objc_msgSend_i4hdht(
+    final _ret = _objc_msgSend_1895u4n(
         this.ref.pointer,
         _sel_compare_options_range_locale_,
         string.ref.pointer,
@@ -7107,27 +7893,27 @@ extension NSStringExtensionMethods on NSString {
 
   /// componentsSeparatedByCharactersInSet:
   NSArray componentsSeparatedByCharactersInSet_(NSCharacterSet separator) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_componentsSeparatedByCharactersInSet_, separator.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// componentsSeparatedByString:
   NSArray componentsSeparatedByString_(NSString separator) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_componentsSeparatedByString_, separator.ref.pointer);
     return NSArray.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// containsString:
   bool containsString_(NSString str) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_containsString_, str.ref.pointer);
   }
 
   /// dataUsingEncoding:
   NSData? dataUsingEncoding_(int encoding) {
-    final _ret = _objc_msgSend_1qrcblu(
+    final _ret = _objc_msgSend_14hpxwa(
         this.ref.pointer, _sel_dataUsingEncoding_, encoding);
     return _ret.address == 0
         ? null
@@ -7136,7 +7922,7 @@ extension NSStringExtensionMethods on NSString {
 
   /// dataUsingEncoding:allowLossyConversion:
   NSData? dataUsingEncoding_allowLossyConversion_(int encoding, bool lossy) {
-    final _ret = _objc_msgSend_rubz6a(this.ref.pointer,
+    final _ret = _objc_msgSend_hiwitm(this.ref.pointer,
         _sel_dataUsingEncoding_allowLossyConversion_, encoding, lossy);
     return _ret.address == 0
         ? null
@@ -7145,21 +7931,21 @@ extension NSStringExtensionMethods on NSString {
 
   /// decomposedStringWithCanonicalMapping
   NSString get decomposedStringWithCanonicalMapping {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.pointer, _sel_decomposedStringWithCanonicalMapping);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// decomposedStringWithCompatibilityMapping
   NSString get decomposedStringWithCompatibilityMapping {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.pointer, _sel_decomposedStringWithCompatibilityMapping);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// description
   NSString get description {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_description);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_description);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -7249,13 +8035,13 @@ extension NSStringExtensionMethods on NSString {
 
   /// hasPrefix:
   bool hasPrefix_(NSString str) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_hasPrefix_, str.ref.pointer);
   }
 
   /// hasSuffix:
   bool hasSuffix_(NSString str) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_hasSuffix_, str.ref.pointer);
   }
 
@@ -7276,7 +8062,7 @@ extension NSStringExtensionMethods on NSString {
 
   /// isEqualToString:
   bool isEqualToString_(NSString aString) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         this.ref.pointer, _sel_isEqualToString_, aString.ref.pointer);
   }
 
@@ -7302,27 +8088,27 @@ extension NSStringExtensionMethods on NSString {
 
   /// localizedCapitalizedString
   NSString get localizedCapitalizedString {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.pointer, _sel_localizedCapitalizedString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// localizedCaseInsensitiveCompare:
   NSComparisonResult localizedCaseInsensitiveCompare_(NSString string) {
-    final _ret = _objc_msgSend_1wpduvy(this.ref.pointer,
+    final _ret = _objc_msgSend_1ym6zyw(this.ref.pointer,
         _sel_localizedCaseInsensitiveCompare_, string.ref.pointer);
     return NSComparisonResult.fromValue(_ret);
   }
 
   /// localizedCaseInsensitiveContainsString:
   bool localizedCaseInsensitiveContainsString_(NSString str) {
-    return _objc_msgSend_69e0x1(this.ref.pointer,
+    return _objc_msgSend_19nvye5(this.ref.pointer,
         _sel_localizedCaseInsensitiveContainsString_, str.ref.pointer);
   }
 
   /// localizedCompare:
   NSComparisonResult localizedCompare_(NSString string) {
-    final _ret = _objc_msgSend_1wpduvy(
+    final _ret = _objc_msgSend_1ym6zyw(
         this.ref.pointer, _sel_localizedCompare_, string.ref.pointer);
     return NSComparisonResult.fromValue(_ret);
   }
@@ -7330,20 +8116,20 @@ extension NSStringExtensionMethods on NSString {
   /// localizedLowercaseString
   NSString get localizedLowercaseString {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_localizedLowercaseString);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_localizedLowercaseString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// localizedStandardCompare:
   NSComparisonResult localizedStandardCompare_(NSString string) {
-    final _ret = _objc_msgSend_1wpduvy(
+    final _ret = _objc_msgSend_1ym6zyw(
         this.ref.pointer, _sel_localizedStandardCompare_, string.ref.pointer);
     return NSComparisonResult.fromValue(_ret);
   }
 
   /// localizedStandardContainsString:
   bool localizedStandardContainsString_(NSString str) {
-    return _objc_msgSend_69e0x1(this.ref.pointer,
+    return _objc_msgSend_19nvye5(this.ref.pointer,
         _sel_localizedStandardContainsString_, str.ref.pointer);
   }
 
@@ -7351,9 +8137,9 @@ extension NSStringExtensionMethods on NSString {
   NSRange localizedStandardRangeOfString_(NSString str) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_x4muu7Stret(_ptr, this.ref.pointer,
+        ? _objc_msgSend_182fzonStret(_ptr, this.ref.pointer,
             _sel_localizedStandardRangeOfString_, str.ref.pointer)
-        : _ptr.ref = _objc_msgSend_x4muu7(this.ref.pointer,
+        : _ptr.ref = _objc_msgSend_182fzon(this.ref.pointer,
             _sel_localizedStandardRangeOfString_, str.ref.pointer);
     final _finalizable = _ptr.cast<ffi.Uint8>().asTypedList(
         ffi.sizeOf<NSRange>(),
@@ -7364,7 +8150,7 @@ extension NSStringExtensionMethods on NSString {
   /// localizedUppercaseString
   NSString get localizedUppercaseString {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_localizedUppercaseString);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_localizedUppercaseString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -7375,13 +8161,13 @@ extension NSStringExtensionMethods on NSString {
 
   /// lowercaseString
   NSString get lowercaseString {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_lowercaseString);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_lowercaseString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// lowercaseStringWithLocale:
   NSString lowercaseStringWithLocale_(NSLocale? locale) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_lowercaseStringWithLocale_, locale?.ref.pointer ?? ffi.nullptr);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7408,14 +8194,14 @@ extension NSStringExtensionMethods on NSString {
 
   /// precomposedStringWithCanonicalMapping
   NSString get precomposedStringWithCanonicalMapping {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.pointer, _sel_precomposedStringWithCanonicalMapping);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// precomposedStringWithCompatibilityMapping
   NSString get precomposedStringWithCompatibilityMapping {
-    final _ret = _objc_msgSend_1x359cv(
+    final _ret = _objc_msgSend_151sglz(
         this.ref.pointer, _sel_precomposedStringWithCompatibilityMapping);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7424,9 +8210,9 @@ extension NSStringExtensionMethods on NSString {
   NSRange rangeOfCharacterFromSet_(NSCharacterSet searchSet) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_x4muu7Stret(_ptr, this.ref.pointer,
+        ? _objc_msgSend_182fzonStret(_ptr, this.ref.pointer,
             _sel_rangeOfCharacterFromSet_, searchSet.ref.pointer)
-        : _ptr.ref = _objc_msgSend_x4muu7(this.ref.pointer,
+        : _ptr.ref = _objc_msgSend_182fzon(this.ref.pointer,
             _sel_rangeOfCharacterFromSet_, searchSet.ref.pointer);
     final _finalizable = _ptr.cast<ffi.Uint8>().asTypedList(
         ffi.sizeOf<NSRange>(),
@@ -7439,13 +8225,13 @@ extension NSStringExtensionMethods on NSString {
       NSCharacterSet searchSet, NSStringCompareOptions mask) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_1kwndnwStret(
+        ? _objc_msgSend_102xxo4Stret(
             _ptr,
             this.ref.pointer,
             _sel_rangeOfCharacterFromSet_options_,
             searchSet.ref.pointer,
             mask.value)
-        : _ptr.ref = _objc_msgSend_1kwndnw(
+        : _ptr.ref = _objc_msgSend_102xxo4(
             this.ref.pointer,
             _sel_rangeOfCharacterFromSet_options_,
             searchSet.ref.pointer,
@@ -7461,14 +8247,14 @@ extension NSStringExtensionMethods on NSString {
       NSStringCompareOptions mask, NSRange rangeOfReceiverToSearch) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_ackzikStret(
+        ? _objc_msgSend_1nmlvqcStret(
             _ptr,
             this.ref.pointer,
             _sel_rangeOfCharacterFromSet_options_range_,
             searchSet.ref.pointer,
             mask.value,
             rangeOfReceiverToSearch)
-        : _ptr.ref = _objc_msgSend_ackzik(
+        : _ptr.ref = _objc_msgSend_1nmlvqc(
             this.ref.pointer,
             _sel_rangeOfCharacterFromSet_options_range_,
             searchSet.ref.pointer,
@@ -7512,9 +8298,9 @@ extension NSStringExtensionMethods on NSString {
   NSRange rangeOfString_(NSString searchString) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_x4muu7Stret(_ptr, this.ref.pointer, _sel_rangeOfString_,
-            searchString.ref.pointer)
-        : _ptr.ref = _objc_msgSend_x4muu7(
+        ? _objc_msgSend_182fzonStret(_ptr, this.ref.pointer,
+            _sel_rangeOfString_, searchString.ref.pointer)
+        : _ptr.ref = _objc_msgSend_182fzon(
             this.ref.pointer, _sel_rangeOfString_, searchString.ref.pointer);
     final _finalizable = _ptr.cast<ffi.Uint8>().asTypedList(
         ffi.sizeOf<NSRange>(),
@@ -7527,9 +8313,9 @@ extension NSStringExtensionMethods on NSString {
       NSString searchString, NSStringCompareOptions mask) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_1kwndnwStret(_ptr, this.ref.pointer,
+        ? _objc_msgSend_102xxo4Stret(_ptr, this.ref.pointer,
             _sel_rangeOfString_options_, searchString.ref.pointer, mask.value)
-        : _ptr.ref = _objc_msgSend_1kwndnw(this.ref.pointer,
+        : _ptr.ref = _objc_msgSend_102xxo4(this.ref.pointer,
             _sel_rangeOfString_options_, searchString.ref.pointer, mask.value);
     final _finalizable = _ptr.cast<ffi.Uint8>().asTypedList(
         ffi.sizeOf<NSRange>(),
@@ -7542,14 +8328,14 @@ extension NSStringExtensionMethods on NSString {
       NSStringCompareOptions mask, NSRange rangeOfReceiverToSearch) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_ackzikStret(
+        ? _objc_msgSend_1nmlvqcStret(
             _ptr,
             this.ref.pointer,
             _sel_rangeOfString_options_range_,
             searchString.ref.pointer,
             mask.value,
             rangeOfReceiverToSearch)
-        : _ptr.ref = _objc_msgSend_ackzik(
+        : _ptr.ref = _objc_msgSend_1nmlvqc(
             this.ref.pointer,
             _sel_rangeOfString_options_range_,
             searchString.ref.pointer,
@@ -7569,7 +8355,7 @@ extension NSStringExtensionMethods on NSString {
       NSLocale? locale) {
     final _ptr = pkg_ffi.calloc<NSRange>();
     objc.useMsgSendVariants
-        ? _objc_msgSend_198mga8Stret(
+        ? _objc_msgSend_gg0462Stret(
             _ptr,
             this.ref.pointer,
             _sel_rangeOfString_options_range_locale_,
@@ -7577,7 +8363,7 @@ extension NSStringExtensionMethods on NSString {
             mask.value,
             rangeOfReceiverToSearch,
             locale?.ref.pointer ?? ffi.nullptr)
-        : _ptr.ref = _objc_msgSend_198mga8(
+        : _ptr.ref = _objc_msgSend_gg0462(
             this.ref.pointer,
             _sel_rangeOfString_options_range_locale_,
             searchString.ref.pointer,
@@ -7597,14 +8383,14 @@ extension NSStringExtensionMethods on NSString {
 
   /// stringByAppendingFormat:
   NSString stringByAppendingFormat_(NSString format) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.pointer, _sel_stringByAppendingFormat_, format.ref.pointer);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// stringByAppendingString:
   NSString stringByAppendingString_(NSString aString) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         this.ref.pointer, _sel_stringByAppendingString_, aString.ref.pointer);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7612,7 +8398,7 @@ extension NSStringExtensionMethods on NSString {
   /// stringByApplyingTransform:reverse:
   NSString? stringByApplyingTransform_reverse_(
       NSString transform, bool reverse) {
-    final _ret = _objc_msgSend_1bdmr5f(
+    final _ret = _objc_msgSend_17amj0z(
         this.ref.pointer,
         _sel_stringByApplyingTransform_reverse_,
         transform.ref.pointer,
@@ -7625,7 +8411,7 @@ extension NSStringExtensionMethods on NSString {
   /// stringByFoldingWithOptions:locale:
   NSString stringByFoldingWithOptions_locale_(
       NSStringCompareOptions options, NSLocale? locale) {
-    final _ret = _objc_msgSend_146986e(
+    final _ret = _objc_msgSend_11cbyu0(
         this.ref.pointer,
         _sel_stringByFoldingWithOptions_locale_,
         options.value,
@@ -7636,7 +8422,7 @@ extension NSStringExtensionMethods on NSString {
   /// stringByPaddingToLength:withString:startingAtIndex:
   NSString stringByPaddingToLength_withString_startingAtIndex_(
       int newLength, NSString padString, int padIndex) {
-    final _ret = _objc_msgSend_exgdqb(
+    final _ret = _objc_msgSend_1tfztp(
         this.ref.pointer,
         _sel_stringByPaddingToLength_withString_startingAtIndex_,
         newLength,
@@ -7648,7 +8434,7 @@ extension NSStringExtensionMethods on NSString {
   /// stringByReplacingCharactersInRange:withString:
   NSString stringByReplacingCharactersInRange_withString_(
       NSRange range, NSString replacement) {
-    final _ret = _objc_msgSend_197wcu5(
+    final _ret = _objc_msgSend_bstjp9(
         this.ref.pointer,
         _sel_stringByReplacingCharactersInRange_withString_,
         range,
@@ -7659,7 +8445,7 @@ extension NSStringExtensionMethods on NSString {
   /// stringByReplacingOccurrencesOfString:withString:
   NSString stringByReplacingOccurrencesOfString_withString_(
       NSString target, NSString replacement) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.pointer,
         _sel_stringByReplacingOccurrencesOfString_withString_,
         target.ref.pointer,
@@ -7673,7 +8459,7 @@ extension NSStringExtensionMethods on NSString {
       NSString replacement,
       NSStringCompareOptions options,
       NSRange searchRange) {
-    final _ret = _objc_msgSend_1wrs2o6(
+    final _ret = _objc_msgSend_2u4jm6(
         this.ref.pointer,
         _sel_stringByReplacingOccurrencesOfString_withString_options_range_,
         target.ref.pointer,
@@ -7685,7 +8471,7 @@ extension NSStringExtensionMethods on NSString {
 
   /// stringByTrimmingCharactersInSet:
   NSString stringByTrimmingCharactersInSet_(NSCharacterSet set) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_stringByTrimmingCharactersInSet_, set.ref.pointer);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7693,33 +8479,33 @@ extension NSStringExtensionMethods on NSString {
   /// substringFromIndex:
   NSString substringFromIndex_(int from) {
     final _ret =
-        _objc_msgSend_1qrcblu(this.ref.pointer, _sel_substringFromIndex_, from);
+        _objc_msgSend_14hpxwa(this.ref.pointer, _sel_substringFromIndex_, from);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// substringToIndex:
   NSString substringToIndex_(int to) {
     final _ret =
-        _objc_msgSend_1qrcblu(this.ref.pointer, _sel_substringToIndex_, to);
+        _objc_msgSend_14hpxwa(this.ref.pointer, _sel_substringToIndex_, to);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// substringWithRange:
   NSString substringWithRange_(NSRange range) {
-    final _ret =
-        _objc_msgSend_83z673(this.ref.pointer, _sel_substringWithRange_, range);
+    final _ret = _objc_msgSend_1k1o1s7(
+        this.ref.pointer, _sel_substringWithRange_, range);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// uppercaseString
   NSString get uppercaseString {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_uppercaseString);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_uppercaseString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// uppercaseStringWithLocale:
   NSString uppercaseStringWithLocale_(NSLocale? locale) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.pointer,
+    final _ret = _objc_msgSend_1sotr3r(this.ref.pointer,
         _sel_uppercaseStringWithLocale_, locale?.ref.pointer ?? ffi.nullptr);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7730,7 +8516,7 @@ extension NSStringExtensionMethods on NSString {
       bool useAuxiliaryFile,
       int enc,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    return _objc_msgSend_1140663(
+    return _objc_msgSend_dv3z6r(
         this.ref.pointer,
         _sel_writeToFile_atomically_encoding_error_,
         path.ref.pointer,
@@ -7742,7 +8528,7 @@ extension NSStringExtensionMethods on NSString {
   /// writeToURL:atomically:encoding:error:
   bool writeToURL_atomically_encoding_error_(NSURL url, bool useAuxiliaryFile,
       int enc, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    return _objc_msgSend_1140663(
+    return _objc_msgSend_dv3z6r(
         this.ref.pointer,
         _sel_writeToURL_atomically_encoding_error_,
         url.ref.pointer,
@@ -7769,7 +8555,7 @@ class NSURL extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSURL].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSURL);
   }
 
@@ -7778,7 +8564,7 @@ class NSURL extends NSObject {
       NSURL url,
       NSURLBookmarkResolutionOptions options,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_pdn1fa(
+    final _ret = _objc_msgSend_1tiux5i(
         _class_NSURL,
         _sel_URLByResolvingAliasFileAtURL_options_error_,
         url.ref.pointer,
@@ -7797,7 +8583,7 @@ class NSURL extends NSObject {
           NSURL? relativeURL,
           ffi.Pointer<ffi.Bool> isStale,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_3ems5q(
+    final _ret = _objc_msgSend_1ceswyu(
         _class_NSURL,
         _sel_URLByResolvingBookmarkData_options_relativeToURL_bookmarkDataIsStale_error_,
         bookmarkData.ref.pointer,
@@ -7813,7 +8599,7 @@ class NSURL extends NSObject {
   /// URLWithDataRepresentation:relativeToURL:
   static NSURL URLWithDataRepresentation_relativeToURL_(
       NSData data, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSURL,
         _sel_URLWithDataRepresentation_relativeToURL_,
         data.ref.pointer,
@@ -7823,7 +8609,7 @@ class NSURL extends NSObject {
 
   /// URLWithString:
   static NSURL? URLWithString_(NSString URLString) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSURL, _sel_URLWithString_, URLString.ref.pointer);
     return _ret.address == 0
         ? null
@@ -7833,7 +8619,7 @@ class NSURL extends NSObject {
   /// URLWithString:encodingInvalidCharacters:
   static NSURL? URLWithString_encodingInvalidCharacters_(
       NSString URLString, bool encodingInvalidCharacters) {
-    final _ret = _objc_msgSend_1bdmr5f(
+    final _ret = _objc_msgSend_17amj0z(
         _class_NSURL,
         _sel_URLWithString_encodingInvalidCharacters_,
         URLString.ref.pointer,
@@ -7846,7 +8632,7 @@ class NSURL extends NSObject {
   /// URLWithString:relativeToURL:
   static NSURL? URLWithString_relativeToURL_(
       NSString URLString, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSURL,
         _sel_URLWithString_relativeToURL_,
         URLString.ref.pointer,
@@ -7859,7 +8645,7 @@ class NSURL extends NSObject {
   /// absoluteURLWithDataRepresentation:relativeToURL:
   static NSURL absoluteURLWithDataRepresentation_relativeToURL_(
       NSData data, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSURL,
         _sel_absoluteURLWithDataRepresentation_relativeToURL_,
         data.ref.pointer,
@@ -7869,20 +8655,20 @@ class NSURL extends NSObject {
 
   /// alloc
   static NSURL alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSURL, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSURL, _sel_alloc);
     return NSURL.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSURL allocWithZone_(ffi.Pointer<_NSZone> zone) {
-    final _ret = _objc_msgSend_hzlb60(_class_NSURL, _sel_allocWithZone_, zone);
+    final _ret = _objc_msgSend_1cwp428(_class_NSURL, _sel_allocWithZone_, zone);
     return NSURL.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// bookmarkDataWithContentsOfURL:error:
   static NSData? bookmarkDataWithContentsOfURL_error_(
       NSURL bookmarkFileURL, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1705co6(
+    final _ret = _objc_msgSend_1lhpu4m(
         _class_NSURL,
         _sel_bookmarkDataWithContentsOfURL_error_,
         bookmarkFileURL.ref.pointer,
@@ -7895,7 +8681,7 @@ class NSURL extends NSObject {
   /// fileURLWithFileSystemRepresentation:isDirectory:relativeToURL:
   static NSURL fileURLWithFileSystemRepresentation_isDirectory_relativeToURL_(
       ffi.Pointer<ffi.Char> path, bool isDir, NSURL? baseURL) {
-    final _ret = _objc_msgSend_qid8e9(
+    final _ret = _objc_msgSend_1n40f6p(
         _class_NSURL,
         _sel_fileURLWithFileSystemRepresentation_isDirectory_relativeToURL_,
         path,
@@ -7906,14 +8692,14 @@ class NSURL extends NSObject {
 
   /// fileURLWithPath:
   static NSURL fileURLWithPath_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(
+    final _ret = _objc_msgSend_1sotr3r(
         _class_NSURL, _sel_fileURLWithPath_, path.ref.pointer);
     return NSURL.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// fileURLWithPath:isDirectory:
   static NSURL fileURLWithPath_isDirectory_(NSString path, bool isDir) {
-    final _ret = _objc_msgSend_1bdmr5f(_class_NSURL,
+    final _ret = _objc_msgSend_17amj0z(_class_NSURL,
         _sel_fileURLWithPath_isDirectory_, path.ref.pointer, isDir);
     return NSURL.castFromPointer(_ret, retain: true, release: true);
   }
@@ -7921,7 +8707,7 @@ class NSURL extends NSObject {
   /// fileURLWithPath:isDirectory:relativeToURL:
   static NSURL fileURLWithPath_isDirectory_relativeToURL_(
       NSString path, bool isDir, NSURL? baseURL) {
-    final _ret = _objc_msgSend_19v53ht(
+    final _ret = _objc_msgSend_1ged0jd(
         _class_NSURL,
         _sel_fileURLWithPath_isDirectory_relativeToURL_,
         path.ref.pointer,
@@ -7932,7 +8718,7 @@ class NSURL extends NSObject {
 
   /// fileURLWithPath:relativeToURL:
   static NSURL fileURLWithPath_relativeToURL_(NSString path, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSURL,
         _sel_fileURLWithPath_relativeToURL_,
         path.ref.pointer,
@@ -7942,7 +8728,7 @@ class NSURL extends NSObject {
 
   /// new
   static NSURL new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSURL, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSURL, _sel_new);
     return NSURL.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -7951,7 +8737,7 @@ class NSURL extends NSObject {
       NSData data,
       NSString typeIdentifier,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> outError) {
-    final _ret = _objc_msgSend_bo6ep4(
+    final _ret = _objc_msgSend_1pnyuds(
         _class_NSURL,
         _sel_objectWithItemProviderData_typeIdentifier_error_,
         data.ref.pointer,
@@ -7965,7 +8751,7 @@ class NSURL extends NSObject {
   /// resourceValuesForKeys:fromBookmarkData:
   static objc.ObjCObjectBase? resourceValuesForKeys_fromBookmarkData_(
       NSArray keys, NSData bookmarkData) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         _class_NSURL,
         _sel_resourceValuesForKeys_fromBookmarkData_,
         keys.ref.pointer,
@@ -7986,7 +8772,7 @@ class NSURL extends NSObject {
       NSURL bookmarkFileURL,
       int options,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    return _objc_msgSend_vdkl2d(
+    return _objc_msgSend_1vxoo9h(
         _class_NSURL,
         _sel_writeBookmarkData_toURL_options_error_,
         bookmarkData.ref.pointer,
@@ -7997,7 +8783,7 @@ class NSURL extends NSObject {
 
   /// absoluteString
   NSString? get absoluteString {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_absoluteString);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_absoluteString);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8005,7 +8791,7 @@ class NSURL extends NSObject {
 
   /// absoluteURL
   NSURL? get absoluteURL {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_absoluteURL);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_absoluteURL);
     return _ret.address == 0
         ? null
         : NSURL.castFromPointer(_ret, retain: true, release: true);
@@ -8013,7 +8799,7 @@ class NSURL extends NSObject {
 
   /// baseURL
   NSURL? get baseURL {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_baseURL);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_baseURL);
     return _ret.address == 0
         ? null
         : NSURL.castFromPointer(_ret, retain: true, release: true);
@@ -8026,7 +8812,7 @@ class NSURL extends NSObject {
           NSArray? keys,
           NSURL? relativeURL,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1uj57oj(
+    final _ret = _objc_msgSend_1wt9a7r(
         this.ref.pointer,
         _sel_bookmarkDataWithOptions_includingResourceValuesForKeys_relativeToURL_error_,
         options.value,
@@ -8041,19 +8827,19 @@ class NSURL extends NSObject {
   /// dataRepresentation
   NSData get dataRepresentation {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_dataRepresentation);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_dataRepresentation);
     return NSData.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
   /// filePathURL
   NSURL? get filePathURL {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_filePathURL);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_filePathURL);
     return _ret.address == 0
         ? null
         : NSURL.castFromPointer(_ret, retain: true, release: true);
@@ -8061,7 +8847,7 @@ class NSURL extends NSObject {
 
   /// fileReferenceURL
   NSURL? fileReferenceURL() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_fileReferenceURL);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_fileReferenceURL);
     return _ret.address == 0
         ? null
         : NSURL.castFromPointer(_ret, retain: true, release: true);
@@ -8075,7 +8861,7 @@ class NSURL extends NSObject {
 
   /// fragment
   NSString? get fragment {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_fragment);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_fragment);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8093,7 +8879,7 @@ class NSURL extends NSObject {
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> value,
       NSString key,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    return _objc_msgSend_7iv28v(this.ref.pointer,
+    return _objc_msgSend_1j9bhml(this.ref.pointer,
         _sel_getResourceValue_forKey_error_, value, key.ref.pointer, error);
   }
 
@@ -8104,7 +8890,7 @@ class NSURL extends NSObject {
 
   /// host
   NSString? get host {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_host);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_host);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8113,14 +8899,14 @@ class NSURL extends NSObject {
   /// init
   NSURL init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSURL.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initAbsoluteURLWithDataRepresentation:relativeToURL:
   NSURL initAbsoluteURLWithDataRepresentation_relativeToURL_(
       NSData data, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initAbsoluteURLWithDataRepresentation_relativeToURL_,
         data.ref.pointer,
@@ -8136,7 +8922,7 @@ class NSURL extends NSObject {
           NSURL? relativeURL,
           ffi.Pointer<ffi.Bool> isStale,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_3ems5q(
+    final _ret = _objc_msgSend_1ceswyu(
         this.ref.retainAndReturnPointer(),
         _sel_initByResolvingBookmarkData_options_relativeToURL_bookmarkDataIsStale_error_,
         bookmarkData.ref.pointer,
@@ -8152,7 +8938,7 @@ class NSURL extends NSObject {
   /// initFileURLWithFileSystemRepresentation:isDirectory:relativeToURL:
   NSURL initFileURLWithFileSystemRepresentation_isDirectory_relativeToURL_(
       ffi.Pointer<ffi.Char> path, bool isDir, NSURL? baseURL) {
-    final _ret = _objc_msgSend_qid8e9(
+    final _ret = _objc_msgSend_1n40f6p(
         this.ref.retainAndReturnPointer(),
         _sel_initFileURLWithFileSystemRepresentation_isDirectory_relativeToURL_,
         path,
@@ -8163,14 +8949,14 @@ class NSURL extends NSObject {
 
   /// initFileURLWithPath:
   NSURL initFileURLWithPath_(NSString path) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initFileURLWithPath_, path.ref.pointer);
     return NSURL.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initFileURLWithPath:isDirectory:
   NSURL initFileURLWithPath_isDirectory_(NSString path, bool isDir) {
-    final _ret = _objc_msgSend_1bdmr5f(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_17amj0z(this.ref.retainAndReturnPointer(),
         _sel_initFileURLWithPath_isDirectory_, path.ref.pointer, isDir);
     return NSURL.castFromPointer(_ret, retain: false, release: true);
   }
@@ -8178,7 +8964,7 @@ class NSURL extends NSObject {
   /// initFileURLWithPath:isDirectory:relativeToURL:
   NSURL initFileURLWithPath_isDirectory_relativeToURL_(
       NSString path, bool isDir, NSURL? baseURL) {
-    final _ret = _objc_msgSend_19v53ht(
+    final _ret = _objc_msgSend_1ged0jd(
         this.ref.retainAndReturnPointer(),
         _sel_initFileURLWithPath_isDirectory_relativeToURL_,
         path.ref.pointer,
@@ -8189,7 +8975,7 @@ class NSURL extends NSObject {
 
   /// initFileURLWithPath:relativeToURL:
   NSURL initFileURLWithPath_relativeToURL_(NSString path, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initFileURLWithPath_relativeToURL_,
         path.ref.pointer,
@@ -8199,7 +8985,7 @@ class NSURL extends NSObject {
 
   /// initWithCoder:
   NSURL? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -8208,7 +8994,7 @@ class NSURL extends NSObject {
 
   /// initWithDataRepresentation:relativeToURL:
   NSURL initWithDataRepresentation_relativeToURL_(NSData data, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initWithDataRepresentation_relativeToURL_,
         data.ref.pointer,
@@ -8218,7 +9004,7 @@ class NSURL extends NSObject {
 
   /// initWithString:
   NSURL? initWithString_(NSString URLString) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithString_, URLString.ref.pointer);
     return _ret.address == 0
         ? null
@@ -8228,7 +9014,7 @@ class NSURL extends NSObject {
   /// initWithString:encodingInvalidCharacters:
   NSURL? initWithString_encodingInvalidCharacters_(
       NSString URLString, bool encodingInvalidCharacters) {
-    final _ret = _objc_msgSend_1bdmr5f(
+    final _ret = _objc_msgSend_17amj0z(
         this.ref.retainAndReturnPointer(),
         _sel_initWithString_encodingInvalidCharacters_,
         URLString.ref.pointer,
@@ -8240,7 +9026,7 @@ class NSURL extends NSObject {
 
   /// initWithString:relativeToURL:
   NSURL? initWithString_relativeToURL_(NSString URLString, NSURL? baseURL) {
-    final _ret = _objc_msgSend_rsfdlh(
+    final _ret = _objc_msgSend_15qeuct(
         this.ref.retainAndReturnPointer(),
         _sel_initWithString_relativeToURL_,
         URLString.ref.pointer,
@@ -8262,7 +9048,7 @@ class NSURL extends NSObject {
 
   /// parameterString
   NSString? get parameterString {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_parameterString);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_parameterString);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8270,7 +9056,7 @@ class NSURL extends NSObject {
 
   /// password
   NSString? get password {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_password);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_password);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8278,7 +9064,7 @@ class NSURL extends NSObject {
 
   /// path
   NSString? get path {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_path);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_path);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8286,7 +9072,7 @@ class NSURL extends NSObject {
 
   /// port
   NSNumber? get port {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_port);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_port);
     return _ret.address == 0
         ? null
         : NSNumber.castFromPointer(_ret, retain: true, release: true);
@@ -8294,7 +9080,7 @@ class NSURL extends NSObject {
 
   /// query
   NSString? get query {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_query);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_query);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8302,7 +9088,7 @@ class NSURL extends NSObject {
 
   /// relativePath
   NSString? get relativePath {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_relativePath);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_relativePath);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8310,7 +9096,7 @@ class NSURL extends NSObject {
 
   /// relativeString
   NSString get relativeString {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_relativeString);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_relativeString);
     return NSString.castFromPointer(_ret, retain: true, release: true);
   }
 
@@ -8321,14 +9107,14 @@ class NSURL extends NSObject {
 
   /// removeCachedResourceValueForKey:
   void removeCachedResourceValueForKey_(NSString key) {
-    _objc_msgSend_1jdvcbf(this.ref.pointer,
+    _objc_msgSend_xtuoz7(this.ref.pointer,
         _sel_removeCachedResourceValueForKey_, key.ref.pointer);
   }
 
   /// resourceSpecifier
   NSString? get resourceSpecifier {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.pointer, _sel_resourceSpecifier);
+        _objc_msgSend_151sglz(this.ref.pointer, _sel_resourceSpecifier);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8337,7 +9123,7 @@ class NSURL extends NSObject {
   /// resourceValuesForKeys:error:
   objc.ObjCObjectBase? resourceValuesForKeys_error_(
       NSArray keys, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    final _ret = _objc_msgSend_1705co6(this.ref.pointer,
+    final _ret = _objc_msgSend_1lhpu4m(this.ref.pointer,
         _sel_resourceValuesForKeys_error_, keys.ref.pointer, error);
     return _ret.address == 0
         ? null
@@ -8346,7 +9132,7 @@ class NSURL extends NSObject {
 
   /// scheme
   NSString? get scheme {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_scheme);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_scheme);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8355,7 +9141,7 @@ class NSURL extends NSObject {
   /// setResourceValue:forKey:error:
   bool setResourceValue_forKey_error_(objc.ObjCObjectBase? value, NSString key,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    return _objc_msgSend_6h48uq(
+    return _objc_msgSend_6z4k82(
         this.ref.pointer,
         _sel_setResourceValue_forKey_error_,
         value?.ref.pointer ?? ffi.nullptr,
@@ -8366,14 +9152,14 @@ class NSURL extends NSObject {
   /// setResourceValues:error:
   bool setResourceValues_error_(objc.ObjCObjectBase keyedValues,
       ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error) {
-    return _objc_msgSend_blqzg8(this.ref.pointer, _sel_setResourceValues_error_,
+    return _objc_msgSend_l9p60w(this.ref.pointer, _sel_setResourceValues_error_,
         keyedValues.ref.pointer, error);
   }
 
   /// setTemporaryResourceValue:forKey:
   void setTemporaryResourceValue_forKey_(
       objc.ObjCObjectBase? value, NSString key) {
-    _objc_msgSend_wjvic9(
+    _objc_msgSend_pfv6jd(
         this.ref.pointer,
         _sel_setTemporaryResourceValue_forKey_,
         value?.ref.pointer ?? ffi.nullptr,
@@ -8382,7 +9168,7 @@ class NSURL extends NSObject {
 
   /// standardizedURL
   NSURL? get standardizedURL {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_standardizedURL);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_standardizedURL);
     return _ret.address == 0
         ? null
         : NSURL.castFromPointer(_ret, retain: true, release: true);
@@ -8402,7 +9188,7 @@ class NSURL extends NSObject {
 
   /// user
   NSString? get user {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_user);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_user);
     return _ret.address == 0
         ? null
         : NSString.castFromPointer(_ret, retain: true, release: true);
@@ -8468,51 +9254,51 @@ class NSURLHandle extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSURLHandle].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSURLHandle);
   }
 
   /// alloc
   static NSURLHandle alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSURLHandle, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSURLHandle, _sel_alloc);
     return NSURLHandle.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSURLHandle allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSURLHandle, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSURLHandle, _sel_allocWithZone_, zone);
     return NSURLHandle.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSURLHandle new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSURLHandle, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSURLHandle, _sel_new);
     return NSURLHandle.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// autorelease
   NSURLHandle autorelease() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_autorelease);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_autorelease);
     return NSURLHandle.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// init
   NSURLHandle init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSURLHandle.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// retain
   NSURLHandle retain() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_retain);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_retain);
     return NSURLHandle.castFromPointer(_ret, retain: true, release: true);
   }
 
   /// self
   NSURLHandle self() {
-    final _ret = _objc_msgSend_1x359cv(this.ref.pointer, _sel_self);
+    final _ret = _objc_msgSend_151sglz(this.ref.pointer, _sel_self);
     return NSURLHandle.castFromPointer(_ret, retain: true, release: true);
   }
 }
@@ -8552,26 +9338,26 @@ class NSValue extends NSObject {
 
   /// Returns whether [obj] is an instance of [NSValue].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_NSValue);
   }
 
   /// alloc
   static NSValue alloc() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSValue, _sel_alloc);
+    final _ret = _objc_msgSend_151sglz(_class_NSValue, _sel_alloc);
     return NSValue.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// allocWithZone:
   static NSValue allocWithZone_(ffi.Pointer<_NSZone> zone) {
     final _ret =
-        _objc_msgSend_hzlb60(_class_NSValue, _sel_allocWithZone_, zone);
+        _objc_msgSend_1cwp428(_class_NSValue, _sel_allocWithZone_, zone);
     return NSValue.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// new
   static NSValue new1() {
-    final _ret = _objc_msgSend_1x359cv(_class_NSValue, _sel_new);
+    final _ret = _objc_msgSend_151sglz(_class_NSValue, _sel_new);
     return NSValue.castFromPointer(_ret, retain: false, release: true);
   }
 
@@ -8582,7 +9368,7 @@ class NSValue extends NSObject {
 
   /// encodeWithCoder:
   void encodeWithCoder_(NSCoder coder) {
-    _objc_msgSend_1jdvcbf(
+    _objc_msgSend_xtuoz7(
         this.ref.pointer, _sel_encodeWithCoder_, coder.ref.pointer);
   }
 
@@ -8594,21 +9380,21 @@ class NSValue extends NSObject {
   /// init
   NSValue init() {
     final _ret =
-        _objc_msgSend_1x359cv(this.ref.retainAndReturnPointer(), _sel_init);
+        _objc_msgSend_151sglz(this.ref.retainAndReturnPointer(), _sel_init);
     return NSValue.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithBytes:objCType:
   NSValue initWithBytes_objCType_(
       ffi.Pointer<ffi.Void> value, ffi.Pointer<ffi.Char> type) {
-    final _ret = _objc_msgSend_qtxoq7(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_e9mncn(this.ref.retainAndReturnPointer(),
         _sel_initWithBytes_objCType_, value, type);
     return NSValue.castFromPointer(_ret, retain: false, release: true);
   }
 
   /// initWithCoder:
   NSValue? initWithCoder_(NSCoder coder) {
-    final _ret = _objc_msgSend_62nh5j(this.ref.retainAndReturnPointer(),
+    final _ret = _objc_msgSend_1sotr3r(this.ref.retainAndReturnPointer(),
         _sel_initWithCoder_, coder.ref.pointer);
     return _ret.address == 0
         ? null
@@ -8622,31 +9408,32 @@ class NSValue extends NSObject {
 }
 
 ffi.Pointer<objc.ObjCObject> _ObjCBlock_NSString_ffiVoid_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    block.ref.target
-        .cast<
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Pointer<objc.ObjCObject> Function(
+                        ffi.Pointer<ffi.Void> arg0)>>
+            func,
+        ffi.Pointer<ffi.Void> arg0) =>
+    func.asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>()(arg0);
+final _ObjCBlock_NSString_ffiVoid_fnPtrCallable = ffi.Pointer.fromFunction<
+    ffi.Pointer<objc.ObjCObject> Function(
+        ffi.Pointer<
             ffi.NativeFunction<
                 ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<ffi.Void> arg0)>>()
-        .asFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<ffi.Void>)>()(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_NSString_ffiVoid_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_NSString_ffiVoid_fnPtrTrampoline)
-        .cast();
+                    ffi.Pointer<ffi.Void> arg0)>>,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_NSString_ffiVoid_fnPtrTrampoline);
 ffi.Pointer<objc.ObjCObject> _ObjCBlock_NSString_ffiVoid_closureTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    (objc.getBlockClosure(block) as ffi.Pointer<objc.ObjCObject> Function(
+        ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
+        ffi.Pointer<ffi.Void> arg0) =>
+    (objc.getBlockClosure(closureId) as ffi.Pointer<objc.ObjCObject> Function(
         ffi.Pointer<ffi.Void>))(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_NSString_ffiVoid_closureCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_NSString_ffiVoid_closureTrampoline)
-        .cast();
+final _ObjCBlock_NSString_ffiVoid_closureCallable = ffi.Pointer.fromFunction<
+    ffi.Pointer<objc.ObjCObject> Function(
+        ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Int64,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_NSString_ffiVoid_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<NSString Function(ffi.Pointer<ffi.Void>)>`.
 abstract final class ObjCBlock_NSString_ffiVoid {
@@ -8669,8 +9456,8 @@ abstract final class ObjCBlock_NSString_ffiVoid {
                           ffi.Pointer<ffi.Void> arg0)>>
               ptr) =>
       objc.ObjCBlock<NSString Function(ffi.Pointer<ffi.Void>)>(
-          objc.newPointerBlock(
-              _ObjCBlock_NSString_ffiVoid_fnPtrCallable, ptr.cast()),
+          _ObjectiveCBindings_newPointerBlock_1mbt9g9(
+              _ObjCBlock_NSString_ffiVoid_fnPtrCallable.cast(), ptr.cast()),
           retain: false,
           release: true);
 
@@ -8683,9 +9470,10 @@ abstract final class ObjCBlock_NSString_ffiVoid {
           NSString Function(ffi.Pointer<ffi.Void>) fn) =>
       objc.ObjCBlock<NSString Function(ffi.Pointer<ffi.Void>)>(
           objc.newClosureBlock(
-              _ObjCBlock_NSString_ffiVoid_closureCallable,
               (ffi.Pointer<ffi.Void> arg0) =>
-                  fn(arg0).ref.retainAndAutorelease()),
+                  fn(arg0).ref.retainAndAutorelease(),
+              _ObjCBlock_NSString_ffiVoid_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_1mbt9g9),
           retain: false,
           release: true);
 }
@@ -8694,42 +9482,35 @@ abstract final class ObjCBlock_NSString_ffiVoid {
 extension ObjCBlock_NSString_ffiVoid_CallExtension
     on objc.ObjCBlock<NSString Function(ffi.Pointer<ffi.Void>)> {
   NSString call(ffi.Pointer<ffi.Void> arg0) => NSString.castFromPointer(
-      ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Pointer<objc.ObjCObject> Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0)>>()
-          .asFunction<
-              ffi.Pointer<objc.ObjCObject> Function(
-                  ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>)>()(ref.pointer, arg0),
+      _ObjectiveCBindings_invokeBlock_1mbt9g9(ref.pointer, arg0),
       retain: true,
       release: true);
 }
 
 int _ObjCBlock_NSUInteger_ffiVoid_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.UnsignedLong Function(ffi.Pointer<ffi.Void> arg0)>>()
-        .asFunction<int Function(ffi.Pointer<ffi.Void>)>()(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_NSUInteger_ffiVoid_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.UnsignedLong Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_NSUInteger_ffiVoid_fnPtrTrampoline, 0)
-        .cast();
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.UnsignedLong Function(ffi.Pointer<ffi.Void> arg0)>>
+            func,
+        ffi.Pointer<ffi.Void> arg0) =>
+    func.asFunction<int Function(ffi.Pointer<ffi.Void>)>()(arg0);
+final _ObjCBlock_NSUInteger_ffiVoid_fnPtrCallable = ffi.Pointer.fromFunction<
+        ffi.UnsignedLong Function(
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.UnsignedLong Function(ffi.Pointer<ffi.Void> arg0)>>,
+            ffi.Pointer<ffi.Void>)>(
+    _ObjCBlock_NSUInteger_ffiVoid_fnPtrTrampoline, 0);
 int _ObjCBlock_NSUInteger_ffiVoid_closureTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    (objc.getBlockClosure(block) as int Function(ffi.Pointer<ffi.Void>))(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_NSUInteger_ffiVoid_closureCallable =
-    ffi.Pointer.fromFunction<
-                ffi.UnsignedLong Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_NSUInteger_ffiVoid_closureTrampoline, 0)
-        .cast();
+        ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
+        ffi.Pointer<ffi.Void> arg0) =>
+    (objc.getBlockClosure(closureId) as int Function(
+        ffi.Pointer<ffi.Void>))(arg0);
+final _ObjCBlock_NSUInteger_ffiVoid_closureCallable = ffi.Pointer.fromFunction<
+        ffi.UnsignedLong Function(
+            ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64, ffi.Pointer<ffi.Void>)>(
+    _ObjCBlock_NSUInteger_ffiVoid_closureTrampoline, 0);
 
 /// Construction methods for `objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>`.
 abstract final class ObjCBlock_NSUInteger_ffiVoid {
@@ -8747,17 +9528,16 @@ abstract final class ObjCBlock_NSUInteger_ffiVoid {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>
-      fromFunctionPointer(
-              ffi.Pointer<
-                      ffi.NativeFunction<
-                          ffi.UnsignedLong Function(
-                              ffi.Pointer<ffi.Void> arg0)>>
-                  ptr) =>
-          objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>(
-              objc.newPointerBlock(_ObjCBlock_NSUInteger_ffiVoid_fnPtrCallable, ptr.cast()),
-              retain: false,
-              release: true);
+  static objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)> fromFunctionPointer(
+          ffi.Pointer<
+                  ffi.NativeFunction<
+                      ffi.UnsignedLong Function(ffi.Pointer<ffi.Void> arg0)>>
+              ptr) =>
+      objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>(
+          _ObjectiveCBindings_newPointerBlock_1ckyi24(
+              _ObjCBlock_NSUInteger_ffiVoid_fnPtrCallable.cast(), ptr.cast()),
+          retain: false,
+          release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -8768,8 +9548,9 @@ abstract final class ObjCBlock_NSUInteger_ffiVoid {
       fromFunction(int Function(ffi.Pointer<ffi.Void>) fn) =>
           objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_NSUInteger_ffiVoid_closureCallable,
-                  (ffi.Pointer<ffi.Void> arg0) => fn(arg0)),
+                  (ffi.Pointer<ffi.Void> arg0) => fn(arg0),
+                  _ObjCBlock_NSUInteger_ffiVoid_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_1ckyi24),
               retain: false,
               release: true);
 }
@@ -8777,71 +9558,68 @@ abstract final class ObjCBlock_NSUInteger_ffiVoid {
 /// Call operator for `objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>`.
 extension ObjCBlock_NSUInteger_ffiVoid_CallExtension
     on objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)> {
-  int call(ffi.Pointer<ffi.Void> arg0) => ref.pointer.ref.invoke
-      .cast<
-          ffi.NativeFunction<
-              ffi.UnsignedLong Function(ffi.Pointer<objc.ObjCBlockImpl> block,
-                  ffi.Pointer<ffi.Void> arg0)>>()
-      .asFunction<
-          int Function(ffi.Pointer<objc.ObjCBlockImpl>,
-              ffi.Pointer<ffi.Void>)>()(ref.pointer, arg0);
+  int call(ffi.Pointer<ffi.Void> arg0) =>
+      _ObjectiveCBindings_invokeBlock_1ckyi24(ref.pointer, arg0);
 }
 
 int _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.UnsignedLong Function(
+                        ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<NSFastEnumerationState> arg1,
+                        ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
+                        ffi.UnsignedLong arg3)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<NSFastEnumerationState> arg1,
         ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
         int arg3) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.UnsignedLong Function(
-                    ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<NSFastEnumerationState> arg1,
-                    ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
-                    ffi.UnsignedLong arg3)>>()
-        .asFunction<
-            int Function(
+    func.asFunction<
+        int Function(
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<NSFastEnumerationState>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+            int)>()(arg0, arg1, arg2, arg3);
+final _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrCallable =
+    ffi.Pointer.fromFunction<
+            ffi.UnsignedLong Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.UnsignedLong Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<NSFastEnumerationState> arg1,
+                            ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
+                            ffi.UnsignedLong arg3)>>,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<NSFastEnumerationState>,
                 ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                int)>()(arg0, arg1, arg2, arg3);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.UnsignedLong Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<NSFastEnumerationState>,
-                    ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                    ffi.UnsignedLong)>(
-            _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrTrampoline,
-            0)
-        .cast();
+                ffi.UnsignedLong)>(
+        _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrTrampoline,
+        0);
 int _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<NSFastEnumerationState> arg1,
         ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
         int arg3) =>
-    (objc.getBlockClosure(block) as int Function(
+    (objc.getBlockClosure(closureId) as int Function(
         ffi.Pointer<ffi.Void>,
         ffi.Pointer<NSFastEnumerationState>,
         ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
         int))(arg0, arg1, arg2, arg3);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureCallable =
+final _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.UnsignedLong Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<NSFastEnumerationState>,
-                    ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                    ffi.UnsignedLong)>(
-            _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureTrampoline,
-            0)
-        .cast();
+            ffi.UnsignedLong Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<NSFastEnumerationState>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+                ffi.UnsignedLong)>(
+        _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureTrampoline,
+        0);
 
 /// Construction methods for `objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>, ffi.Pointer<NSFastEnumerationState>, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>, ffi.UnsignedLong)>`.
 abstract final class ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger {
@@ -8879,7 +9657,7 @@ abstract final class ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObj
                       ffi.Pointer<NSFastEnumerationState>,
                       ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
                       ffi.UnsignedLong)>(
-              objc.newPointerBlock(_ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrCallable, ptr.cast()),
+              _ObjectiveCBindings_newPointerBlock_17ap02x(_ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_fnPtrCallable.cast(), ptr.cast()),
               retain: false,
               release: true);
 
@@ -8896,9 +9674,10 @@ abstract final class ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObj
           ffi.UnsignedLong)> fromFunction(int Function(ffi.Pointer<ffi.Void>, ffi.Pointer<NSFastEnumerationState>, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>, int) fn) =>
       objc.ObjCBlock<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>, ffi.Pointer<NSFastEnumerationState>, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>, ffi.UnsignedLong)>(
           objc.newClosureBlock(
-              _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureCallable,
               (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<NSFastEnumerationState> arg1, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2, int arg3) =>
-                  fn(arg0, arg1, arg2, arg3)),
+                  fn(arg0, arg1, arg2, arg3),
+              _ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSUInteger_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_17ap02x),
           retain: false,
           release: true);
 }
@@ -8913,48 +9692,33 @@ extension ObjCBlock_NSUInteger_ffiVoid_NSFastEnumerationState_objcObjCObject_NSU
             ffi.UnsignedLong)> {
   int call(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<NSFastEnumerationState> arg1,
           ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2, int arg3) =>
-      ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.UnsignedLong Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0,
-                      ffi.Pointer<NSFastEnumerationState> arg1,
-                      ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg2,
-                      ffi.UnsignedLong arg3)>>()
-          .asFunction<
-              int Function(
-                  ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>,
-                  ffi.Pointer<NSFastEnumerationState>,
-                  ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                  int)>()(ref.pointer, arg0, arg1, arg2, arg3);
+      _ObjectiveCBindings_invokeBlock_17ap02x(
+          ref.pointer, arg0, arg1, arg2, arg3);
 }
 
 ffi.Pointer<_NSZone> _ObjCBlock_NSZone_ffiVoid_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    block.ref.target
-        .cast<
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void> arg0)>>
+            func,
+        ffi.Pointer<ffi.Void> arg0) =>
+    func.asFunction<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>()(
+        arg0);
+final _ObjCBlock_NSZone_ffiVoid_fnPtrCallable = ffi.Pointer.fromFunction<
+    ffi.Pointer<_NSZone> Function(
+        ffi.Pointer<
             ffi.NativeFunction<
-                ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void> arg0)>>()
-        .asFunction<
-            ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>()(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_NSZone_ffiVoid_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Pointer<_NSZone> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_NSZone_ffiVoid_fnPtrTrampoline)
-        .cast();
+                ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void> arg0)>>,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_NSZone_ffiVoid_fnPtrTrampoline);
 ffi.Pointer<_NSZone> _ObjCBlock_NSZone_ffiVoid_closureTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    (objc.getBlockClosure(block) as ffi.Pointer<_NSZone> Function(
+        ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
+        ffi.Pointer<ffi.Void> arg0) =>
+    (objc.getBlockClosure(closureId) as ffi.Pointer<_NSZone> Function(
         ffi.Pointer<ffi.Void>))(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_NSZone_ffiVoid_closureCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Pointer<_NSZone> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_NSZone_ffiVoid_closureTrampoline)
-        .cast();
+final _ObjCBlock_NSZone_ffiVoid_closureCallable = ffi.Pointer.fromFunction<
+    ffi.Pointer<_NSZone> Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_NSZone_ffiVoid_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>`.
 abstract final class ObjCBlock_NSZone_ffiVoid {
@@ -8972,17 +9736,15 @@ abstract final class ObjCBlock_NSZone_ffiVoid {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>
-      fromFunctionPointer(
-              ffi.Pointer<
-                      ffi.NativeFunction<
-                          ffi.Pointer<_NSZone> Function(
-                              ffi.Pointer<ffi.Void> arg0)>>
-                  ptr) =>
-          objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>(
-              objc.newPointerBlock(_ObjCBlock_NSZone_ffiVoid_fnPtrCallable, ptr.cast()),
-              retain: false,
-              release: true);
+  static objc.ObjCBlock<
+      ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)> fromFunctionPointer(
+          ffi.Pointer<ffi.NativeFunction<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void> arg0)>>
+              ptr) =>
+      objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>(
+          _ObjectiveCBindings_newPointerBlock_1a8cl66(
+              _ObjCBlock_NSZone_ffiVoid_fnPtrCallable.cast(), ptr.cast()),
+          retain: false,
+          release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -8992,8 +9754,10 @@ abstract final class ObjCBlock_NSZone_ffiVoid {
   static objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>
       fromFunction(ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>) fn) =>
           objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)>(
-              objc.newClosureBlock(_ObjCBlock_NSZone_ffiVoid_closureCallable,
-                  (ffi.Pointer<ffi.Void> arg0) => fn(arg0)),
+              objc.newClosureBlock(
+                  (ffi.Pointer<ffi.Void> arg0) => fn(arg0),
+                  _ObjCBlock_NSZone_ffiVoid_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_1a8cl66),
               retain: false,
               release: true);
 }
@@ -9002,38 +9766,31 @@ abstract final class ObjCBlock_NSZone_ffiVoid {
 extension ObjCBlock_NSZone_ffiVoid_CallExtension
     on objc.ObjCBlock<ffi.Pointer<_NSZone> Function(ffi.Pointer<ffi.Void>)> {
   ffi.Pointer<_NSZone> call(ffi.Pointer<ffi.Void> arg0) =>
-      ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Pointer<_NSZone> Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0)>>()
-          .asFunction<
-              ffi.Pointer<_NSZone> Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>)>()(ref.pointer, arg0);
+      _ObjectiveCBindings_invokeBlock_1a8cl66(ref.pointer, arg0);
 }
 
 bool _ObjCBlock_bool_ffiVoid_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ffi.Void> arg0)>>()
-        .asFunction<bool Function(ffi.Pointer<ffi.Void>)>()(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Bool Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_bool_ffiVoid_fnPtrTrampoline, false)
-        .cast();
+        ffi.Pointer<
+                ffi
+                .NativeFunction<ffi.Bool Function(ffi.Pointer<ffi.Void> arg0)>>
+            func,
+        ffi.Pointer<ffi.Void> arg0) =>
+    func.asFunction<bool Function(ffi.Pointer<ffi.Void>)>()(arg0);
+final _ObjCBlock_bool_ffiVoid_fnPtrCallable = ffi.Pointer.fromFunction<
+    ffi.Bool Function(
+        ffi.Pointer<
+            ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ffi.Void> arg0)>>,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_bool_ffiVoid_fnPtrTrampoline, false);
 bool _ObjCBlock_bool_ffiVoid_closureTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    (objc.getBlockClosure(block) as bool Function(ffi.Pointer<ffi.Void>))(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_closureCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Bool Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_bool_ffiVoid_closureTrampoline, false)
-        .cast();
+        ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
+        ffi.Pointer<ffi.Void> arg0) =>
+    (objc.getBlockClosure(closureId) as bool Function(
+        ffi.Pointer<ffi.Void>))(arg0);
+final _ObjCBlock_bool_ffiVoid_closureCallable = ffi.Pointer.fromFunction<
+        ffi.Bool Function(
+            ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64, ffi.Pointer<ffi.Void>)>(
+    _ObjCBlock_bool_ffiVoid_closureTrampoline, false);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)>`.
 abstract final class ObjCBlock_bool_ffiVoid {
@@ -9049,16 +9806,16 @@ abstract final class ObjCBlock_bool_ffiVoid {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)>
-      fromFunctionPointer(
-              ffi.Pointer<
-                      ffi.NativeFunction<
-                          ffi.Bool Function(ffi.Pointer<ffi.Void> arg0)>>
-                  ptr) =>
-          objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)>(
-              objc.newPointerBlock(_ObjCBlock_bool_ffiVoid_fnPtrCallable, ptr.cast()),
-              retain: false,
-              release: true);
+  static objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)> fromFunctionPointer(
+          ffi.Pointer<
+                  ffi.NativeFunction<
+                      ffi.Bool Function(ffi.Pointer<ffi.Void> arg0)>>
+              ptr) =>
+      objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)>(
+          _ObjectiveCBindings_newPointerBlock_e3qsqz(
+              _ObjCBlock_bool_ffiVoid_fnPtrCallable.cast(), ptr.cast()),
+          retain: false,
+          release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -9068,8 +9825,10 @@ abstract final class ObjCBlock_bool_ffiVoid {
   static objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)> fromFunction(
           bool Function(ffi.Pointer<ffi.Void>) fn) =>
       objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)>(
-          objc.newClosureBlock(_ObjCBlock_bool_ffiVoid_closureCallable,
-              (ffi.Pointer<ffi.Void> arg0) => fn(arg0)),
+          objc.newClosureBlock(
+              (ffi.Pointer<ffi.Void> arg0) => fn(arg0),
+              _ObjCBlock_bool_ffiVoid_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_e3qsqz),
           retain: false,
           release: true);
 }
@@ -9077,46 +9836,42 @@ abstract final class ObjCBlock_bool_ffiVoid {
 /// Call operator for `objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)>`.
 extension ObjCBlock_bool_ffiVoid_CallExtension
     on objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>)> {
-  bool call(ffi.Pointer<ffi.Void> arg0) => ref.pointer.ref.invoke
-      .cast<
-          ffi.NativeFunction<
-              ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl> block,
-                  ffi.Pointer<ffi.Void> arg0)>>()
-      .asFunction<
-          bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-              ffi.Pointer<ffi.Void>)>()(ref.pointer, arg0);
+  bool call(ffi.Pointer<ffi.Void> arg0) =>
+      _ObjectiveCBindings_invokeBlock_e3qsqz(ref.pointer, arg0);
 }
 
 bool _ObjCBlock_bool_ffiVoid_Protocol_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<objc.ObjCObject> arg1)>>()
-        .asFunction<
-            bool Function(ffi.Pointer<ffi.Void>,
-                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_Protocol_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_bool_ffiVoid_Protocol_fnPtrTrampoline, false)
-        .cast();
+    func.asFunction<
+        bool Function(
+            ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
+final _ObjCBlock_bool_ffiVoid_Protocol_fnPtrCallable = ffi.Pointer.fromFunction<
+        ffi.Bool Function(
+            ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1)>>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<objc.ObjCObject>)>(
+    _ObjCBlock_bool_ffiVoid_Protocol_fnPtrTrampoline, false);
 bool _ObjCBlock_bool_ffiVoid_Protocol_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    (objc.getBlockClosure(block) as bool Function(
+    (objc.getBlockClosure(closureId) as bool Function(
         ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_Protocol_closureCallable =
+final _ObjCBlock_bool_ffiVoid_Protocol_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_bool_ffiVoid_Protocol_closureTrampoline, false)
-        .cast();
+            ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+                ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_bool_ffiVoid_Protocol_closureTrampoline, false);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)>`.
 abstract final class ObjCBlock_bool_ffiVoid_Protocol {
@@ -9134,17 +9889,16 @@ abstract final class ObjCBlock_bool_ffiVoid_Protocol {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)>
-      fromFunctionPointer(
-              ffi.Pointer<
-                      ffi.NativeFunction<
-                          ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
-                              ffi.Pointer<objc.ObjCObject> arg1)>>
-                  ptr) =>
-          objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)>(
-              objc.newPointerBlock(_ObjCBlock_bool_ffiVoid_Protocol_fnPtrCallable, ptr.cast()),
-              retain: false,
-              release: true);
+  static objc.ObjCBlock<
+      ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)> fromFunctionPointer(
+          ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1)>>
+              ptr) =>
+      objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)>(
+          _ObjectiveCBindings_newPointerBlock_3su7tt(
+              _ObjCBlock_bool_ffiVoid_Protocol_fnPtrCallable.cast(),
+              ptr.cast()),
+          retain: false,
+          release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -9155,12 +9909,13 @@ abstract final class ObjCBlock_bool_ffiVoid_Protocol {
       fromFunction(bool Function(ffi.Pointer<ffi.Void>, Protocol) fn) =>
           objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)>(
               objc.newClosureBlock(
-                  _ObjCBlock_bool_ffiVoid_Protocol_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) =>
                       fn(
                           arg0,
                           Protocol.castFromPointer(arg1,
-                              retain: true, release: true))),
+                              retain: true, release: true)),
+                  _ObjCBlock_bool_ffiVoid_Protocol_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_3su7tt),
               retain: false,
               release: true);
 }
@@ -9168,49 +9923,44 @@ abstract final class ObjCBlock_bool_ffiVoid_Protocol {
 /// Call operator for `objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)>`.
 extension ObjCBlock_bool_ffiVoid_Protocol_CallExtension
     on objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, Protocol)> {
-  bool call(ffi.Pointer<ffi.Void> arg0, Protocol arg1) => ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Bool Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0,
-                      ffi.Pointer<objc.ObjCObject> arg1)>>()
-          .asFunction<
-              bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(
-      ref.pointer, arg0, arg1.ref.pointer);
+  bool call(ffi.Pointer<ffi.Void> arg0, Protocol arg1) =>
+      _ObjectiveCBindings_invokeBlock_3su7tt(
+          ref.pointer, arg0, arg1.ref.pointer);
 }
 
 bool _ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<objc.ObjCObject> arg1)>>()
-        .asFunction<
-            bool Function(ffi.Pointer<ffi.Void>,
-                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrCallable =
+    func.asFunction<
+        bool Function(
+            ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
+final _ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrTrampoline, false)
-        .cast();
+            ffi.Bool Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrTrampoline, false);
 bool _ObjCBlock_bool_ffiVoid_objcObjCObject_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    (objc.getBlockClosure(block) as bool Function(
+    (objc.getBlockClosure(closureId) as bool Function(
         ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_objcObjCObject_closureCallable =
+final _ObjCBlock_bool_ffiVoid_objcObjCObject_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_bool_ffiVoid_objcObjCObject_closureTrampoline, false)
-        .cast();
+            ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+                ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_bool_ffiVoid_objcObjCObject_closureTrampoline, false);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>`.
 abstract final class ObjCBlock_bool_ffiVoid_objcObjCObject {
@@ -9232,16 +9982,17 @@ abstract final class ObjCBlock_bool_ffiVoid_objcObjCObject {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)> fromFunctionPointer(
-          ffi.Pointer<
-                  ffi.NativeFunction<
-                      ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1)>>
-              ptr) =>
-      objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-          objc.newPointerBlock(_ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrCallable, ptr.cast()),
-          retain: false,
-          release: true);
+  static objc
+      .ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>
+      fromFunctionPointer(
+              ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1)>>
+                  ptr) =>
+          objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
+              _ObjectiveCBindings_newPointerBlock_3su7tt(
+                  _ObjCBlock_bool_ffiVoid_objcObjCObject_fnPtrCallable.cast(),
+                  ptr.cast()),
+              retain: false,
+              release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -9255,9 +10006,10 @@ abstract final class ObjCBlock_bool_ffiVoid_objcObjCObject {
                   ffi.Bool Function(
                       ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_bool_ffiVoid_objcObjCObject_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) =>
-                      fn(arg0, objc.ObjCObjectBase(arg1, retain: true, release: true))),
+                      fn(arg0, objc.ObjCObjectBase(arg1, retain: true, release: true)),
+                  _ObjCBlock_bool_ffiVoid_objcObjCObject_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_3su7tt),
               retain: false,
               release: true);
 }
@@ -9266,49 +10018,43 @@ abstract final class ObjCBlock_bool_ffiVoid_objcObjCObject {
 extension ObjCBlock_bool_ffiVoid_objcObjCObject_CallExtension on objc.ObjCBlock<
     ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)> {
   bool call(ffi.Pointer<ffi.Void> arg0, objc.ObjCObjectBase arg1) =>
-      ref.pointer.ref.invoke
-              .cast<
-                  ffi.NativeFunction<
-                      ffi.Bool Function(
-                          ffi.Pointer<objc.ObjCBlockImpl> block,
-                          ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1)>>()
-              .asFunction<
-                  bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                      ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(
+      _ObjectiveCBindings_invokeBlock_3su7tt(
           ref.pointer, arg0, arg1.ref.pointer);
 }
 
 bool _ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCSelector> arg1)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCSelector> arg1) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<objc.ObjCSelector> arg1)>>()
-        .asFunction<
-            bool Function(ffi.Pointer<ffi.Void>,
-                ffi.Pointer<objc.ObjCSelector>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrCallable =
+    func.asFunction<
+        bool Function(ffi.Pointer<ffi.Void>,
+            ffi.Pointer<objc.ObjCSelector>)>()(arg0, arg1);
+final _ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
-            _ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrTrampoline, false)
-        .cast();
+            ffi.Bool Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>)>(
+        _ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrTrampoline, false);
 bool _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCSelector> arg1) =>
-    (objc.getBlockClosure(block) as bool Function(
+    (objc.getBlockClosure(closureId) as bool Function(
         ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>))(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureCallable =
+final _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
-            _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureTrampoline, false)
-        .cast();
+            ffi.Bool Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+                ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
+        _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureTrampoline, false);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>`.
 abstract final class ObjCBlock_bool_ffiVoid_objcObjCSelector {
@@ -9330,16 +10076,17 @@ abstract final class ObjCBlock_bool_ffiVoid_objcObjCSelector {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)> fromFunctionPointer(
-          ffi.Pointer<
-                  ffi.NativeFunction<
-                      ffi.Bool Function(ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCSelector> arg1)>>
-              ptr) =>
-      objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
-          objc.newPointerBlock(_ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrCallable, ptr.cast()),
-          retain: false,
-          release: true);
+  static objc
+      .ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>
+      fromFunctionPointer(
+              ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCSelector> arg1)>>
+                  ptr) =>
+          objc.ObjCBlock<ffi.Bool Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
+              _ObjectiveCBindings_newPointerBlock_w1e3k0(
+                  _ObjCBlock_bool_ffiVoid_objcObjCSelector_fnPtrCallable.cast(),
+                  ptr.cast()),
+              retain: false,
+              release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -9353,9 +10100,10 @@ abstract final class ObjCBlock_bool_ffiVoid_objcObjCSelector {
                   ffi.Bool Function(
                       ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCSelector> arg1) =>
-                      fn(arg0, arg1)),
+                      fn(arg0, arg1),
+                  _ObjCBlock_bool_ffiVoid_objcObjCSelector_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_w1e3k0),
               retain: false,
               release: true);
 }
@@ -9366,75 +10114,67 @@ extension ObjCBlock_bool_ffiVoid_objcObjCSelector_CallExtension
         ffi.Bool Function(
             ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)> {
   bool call(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCSelector> arg1) =>
-      ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Bool Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0,
-                      ffi.Pointer<objc.ObjCSelector> arg1)>>()
-          .asFunction<
-              bool Function(
-                  ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>,
-                  ffi.Pointer<objc.ObjCSelector>)>()(ref.pointer, arg0, arg1);
+      _ObjectiveCBindings_invokeBlock_w1e3k0(ref.pointer, arg0, arg1);
 }
 
 void
     _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrTrampoline(
-            ffi.Pointer<objc.ObjCBlockImpl> block,
+            ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Void Function(
+                            ffi.Pointer<objc.ObjCBlockImpl> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2)>>
+                func,
             ffi.Pointer<objc.ObjCBlockImpl> arg0,
             ffi.Pointer<objc.ObjCObject> arg1,
             ffi.Pointer<objc.ObjCObject> arg2) =>
-        block.ref.target
-            .cast<
-                ffi.NativeFunction<
-                    ffi.Void Function(
-                        ffi.Pointer<objc.ObjCBlockImpl> arg0,
-                        ffi.Pointer<objc.ObjCObject> arg1,
-                        ffi.Pointer<objc.ObjCObject> arg2)>>()
-            .asFunction<
-                void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1, arg2);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrCallable =
+        func.asFunction<
+            void Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1, arg2);
+final _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrTrampoline)
-        .cast();
+            ffi.Void Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Void Function(
+                            ffi.Pointer<objc.ObjCBlockImpl> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2)>>,
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrTrampoline);
 void
     _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureTrampoline(
             ffi.Pointer<objc.ObjCBlockImpl> block,
+            int closureId,
             ffi.Pointer<objc.ObjCBlockImpl> arg0,
             ffi.Pointer<objc.ObjCObject> arg1,
             ffi.Pointer<objc.ObjCObject> arg2) =>
-        (objc.getBlockClosure(block) as void Function(
+        (objc.getBlockClosure(closureId) as void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureCallable =
+final _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureTrampoline)
-        .cast();
+            ffi.Void Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureTrampoline);
 void
     _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_listenerTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<objc.ObjCBlockImpl> arg0,
         ffi.Pointer<objc.ObjCObject> arg1,
         ffi.Pointer<objc.ObjCObject> arg2) {
-  (objc.getBlockClosure(block) as void Function(
+  (objc.getBlockClosure(closureId) as void Function(
       ffi.Pointer<objc.ObjCBlockImpl>,
       ffi.Pointer<objc.ObjCObject>,
       ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2);
@@ -9444,6 +10184,7 @@ void
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<objc.ObjCBlockImpl>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>)>
@@ -9451,6 +10192,7 @@ ffi.NativeCallable<
     ffi.NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<objc.ObjCBlockImpl>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>)>.listener(
@@ -9459,12 +10201,13 @@ ffi.NativeCallable<
 void
     _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_blockingTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> waiter,
         ffi.Pointer<objc.ObjCBlockImpl> arg0,
         ffi.Pointer<objc.ObjCObject> arg1,
         ffi.Pointer<objc.ObjCObject> arg2) {
   try {
-    (objc.getBlockClosure(block) as void Function(
+    (objc.getBlockClosure(closureId) as void Function(
         ffi.Pointer<objc.ObjCBlockImpl>,
         ffi.Pointer<objc.ObjCObject>,
         ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2);
@@ -9478,6 +10221,7 @@ void
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCBlockImpl>,
             ffi.Pointer<objc.ObjCObject>,
@@ -9486,6 +10230,7 @@ ffi.NativeCallable<
     ffi.NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCBlockImpl>,
                 ffi.Pointer<objc.ObjCObject>,
@@ -9495,6 +10240,7 @@ ffi.NativeCallable<
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCBlockImpl>,
             ffi.Pointer<objc.ObjCObject>,
@@ -9503,6 +10249,7 @@ ffi.NativeCallable<
     ffi.NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCBlockImpl>,
                 ffi.Pointer<objc.ObjCObject>,
@@ -9531,18 +10278,19 @@ abstract final class ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCO
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<
-          ffi.Void Function(
-              objc.ObjCBlock<
-                  ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-              ffi.Pointer<objc.ObjCObject>,
-              NSDictionary)>
+  static objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>
       fromFunctionPointer(ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl> arg0, ffi.Pointer<objc.ObjCObject> arg1, ffi.Pointer<objc.ObjCObject> arg2)>> ptr) =>
           objc.ObjCBlock<
-              ffi.Void Function(
-                  objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-                  ffi.Pointer<objc.ObjCObject>,
-                  NSDictionary)>(objc.newPointerBlock(_ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrCallable, ptr.cast()), retain: false, release: true);
+                  ffi.Void Function(
+                      objc.ObjCBlock<
+                          ffi.Void Function(
+                              ffi.Pointer<objc.ObjCObject>?, NSError)>,
+                      ffi.Pointer<objc.ObjCObject>,
+                      NSDictionary)>(
+              _ObjectiveCBindings_newPointerBlock_1b3bb6a(
+                  _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_fnPtrCallable.cast(), ptr.cast()),
+              retain: false,
+              release: true);
 
   /// Creates a block from a Dart function.
   ///
@@ -9553,14 +10301,15 @@ abstract final class ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCO
       fromFunction(void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, objc.ObjCObjectBase, NSDictionary) fn) =>
           objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>(
               objc.newClosureBlock(
-                  _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureCallable,
                   (ffi.Pointer<objc.ObjCBlockImpl> arg0,
                           ffi.Pointer<objc.ObjCObject> arg1,
                           ffi.Pointer<objc.ObjCObject> arg2) =>
                       fn(
                           ObjCBlock_ffiVoid_objcObjCObject_NSError.castFromPointer(arg0, retain: true, release: true),
                           objc.ObjCObjectBase(arg1, retain: true, release: true),
-                          NSDictionary.castFromPointer(arg2, retain: true, release: true))),
+                          NSDictionary.castFromPointer(arg2, retain: true, release: true)),
+                  _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_1b3bb6a),
               retain: false,
               release: true);
 
@@ -9573,99 +10322,47 @@ abstract final class ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCO
   ///
   /// Note that unlike the default behavior of NativeCallable.listener, listener
   /// blocks do not keep the isolate alive.
-  static objc.ObjCBlock<
-      ffi.Void Function(
-          objc.ObjCBlock<
-              ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-          ffi.Pointer<objc.ObjCObject>,
-          NSDictionary)> listener(
-      void Function(
-              objc.ObjCBlock<
-                  ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-              objc.ObjCObjectBase,
-              NSDictionary)
-          fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_listenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<objc.ObjCBlockImpl> arg0,
-                ffi.Pointer<objc.ObjCObject> arg1,
-                ffi.Pointer<objc.ObjCObject> arg2) =>
-            fn(
-                ObjCBlock_ffiVoid_objcObjCObject_NSError.castFromPointer(arg0,
-                    retain: false, release: true),
-                objc.ObjCObjectBase(arg1, retain: false, release: true),
-                NSDictionary.castFromPointer(arg2,
-                    retain: false, release: true)));
-    final wrapper = _ObjectiveCBindings_wrapListenerBlock_1j2nt86(raw);
-    objc.objectRelease(raw.cast());
-    return objc.ObjCBlock<
-        ffi.Void Function(
-            objc.ObjCBlock<
-                ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-            ffi.Pointer<objc.ObjCObject>,
-            NSDictionary)>(wrapper, retain: false, release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>
+      listener(void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, objc.ObjCObjectBase, NSDictionary) fn) =>
+          objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>(
+              objc.newClosureBlock(
+                  (ffi.Pointer<objc.ObjCBlockImpl> arg0,
+                          ffi.Pointer<objc.ObjCObject> arg1,
+                          ffi.Pointer<objc.ObjCObject> arg2) =>
+                      fn(
+                          ObjCBlock_ffiVoid_objcObjCObject_NSError.castFromPointer(arg0, retain: false, release: true),
+                          objc.ObjCObjectBase(arg1, retain: false, release: true),
+                          NSDictionary.castFromPointer(arg2, retain: false, release: true)),
+                  _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_listenerCallable.nativeFunction.cast(),
+                  _ObjectiveCBindings_newListenerBlock_1b3bb6a),
+              retain: false,
+              release: true);
 
   /// Creates a blocking block from a Dart function.
   ///
-  /// This callback can be invoked from any native thread, and will block the
-  /// caller until the callback is handled by the Dart isolate that created
-  /// the block. Async functions are not supported.
-  ///
-  /// This block does not keep the owner isolate alive. If the owner isolate has
-  /// shut down, and the block is invoked by native code, it may block
-  /// indefinitely, or have other undefined behavior.
-  static objc.ObjCBlock<
-      ffi.Void Function(
-          objc.ObjCBlock<
-              ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-          ffi.Pointer<objc.ObjCObject>,
-          NSDictionary)> blocking(
-      void Function(
-              objc.ObjCBlock<
-                  ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-              objc.ObjCObjectBase,
-              NSDictionary)
-          fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_blockingCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<objc.ObjCBlockImpl> arg0,
-                ffi.Pointer<objc.ObjCObject> arg1,
-                ffi.Pointer<objc.ObjCObject> arg2) =>
-            fn(
-                ObjCBlock_ffiVoid_objcObjCObject_NSError.castFromPointer(arg0,
-                    retain: false, release: true),
-                objc.ObjCObjectBase(arg1, retain: false, release: true),
-                NSDictionary.castFromPointer(arg2,
-                    retain: false, release: true)));
-    final rawListener = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_blockingListenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<objc.ObjCBlockImpl> arg0,
-                ffi.Pointer<objc.ObjCObject> arg1,
-                ffi.Pointer<objc.ObjCObject> arg2) =>
-            fn(
-                ObjCBlock_ffiVoid_objcObjCObject_NSError.castFromPointer(arg0,
-                    retain: false, release: true),
-                objc.ObjCObjectBase(arg1, retain: false, release: true),
-                NSDictionary.castFromPointer(arg2,
-                    retain: false, release: true)));
-    final wrapper = objc.wrapBlockingBlock(
-        _ObjectiveCBindings_wrapBlockingBlock_1j2nt86, raw, rawListener);
-    objc.objectRelease(raw.cast());
-    objc.objectRelease(rawListener.cast());
-    return objc.ObjCBlock<
-        ffi.Void Function(
-            objc.ObjCBlock<
-                ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>,
-            ffi.Pointer<objc.ObjCObject>,
-            NSDictionary)>(wrapper, retain: false, release: true);
-  }
+  /// This callback can be invoked from any native thread, and will block the
+  /// caller until the callback is handled by the Dart isolate that created
+  /// the block. Async functions are not supported.
+  ///
+  /// This block does not keep the owner isolate alive. If the owner isolate has
+  /// shut down, and the block is invoked by native code, it may block
+  /// indefinitely, or have other undefined behavior.
+  static objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>
+      blocking(void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, objc.ObjCObjectBase, NSDictionary) fn) =>
+          objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>(
+              objc.newBlockingBlock(
+                  (ffi.Pointer<objc.ObjCBlockImpl> arg0,
+                          ffi.Pointer<objc.ObjCObject> arg1,
+                          ffi.Pointer<objc.ObjCObject> arg2) =>
+                      fn(
+                          ObjCBlock_ffiVoid_objcObjCObject_NSError.castFromPointer(arg0, retain: false, release: true),
+                          objc.ObjCObjectBase(arg1, retain: false, release: true),
+                          NSDictionary.castFromPointer(arg2, retain: false, release: true)),
+                  _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_blockingCallable.nativeFunction.cast(),
+                  _ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDictionary_blockingListenerCallable.nativeFunction.cast(),
+                  _ObjectiveCBindings_newBlockingBlock_1b3bb6a),
+              retain: false,
+              release: true);
 }
 
 /// Call operator for `objc.ObjCBlock<ffi.Void Function(objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>, ffi.Pointer<objc.ObjCObject>, NSDictionary)>`.
@@ -9677,68 +10374,61 @@ extension ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCObject_NSDic
             ffi.Pointer<objc.ObjCObject>,
             NSDictionary)> {
   void call(
-          objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>
+          objc.ObjCBlock<
+                  ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>
               arg0,
           objc.ObjCObjectBase arg1,
           NSDictionary arg2) =>
-      ref.pointer.ref.invoke
-              .cast<
-                  ffi.NativeFunction<
-                      ffi.Void Function(
-                          ffi.Pointer<objc.ObjCBlockImpl> block,
-                          ffi.Pointer<objc.ObjCBlockImpl> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1,
-                          ffi.Pointer<objc.ObjCObject> arg2)>>()
-              .asFunction<
-                  void Function(
-                      ffi.Pointer<objc.ObjCBlockImpl>,
-                      ffi.Pointer<objc.ObjCBlockImpl>,
-                      ffi.Pointer<objc.ObjCObject>,
-                      ffi.Pointer<objc.ObjCObject>)>()(
+      _ObjectiveCBindings_invokeBlock_1b3bb6a(
           ref.pointer, arg0.ref.pointer, arg1.ref.pointer, arg2.ref.pointer);
 }
 
 void _ObjCBlock_ffiVoid_ffiVoid_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> arg0)>>()
-        .asFunction<void Function(ffi.Pointer<ffi.Void>)>()(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_ffiVoid_ffiVoid_fnPtrCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_ffiVoid_ffiVoid_fnPtrTrampoline)
-        .cast();
+        ffi.Pointer<
+                ffi
+                .NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> arg0)>>
+            func,
+        ffi.Pointer<ffi.Void> arg0) =>
+    func.asFunction<void Function(ffi.Pointer<ffi.Void>)>()(arg0);
+final _ObjCBlock_ffiVoid_ffiVoid_fnPtrCallable = ffi.Pointer.fromFunction<
+    ffi.Void Function(
+        ffi.Pointer<
+            ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> arg0)>>,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_ffiVoid_ffiVoid_fnPtrTrampoline);
 void _ObjCBlock_ffiVoid_ffiVoid_closureTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    (objc.getBlockClosure(block) as void Function(ffi.Pointer<ffi.Void>))(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_ffiVoid_ffiVoid_closureCallable =
-    ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_ffiVoid_ffiVoid_closureTrampoline)
-        .cast();
+        ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
+        ffi.Pointer<ffi.Void> arg0) =>
+    (objc.getBlockClosure(closureId) as void Function(
+        ffi.Pointer<ffi.Void>))(arg0);
+final _ObjCBlock_ffiVoid_ffiVoid_closureCallable = ffi.Pointer.fromFunction<
+    ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+        ffi.Pointer<ffi.Void>)>(_ObjCBlock_ffiVoid_ffiVoid_closureTrampoline);
 void _ObjCBlock_ffiVoid_ffiVoid_listenerTrampoline(
-    ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) {
-  (objc.getBlockClosure(block) as void Function(ffi.Pointer<ffi.Void>))(arg0);
+    ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
+    ffi.Pointer<ffi.Void> arg0) {
+  (objc.getBlockClosure(closureId) as void Function(
+      ffi.Pointer<ffi.Void>))(arg0);
   objc.objectRelease(block.cast());
 }
 
 ffi.NativeCallable<
         ffi.Void Function(
-            ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>
+            ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64, ffi.Pointer<ffi.Void>)>
     _ObjCBlock_ffiVoid_ffiVoid_listenerCallable = ffi.NativeCallable<
-            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
                 ffi.Pointer<ffi.Void>)>.listener(
         _ObjCBlock_ffiVoid_ffiVoid_listenerTrampoline)
       ..keepIsolateAlive = false;
 void _ObjCBlock_ffiVoid_ffiVoid_blockingTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<ffi.Void> waiter,
     ffi.Pointer<ffi.Void> arg0) {
   try {
-    (objc.getBlockClosure(block) as void Function(ffi.Pointer<ffi.Void>))(arg0);
+    (objc.getBlockClosure(closureId) as void Function(
+        ffi.Pointer<ffi.Void>))(arg0);
   } catch (e) {
   } finally {
     objc.signalWaiter(waiter);
@@ -9747,18 +10437,18 @@ void _ObjCBlock_ffiVoid_ffiVoid_blockingTrampoline(
 }
 
 ffi.NativeCallable<
-        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
             ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>
     _ObjCBlock_ffiVoid_ffiVoid_blockingCallable = ffi.NativeCallable<
-            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
                 ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>.isolateLocal(
         _ObjCBlock_ffiVoid_ffiVoid_blockingTrampoline)
       ..keepIsolateAlive = false;
 ffi.NativeCallable<
-        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
             ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>
     _ObjCBlock_ffiVoid_ffiVoid_blockingListenerCallable = ffi.NativeCallable<
-            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
                 ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>)>.listener(
         _ObjCBlock_ffiVoid_ffiVoid_blockingTrampoline)
       ..keepIsolateAlive = false;
@@ -9783,8 +10473,8 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid {
                       ffi.Void Function(ffi.Pointer<ffi.Void> arg0)>>
               ptr) =>
       objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
-          objc.newPointerBlock(
-              _ObjCBlock_ffiVoid_ffiVoid_fnPtrCallable, ptr.cast()),
+          _ObjectiveCBindings_newPointerBlock_ovsamd(
+              _ObjCBlock_ffiVoid_ffiVoid_fnPtrCallable.cast(), ptr.cast()),
           retain: false,
           release: true);
 
@@ -9796,8 +10486,10 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid {
   static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)> fromFunction(
           void Function(ffi.Pointer<ffi.Void>) fn) =>
       objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
-          objc.newClosureBlock(_ObjCBlock_ffiVoid_ffiVoid_closureCallable,
-              (ffi.Pointer<ffi.Void> arg0) => fn(arg0)),
+          objc.newClosureBlock(
+              (ffi.Pointer<ffi.Void> arg0) => fn(arg0),
+              _ObjCBlock_ffiVoid_ffiVoid_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_ovsamd),
           retain: false,
           release: true);
 
@@ -9811,15 +10503,14 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid {
   /// Note that unlike the default behavior of NativeCallable.listener, listener
   /// blocks do not keep the isolate alive.
   static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)> listener(
-      void Function(ffi.Pointer<ffi.Void>) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_listenerCallable.nativeFunction.cast(),
-        (ffi.Pointer<ffi.Void> arg0) => fn(arg0));
-    final wrapper = _ObjectiveCBindings_wrapListenerBlock_ovsamd(raw);
-    objc.objectRelease(raw.cast());
-    return objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>(wrapper,
-        retain: false, release: true);
-  }
+          void Function(ffi.Pointer<ffi.Void>) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
+          objc.newClosureBlock(
+              (ffi.Pointer<ffi.Void> arg0) => fn(arg0),
+              _ObjCBlock_ffiVoid_ffiVoid_listenerCallable.nativeFunction.cast(),
+              _ObjectiveCBindings_newListenerBlock_ovsamd),
+          retain: false,
+          release: true);
 
   /// Creates a blocking block from a Dart function.
   ///
@@ -9831,90 +10522,84 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid {
   /// shut down, and the block is invoked by native code, it may block
   /// indefinitely, or have other undefined behavior.
   static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)> blocking(
-      void Function(ffi.Pointer<ffi.Void>) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_blockingCallable.nativeFunction.cast(),
-        (ffi.Pointer<ffi.Void> arg0) => fn(arg0));
-    final rawListener = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_blockingListenerCallable.nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0) => fn(arg0));
-    final wrapper = objc.wrapBlockingBlock(
-        _ObjectiveCBindings_wrapBlockingBlock_ovsamd, raw, rawListener);
-    objc.objectRelease(raw.cast());
-    objc.objectRelease(rawListener.cast());
-    return objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>(wrapper,
-        retain: false, release: true);
-  }
+          void Function(ffi.Pointer<ffi.Void>) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
+          objc.newBlockingBlock(
+              (ffi.Pointer<ffi.Void> arg0) => fn(arg0),
+              _ObjCBlock_ffiVoid_ffiVoid_blockingCallable.nativeFunction.cast(),
+              _ObjCBlock_ffiVoid_ffiVoid_blockingListenerCallable.nativeFunction
+                  .cast(),
+              _ObjectiveCBindings_newBlockingBlock_ovsamd),
+          retain: false,
+          release: true);
 }
 
 /// Call operator for `objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)>`.
 extension ObjCBlock_ffiVoid_ffiVoid_CallExtension
     on objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>)> {
-  void call(ffi.Pointer<ffi.Void> arg0) => ref.pointer.ref.invoke
-      .cast<
-          ffi.NativeFunction<
-              ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl> block,
-                  ffi.Pointer<ffi.Void> arg0)>>()
-      .asFunction<
-          void Function(ffi.Pointer<objc.ObjCBlockImpl>,
-              ffi.Pointer<ffi.Void>)>()(ref.pointer, arg0);
+  void call(ffi.Pointer<ffi.Void> arg0) =>
+      _ObjectiveCBindings_invokeBlock_ovsamd(ref.pointer, arg0);
 }
 
 void _ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Void Function(ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<objc.ObjCObject> arg1)>>()
-        .asFunction<
-            void Function(ffi.Pointer<ffi.Void>,
-                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrCallable =
+    func.asFunction<
+        void Function(
+            ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
+final _ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrTrampoline)
-        .cast();
+            ffi.Void Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Void Function(ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrTrampoline);
 void _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    (objc.getBlockClosure(block) as void Function(
+    (objc.getBlockClosure(closureId) as void Function(
         ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureCallable =
+final _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureTrampoline)
-        .cast();
+            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+                ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureTrampoline);
 void _ObjCBlock_ffiVoid_ffiVoid_NSCoder_listenerTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<ffi.Void> arg0,
     ffi.Pointer<objc.ObjCObject> arg1) {
-  (objc.getBlockClosure(block) as void Function(
+  (objc.getBlockClosure(closureId) as void Function(
       ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
   objc.objectRelease(block.cast());
 }
 
 ffi.NativeCallable<
-        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
             ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>
     _ObjCBlock_ffiVoid_ffiVoid_NSCoder_listenerCallable = ffi.NativeCallable<
-            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
                 ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>.listener(
         _ObjCBlock_ffiVoid_ffiVoid_NSCoder_listenerTrampoline)
       ..keepIsolateAlive = false;
 void _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<ffi.Void> waiter,
     ffi.Pointer<ffi.Void> arg0,
     ffi.Pointer<objc.ObjCObject> arg1) {
   try {
-    (objc.getBlockClosure(block) as void Function(
+    (objc.getBlockClosure(closureId) as void Function(
         ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
   } catch (e) {
   } finally {
@@ -9926,12 +10611,14 @@ void _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingTrampoline(
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>)>
     _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingCallable = ffi.NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>)>.isolateLocal(
@@ -9940,6 +10627,7 @@ ffi.NativeCallable<
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>)>
@@ -9947,6 +10635,7 @@ ffi.NativeCallable<
         .NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>)>.listener(
@@ -9969,34 +10658,34 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSCoder {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>
-      fromFunctionPointer(
-              ffi.Pointer<
-                      ffi.NativeFunction<
-                          ffi.Void Function(ffi.Pointer<ffi.Void> arg0,
-                              ffi.Pointer<objc.ObjCObject> arg1)>>
-                  ptr) =>
-          objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
-              objc.newPointerBlock(_ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrCallable, ptr.cast()),
-              retain: false,
-              release: true);
+  static objc.ObjCBlock<
+      ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)> fromFunctionPointer(
+          ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1)>>
+              ptr) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
+          _ObjectiveCBindings_newPointerBlock_18v1jvf(
+              _ObjCBlock_ffiVoid_ffiVoid_NSCoder_fnPtrCallable.cast(),
+              ptr.cast()),
+          retain: false,
+          release: true);
 
   /// Creates a block from a Dart function.
   ///
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<
-      ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)> fromFunction(
-          void Function(ffi.Pointer<ffi.Void>, NSCoder) fn) =>
-      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
-          objc.newClosureBlock(
-              _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureCallable,
-              (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
-                  arg0,
-                  NSCoder.castFromPointer(arg1, retain: true, release: true))),
-          retain: false,
-          release: true);
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>
+      fromFunction(void Function(ffi.Pointer<ffi.Void>, NSCoder) fn) =>
+          objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
+              objc.newClosureBlock(
+                  (ffi.Pointer<ffi.Void> arg0,
+                          ffi.Pointer<objc.ObjCObject> arg1) =>
+                      fn(arg0,
+                          NSCoder.castFromPointer(arg1, retain: true, release: true)),
+                  _ObjCBlock_ffiVoid_ffiVoid_NSCoder_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_18v1jvf),
+              retain: false,
+              release: true);
 
   /// Creates a listener block from a Dart function.
   ///
@@ -10007,20 +10696,18 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSCoder {
   ///
   /// Note that unlike the default behavior of NativeCallable.listener, listener
   /// blocks do not keep the isolate alive.
-  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>
-      listener(void Function(ffi.Pointer<ffi.Void>, NSCoder) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_NSCoder_listenerCallable.nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
-            arg0, NSCoder.castFromPointer(arg1, retain: false, release: true)));
-    final wrapper = _ObjectiveCBindings_wrapListenerBlock_wjovn7(raw);
-    objc.objectRelease(raw.cast());
-    return objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
-        wrapper,
-        retain: false,
-        release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)> listener(
+          void Function(ffi.Pointer<ffi.Void>, NSCoder) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
+          objc.newClosureBlock(
+              (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
+                  arg0,
+                  NSCoder.castFromPointer(arg1, retain: false, release: true)),
+              _ObjCBlock_ffiVoid_ffiVoid_NSCoder_listenerCallable.nativeFunction
+                  .cast(),
+              _ObjectiveCBindings_newListenerBlock_18v1jvf),
+          retain: false,
+          release: true);
 
   /// Creates a blocking block from a Dart function.
   ///
@@ -10031,94 +10718,82 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSCoder {
   /// This block does not keep the owner isolate alive. If the owner isolate has
   /// shut down, and the block is invoked by native code, it may block
   /// indefinitely, or have other undefined behavior.
-  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>
-      blocking(void Function(ffi.Pointer<ffi.Void>, NSCoder) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingCallable.nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
-            arg0, NSCoder.castFromPointer(arg1, retain: false, release: true)));
-    final rawListener = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingListenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
-            arg0, NSCoder.castFromPointer(arg1, retain: false, release: true)));
-    final wrapper = objc.wrapBlockingBlock(
-        _ObjectiveCBindings_wrapBlockingBlock_wjovn7, raw, rawListener);
-    objc.objectRelease(raw.cast());
-    objc.objectRelease(rawListener.cast());
-    return objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
-        wrapper,
-        retain: false,
-        release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)> blocking(
+          void Function(ffi.Pointer<ffi.Void>, NSCoder) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>(
+          objc.newBlockingBlock(
+              (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
+                  arg0,
+                  NSCoder.castFromPointer(arg1, retain: false, release: true)),
+              _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingCallable.nativeFunction
+                  .cast(),
+              _ObjCBlock_ffiVoid_ffiVoid_NSCoder_blockingListenerCallable
+                  .nativeFunction
+                  .cast(),
+              _ObjectiveCBindings_newBlockingBlock_18v1jvf),
+          retain: false,
+          release: true);
 }
 
 /// Call operator for `objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)>`.
 extension ObjCBlock_ffiVoid_ffiVoid_NSCoder_CallExtension
     on objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSCoder)> {
-  void call(ffi.Pointer<ffi.Void> arg0, NSCoder arg1) => ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Void Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0,
-                      ffi.Pointer<objc.ObjCObject> arg1)>>()
-          .asFunction<
-              void Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(
-      ref.pointer, arg0, arg1.ref.pointer);
+  void call(ffi.Pointer<ffi.Void> arg0, NSCoder arg1) =>
+      _ObjectiveCBindings_invokeBlock_18v1jvf(
+          ref.pointer, arg0, arg1.ref.pointer);
 }
 
 void _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(
+                        ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1,
+                        ffi.UnsignedLong arg2)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1,
         int arg2) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Void Function(
-                    ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<objc.ObjCObject> arg1,
-                    ffi.UnsignedLong arg2)>>()
-        .asFunction<
-            void Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>,
-                int)>()(arg0, arg1, arg2);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrCallable =
+    func.asFunction<
+        void Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>,
+            int)>()(arg0, arg1, arg2);
+final _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.UnsignedLong)>(
-            _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrTrampoline)
-        .cast();
+            ffi.Void Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Void Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1,
+                            ffi.UnsignedLong arg2)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong)>(
+        _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrTrampoline);
 void _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1,
         int arg2) =>
-    (objc.getBlockClosure(block) as void Function(ffi.Pointer<ffi.Void>,
+    (objc.getBlockClosure(closureId) as void Function(ffi.Pointer<ffi.Void>,
         ffi.Pointer<objc.ObjCObject>, int))(arg0, arg1, arg2);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureCallable =
+final _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.UnsignedLong)>(
-            _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureTrampoline)
-        .cast();
+            ffi.Void Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong)>(
+        _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureTrampoline);
 void _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_listenerTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<ffi.Void> arg0,
     ffi.Pointer<objc.ObjCObject> arg1,
     int arg2) {
-  (objc.getBlockClosure(block) as void Function(ffi.Pointer<ffi.Void>,
+  (objc.getBlockClosure(closureId) as void Function(ffi.Pointer<ffi.Void>,
       ffi.Pointer<objc.ObjCObject>, int))(arg0, arg1, arg2);
   objc.objectRelease(block.cast());
 }
@@ -10126,6 +10801,7 @@ void _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_listenerTrampoline(
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.UnsignedLong)>
@@ -10133,6 +10809,7 @@ ffi.NativeCallable<
         .NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.UnsignedLong)>.listener(
@@ -10140,12 +10817,13 @@ ffi.NativeCallable<
       ..keepIsolateAlive = false;
 void _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<ffi.Void> waiter,
     ffi.Pointer<ffi.Void> arg0,
     ffi.Pointer<objc.ObjCObject> arg1,
     int arg2) {
   try {
-    (objc.getBlockClosure(block) as void Function(ffi.Pointer<ffi.Void>,
+    (objc.getBlockClosure(closureId) as void Function(ffi.Pointer<ffi.Void>,
         ffi.Pointer<objc.ObjCObject>, int))(arg0, arg1, arg2);
   } catch (e) {
   } finally {
@@ -10157,14 +10835,16 @@ void _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingTrampoline(
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.UnsignedLong)>
-    _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingCallable =
-    ffi.NativeCallable<
+    _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingCallable = ffi
+        .NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>,
@@ -10174,6 +10854,7 @@ ffi.NativeCallable<
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>,
@@ -10182,6 +10863,7 @@ ffi.NativeCallable<
     ffi.NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>,
@@ -10211,8 +10893,8 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent {
               ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1, ffi.UnsignedLong arg2)>>
                   ptr) =>
           objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>(
-              objc.newPointerBlock(
-                  _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrCallable,
+              _ObjectiveCBindings_newPointerBlock_hoampi(
+                  _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_fnPtrCallable.cast(),
                   ptr.cast()),
               retain: false,
               release: true);
@@ -10226,13 +10908,14 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent {
           void Function(ffi.Pointer<ffi.Void>, NSStream, NSStreamEvent) fn) =>
       objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>(
           objc.newClosureBlock(
-              _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureCallable,
               (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1,
                       int arg2) =>
                   fn(
                       arg0,
                       NSStream.castFromPointer(arg1, retain: true, release: true),
-                      NSStreamEvent.fromValue(arg2))),
+                      NSStreamEvent.fromValue(arg2)),
+              _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_hoampi),
           retain: false,
           release: true);
 
@@ -10245,26 +10928,20 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent {
   ///
   /// Note that unlike the default behavior of NativeCallable.listener, listener
   /// blocks do not keep the isolate alive.
-  static objc.ObjCBlock<
-          ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>
-      listener(
-          void Function(ffi.Pointer<ffi.Void>, NSStream, NSStreamEvent) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_listenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1,
-                int arg2) =>
-            fn(
-                arg0,
-                NSStream.castFromPointer(arg1, retain: false, release: true),
-                NSStreamEvent.fromValue(arg2)));
-    final wrapper = _ObjectiveCBindings_wrapListenerBlock_18d6mda(raw);
-    objc.objectRelease(raw.cast());
-    return objc.ObjCBlock<
-        ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream,
-            ffi.UnsignedLong)>(wrapper, retain: false, release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)> listener(
+          void Function(ffi.Pointer<ffi.Void>, NSStream, NSStreamEvent) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>(
+          objc.newClosureBlock(
+              (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1, int arg2) => fn(
+                  arg0,
+                  NSStream.castFromPointer(arg1, retain: false, release: true),
+                  NSStreamEvent.fromValue(arg2)),
+              _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_listenerCallable
+                  .nativeFunction
+                  .cast(),
+              _ObjectiveCBindings_newListenerBlock_hoampi),
+          retain: false,
+          release: true);
 
   /// Creates a blocking block from a Dart function.
   ///
@@ -10275,38 +10952,21 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent {
   /// This block does not keep the owner isolate alive. If the owner isolate has
   /// shut down, and the block is invoked by native code, it may block
   /// indefinitely, or have other undefined behavior.
-  static objc.ObjCBlock<
-          ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>
-      blocking(
-          void Function(ffi.Pointer<ffi.Void>, NSStream, NSStreamEvent) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1,
-                int arg2) =>
-            fn(
-                arg0,
-                NSStream.castFromPointer(arg1, retain: false, release: true),
-                NSStreamEvent.fromValue(arg2)));
-    final rawListener = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingListenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1,
-                int arg2) =>
-            fn(
-                arg0,
-                NSStream.castFromPointer(arg1, retain: false, release: true),
-                NSStreamEvent.fromValue(arg2)));
-    final wrapper = objc.wrapBlockingBlock(
-        _ObjectiveCBindings_wrapBlockingBlock_18d6mda, raw, rawListener);
-    objc.objectRelease(raw.cast());
-    objc.objectRelease(rawListener.cast());
-    return objc.ObjCBlock<
-        ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream,
-            ffi.UnsignedLong)>(wrapper, retain: false, release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)> blocking(
+          void Function(ffi.Pointer<ffi.Void>, NSStream, NSStreamEvent) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>(
+          objc.newBlockingBlock(
+              (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1, int arg2) => fn(
+                  arg0,
+                  NSStream.castFromPointer(arg1, retain: false, release: true),
+                  NSStreamEvent.fromValue(arg2)),
+              _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingCallable
+                  .nativeFunction
+                  .cast(),
+              _ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_blockingListenerCallable.nativeFunction.cast(),
+              _ObjectiveCBindings_newBlockingBlock_hoampi),
+          retain: false,
+          release: true);
 }
 
 /// Call operator for `objc.ObjCBlock<ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)>`.
@@ -10314,84 +10974,75 @@ extension ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent_CallExtension
     on objc.ObjCBlock<
         ffi.Void Function(ffi.Pointer<ffi.Void>, NSStream, ffi.UnsignedLong)> {
   void call(ffi.Pointer<ffi.Void> arg0, NSStream arg1, NSStreamEvent arg2) =>
-      ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Void Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0,
-                      ffi.Pointer<objc.ObjCObject> arg1,
-                      ffi.UnsignedLong arg2)>>()
-          .asFunction<
-              void Function(
-                  ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>,
-                  ffi.Pointer<objc.ObjCObject>,
-                  int)>()(ref.pointer, arg0, arg1.ref.pointer, arg2.value);
+      _ObjectiveCBindings_invokeBlock_hoampi(
+          ref.pointer, arg0, arg1.ref.pointer, arg2.value);
 }
 
 void _ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Void Function(ffi.Pointer<objc.ObjCObject> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1)>>
+            func,
         ffi.Pointer<objc.ObjCObject> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Void Function(ffi.Pointer<objc.ObjCObject> arg0,
-                    ffi.Pointer<objc.ObjCObject> arg1)>>()
-        .asFunction<
-            void Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrCallable =
+    func.asFunction<
+        void Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
+final _ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrTrampoline)
-        .cast();
+            ffi.Void Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Void Function(ffi.Pointer<objc.ObjCObject> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1)>>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrTrampoline);
 void _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<objc.ObjCObject> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    (objc.getBlockClosure(block) as void Function(ffi.Pointer<objc.ObjCObject>,
+    (objc.getBlockClosure(closureId) as void Function(
+        ffi.Pointer<objc.ObjCObject>,
         ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureCallable =
+final _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Void Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureTrampoline)
-        .cast();
+            ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+                ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureTrampoline);
 void _ObjCBlock_ffiVoid_objcObjCObject_NSError_listenerTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<objc.ObjCObject> arg0,
     ffi.Pointer<objc.ObjCObject> arg1) {
-  (objc.getBlockClosure(block) as void Function(
+  (objc.getBlockClosure(closureId) as void Function(
       ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
   objc.objectRelease(block.cast());
 }
 
 ffi.NativeCallable<
-        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>,
+        ffi.Void Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>)>
     _ObjCBlock_ffiVoid_objcObjCObject_NSError_listenerCallable = ffi
         .NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>)>.listener(
         _ObjCBlock_ffiVoid_objcObjCObject_NSError_listenerTrampoline)
       ..keepIsolateAlive = false;
 void _ObjCBlock_ffiVoid_objcObjCObject_NSError_blockingTrampoline(
     ffi.Pointer<objc.ObjCBlockImpl> block,
+    int closureId,
     ffi.Pointer<ffi.Void> waiter,
     ffi.Pointer<objc.ObjCObject> arg0,
     ffi.Pointer<objc.ObjCObject> arg1) {
   try {
-    (objc.getBlockClosure(block) as void Function(ffi.Pointer<objc.ObjCObject>,
+    (objc.getBlockClosure(closureId) as void Function(
+        ffi.Pointer<objc.ObjCObject>,
         ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
   } catch (e) {
   } finally {
@@ -10403,6 +11054,7 @@ void _ObjCBlock_ffiVoid_objcObjCObject_NSError_blockingTrampoline(
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>)>
@@ -10410,6 +11062,7 @@ ffi.NativeCallable<
         .NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>)>.isolateLocal(
@@ -10418,6 +11071,7 @@ ffi.NativeCallable<
 ffi.NativeCallable<
         ffi.Void Function(
             ffi.Pointer<objc.ObjCBlockImpl>,
+            ffi.Int64,
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>)>
@@ -10425,6 +11079,7 @@ ffi.NativeCallable<
         .NativeCallable<
             ffi.Void Function(
                 ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
                 ffi.Pointer<ffi.Void>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>)>.listener(
@@ -10447,14 +11102,14 @@ abstract final class ObjCBlock_ffiVoid_objcObjCObject_NSError {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)> fromFunctionPointer(
-          ffi.Pointer<
-                  ffi.NativeFunction<
-                      ffi.Void Function(ffi.Pointer<objc.ObjCObject> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1)>>
+  static objc.ObjCBlock<
+      ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)> fromFunctionPointer(
+          ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<objc.ObjCObject> arg0, ffi.Pointer<objc.ObjCObject> arg1)>>
               ptr) =>
       objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>(
-          objc.newPointerBlock(_ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrCallable, ptr.cast()),
+          _ObjectiveCBindings_newPointerBlock_pfv6jd(
+              _ObjCBlock_ffiVoid_objcObjCObject_NSError_fnPtrCallable.cast(),
+              ptr.cast()),
           retain: false,
           release: true);
 
@@ -10467,14 +11122,15 @@ abstract final class ObjCBlock_ffiVoid_objcObjCObject_NSError {
           void Function(objc.ObjCObjectBase?, NSError) fn) =>
       objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>(
           objc.newClosureBlock(
-              _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureCallable,
               (ffi.Pointer<objc.ObjCObject> arg0,
                       ffi.Pointer<objc.ObjCObject> arg1) =>
                   fn(
                       arg0.address == 0
                           ? null
                           : objc.ObjCObjectBase(arg0, retain: true, release: true),
-                      NSError.castFromPointer(arg1, retain: true, release: true))),
+                      NSError.castFromPointer(arg1, retain: true, release: true)),
+              _ObjCBlock_ffiVoid_objcObjCObject_NSError_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_pfv6jd),
           retain: false,
           release: true);
 
@@ -10487,26 +11143,21 @@ abstract final class ObjCBlock_ffiVoid_objcObjCObject_NSError {
   ///
   /// Note that unlike the default behavior of NativeCallable.listener, listener
   /// blocks do not keep the isolate alive.
-  static objc
-      .ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>
-      listener(void Function(objc.ObjCObjectBase?, NSError) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_objcObjCObject_NSError_listenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<objc.ObjCObject> arg0,
-                ffi.Pointer<objc.ObjCObject> arg1) =>
-            fn(
-                arg0.address == 0
-                    ? null
-                    : objc.ObjCObjectBase(arg0, retain: false, release: true),
-                NSError.castFromPointer(arg1, retain: false, release: true)));
-    final wrapper = _ObjectiveCBindings_wrapListenerBlock_wjvic9(raw);
-    objc.objectRelease(raw.cast());
-    return objc.ObjCBlock<
-            ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>(wrapper,
-        retain: false, release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)> listener(
+          void Function(objc.ObjCObjectBase?, NSError) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>(
+          objc.newClosureBlock(
+              (ffi.Pointer<objc.ObjCObject> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
+                  arg0.address == 0
+                      ? null
+                      : objc.ObjCObjectBase(arg0, retain: false, release: true),
+                  NSError.castFromPointer(arg1, retain: false, release: true)),
+              _ObjCBlock_ffiVoid_objcObjCObject_NSError_listenerCallable
+                  .nativeFunction
+                  .cast(),
+              _ObjectiveCBindings_newListenerBlock_pfv6jd),
+          retain: false,
+          release: true);
 
   /// Creates a blocking block from a Dart function.
   ///
@@ -10517,89 +11168,65 @@ abstract final class ObjCBlock_ffiVoid_objcObjCObject_NSError {
   /// This block does not keep the owner isolate alive. If the owner isolate has
   /// shut down, and the block is invoked by native code, it may block
   /// indefinitely, or have other undefined behavior.
-  static objc
-      .ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>
-      blocking(void Function(objc.ObjCObjectBase?, NSError) fn) {
-    final raw = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_objcObjCObject_NSError_blockingCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<objc.ObjCObject> arg0,
-                ffi.Pointer<objc.ObjCObject> arg1) =>
-            fn(
-                arg0.address == 0
-                    ? null
-                    : objc.ObjCObjectBase(arg0, retain: false, release: true),
-                NSError.castFromPointer(arg1, retain: false, release: true)));
-    final rawListener = objc.newClosureBlock(
-        _ObjCBlock_ffiVoid_objcObjCObject_NSError_blockingListenerCallable
-            .nativeFunction
-            .cast(),
-        (ffi.Pointer<objc.ObjCObject> arg0,
-                ffi.Pointer<objc.ObjCObject> arg1) =>
-            fn(
-                arg0.address == 0
-                    ? null
-                    : objc.ObjCObjectBase(arg0, retain: false, release: true),
-                NSError.castFromPointer(arg1, retain: false, release: true)));
-    final wrapper = objc.wrapBlockingBlock(
-        _ObjectiveCBindings_wrapBlockingBlock_wjvic9, raw, rawListener);
-    objc.objectRelease(raw.cast());
-    objc.objectRelease(rawListener.cast());
-    return objc.ObjCBlock<
-            ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>(wrapper,
-        retain: false, release: true);
-  }
+  static objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)> blocking(
+          void Function(objc.ObjCObjectBase?, NSError) fn) =>
+      objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>(
+          objc.newBlockingBlock(
+              (ffi.Pointer<objc.ObjCObject> arg0, ffi.Pointer<objc.ObjCObject> arg1) => fn(
+                  arg0.address == 0
+                      ? null
+                      : objc.ObjCObjectBase(arg0, retain: false, release: true),
+                  NSError.castFromPointer(arg1, retain: false, release: true)),
+              _ObjCBlock_ffiVoid_objcObjCObject_NSError_blockingCallable
+                  .nativeFunction
+                  .cast(),
+              _ObjCBlock_ffiVoid_objcObjCObject_NSError_blockingListenerCallable.nativeFunction.cast(),
+              _ObjectiveCBindings_newBlockingBlock_pfv6jd),
+          retain: false,
+          release: true);
 }
 
 /// Call operator for `objc.ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)>`.
 extension ObjCBlock_ffiVoid_objcObjCObject_NSError_CallExtension on objc
     .ObjCBlock<ffi.Void Function(ffi.Pointer<objc.ObjCObject>?, NSError)> {
-  void call(objc.ObjCObjectBase? arg0, NSError arg1) => ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Void Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<objc.ObjCObject> arg0,
-                      ffi.Pointer<objc.ObjCObject> arg1)>>()
-          .asFunction<
-              void Function(
-                  ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<objc.ObjCObject>,
-                  ffi.Pointer<objc.ObjCObject>)>()(
-      ref.pointer, arg0?.ref.pointer ?? ffi.nullptr, arg1.ref.pointer);
+  void call(objc.ObjCObjectBase? arg0, NSError arg1) =>
+      _ObjectiveCBindings_invokeBlock_pfv6jd(
+          ref.pointer, arg0?.ref.pointer ?? ffi.nullptr, arg1.ref.pointer);
 }
 
 instancetype _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block,
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    instancetype Function(ffi.Pointer<ffi.Void> arg0,
+                        ffi.Pointer<objc.ObjCObject> arg1)>>
+            func,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                instancetype Function(ffi.Pointer<ffi.Void> arg0,
-                    ffi.Pointer<objc.ObjCObject> arg1)>>()
-        .asFunction<
-            instancetype Function(ffi.Pointer<ffi.Void>,
-                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrCallable =
+    func.asFunction<
+        instancetype Function(
+            ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1);
+final _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrTrampoline)
-        .cast();
+            instancetype Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        instancetype Function(ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrTrampoline);
 instancetype _ObjCBlock_instancetype_ffiVoid_NSCoder_closureTrampoline(
         ffi.Pointer<objc.ObjCBlockImpl> block,
+        int closureId,
         ffi.Pointer<ffi.Void> arg0,
         ffi.Pointer<objc.ObjCObject> arg1) =>
-    (objc.getBlockClosure(block) as instancetype Function(
+    (objc.getBlockClosure(closureId) as instancetype Function(
         ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>))(arg0, arg1);
-ffi.Pointer<ffi.Void> _ObjCBlock_instancetype_ffiVoid_NSCoder_closureCallable =
+final _ObjCBlock_instancetype_ffiVoid_NSCoder_closureCallable =
     ffi.Pointer.fromFunction<
-                instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_instancetype_ffiVoid_NSCoder_closureTrampoline)
-        .cast();
+            instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Int64,
+                ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_instancetype_ffiVoid_NSCoder_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<objc.Retained<ffi.Pointer<objc.ObjCObject>?> Function(ffi.Pointer<ffi.Void>, NSCoder)>`.
 abstract final class ObjCBlock_instancetype_ffiVoid_NSCoder {
@@ -10626,8 +11253,8 @@ abstract final class ObjCBlock_instancetype_ffiVoid_NSCoder {
           objc.ObjCBlock<
                   objc.Retained<ffi.Pointer<objc.ObjCObject>?> Function(
                       ffi.Pointer<ffi.Void>, NSCoder)>(
-              objc.newPointerBlock(
-                  _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrCallable, ptr.cast()),
+              _ObjectiveCBindings_newPointerBlock_xr62hr(
+                  _ObjCBlock_instancetype_ffiVoid_NSCoder_fnPtrCallable.cast(), ptr.cast()),
               retain: false,
               release: true);
 
@@ -10642,12 +11269,13 @@ abstract final class ObjCBlock_instancetype_ffiVoid_NSCoder {
               Dartinstancetype? Function(ffi.Pointer<ffi.Void>, NSCoder) fn) =>
           objc.ObjCBlock<objc.Retained<ffi.Pointer<objc.ObjCObject>?> Function(ffi.Pointer<ffi.Void>, NSCoder)>(
               objc.newClosureBlock(
-                  _ObjCBlock_instancetype_ffiVoid_NSCoder_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1) =>
                       fn(arg0, NSCoder.castFromPointer(arg1, retain: true, release: true))
                           ?.ref
                           .retainAndReturnPointer() ??
-                      ffi.nullptr),
+                      ffi.nullptr,
+                  _ObjCBlock_instancetype_ffiVoid_NSCoder_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_xr62hr),
               retain: false,
               release: true);
 }
@@ -10657,83 +11285,78 @@ extension ObjCBlock_instancetype_ffiVoid_NSCoder_CallExtension
     on objc.ObjCBlock<
         objc.Retained<ffi.Pointer<objc.ObjCObject>?> Function(
             ffi.Pointer<ffi.Void>, NSCoder)> {
-  Dartinstancetype? call(ffi.Pointer<ffi.Void> arg0, NSCoder arg1) => ref
-              .pointer.ref.invoke
-              .cast<
-                  ffi.NativeFunction<
-                      instancetype Function(
-                          ffi.Pointer<objc.ObjCBlockImpl> block,
-                          ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1)>>()
-              .asFunction<instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()
-              (ref.pointer, arg0, arg1.ref.pointer)
-              .address ==
-          0
-      ? null
-      : objc.ObjCObjectBase(
-          ref.pointer.ref.invoke
-              .cast<ffi.NativeFunction<instancetype Function(ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1)>>()
-              .asFunction<instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>)>()(ref.pointer, arg0, arg1.ref.pointer),
-          retain: false,
-          release: true);
+  Dartinstancetype? call(ffi.Pointer<ffi.Void> arg0, NSCoder arg1) =>
+      _ObjectiveCBindings_invokeBlock_xr62hr(
+                      ref.pointer, arg0, arg1.ref.pointer)
+                  .address ==
+              0
+          ? null
+          : objc.ObjCObjectBase(
+              _ObjectiveCBindings_invokeBlock_xr62hr(
+                  ref.pointer, arg0, arg1.ref.pointer),
+              retain: false,
+              release: true);
 }
 
 instancetype
     _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrTrampoline(
-            ffi.Pointer<objc.ObjCBlockImpl> block,
-            ffi.Pointer<ffi.Void> arg0,
-            ffi.Pointer<objc.ObjCObject> arg1,
-            ffi.Pointer<objc.ObjCObject> arg2,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) =>
-        block.ref.target
-                .cast<
+            ffi.Pointer<
                     ffi.NativeFunction<
                         instancetype Function(
                             ffi.Pointer<ffi.Void> arg0,
                             ffi.Pointer<objc.ObjCObject> arg1,
                             ffi.Pointer<objc.ObjCObject> arg2,
-                            ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3)>>()
-                .asFunction<
-                    instancetype Function(
-                        ffi.Pointer<ffi.Void>,
-                        ffi.Pointer<objc.ObjCObject>,
-                        ffi.Pointer<objc.ObjCObject>,
-                        ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>()(
-            arg0, arg1, arg2, arg3);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrCallable =
-    ffi.Pointer.fromFunction<
+                            ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3)>>
+                func,
+            ffi.Pointer<ffi.Void> arg0,
+            ffi.Pointer<objc.ObjCObject> arg1,
+            ffi.Pointer<objc.ObjCObject> arg2,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) =>
+        func.asFunction<
                 instancetype Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
                     ffi.Pointer<ffi.Void>,
                     ffi.Pointer<objc.ObjCObject>,
                     ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
-            _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrTrampoline)
-        .cast();
+                    ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>()(
+            arg0, arg1, arg2, arg3);
+final _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrCallable =
+    ffi.Pointer.fromFunction<
+            instancetype Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        instancetype Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCObject> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2,
+                            ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
+        _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrTrampoline);
 instancetype
     _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureTrampoline(
             ffi.Pointer<objc.ObjCBlockImpl> block,
+            int closureId,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCObject> arg1,
             ffi.Pointer<objc.ObjCObject> arg2,
             ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) =>
-        (objc.getBlockClosure(block) as instancetype Function(
+        (objc.getBlockClosure(closureId) as instancetype Function(
             ffi.Pointer<ffi.Void>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<ffi.Pointer<objc.ObjCObject>>))(arg0, arg1, arg2, arg3);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureCallable =
+final _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureCallable =
     ffi.Pointer.fromFunction<
-                instancetype Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
-            _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureTrampoline)
-        .cast();
+            instancetype Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
+        _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>`.
 abstract final class ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError {
@@ -10766,7 +11389,7 @@ abstract final class ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError {
                       NSData,
                       NSString,
                       ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
-              objc.newPointerBlock(_ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrCallable, ptr.cast()),
+              _ObjectiveCBindings_newPointerBlock_10z9f5k(_ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_fnPtrCallable.cast(), ptr.cast()),
               retain: false,
               release: true);
 
@@ -10775,19 +11398,20 @@ abstract final class ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>
-      fromFunction(Dartinstancetype? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>) fn) =>
-          objc.ObjCBlock<ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
-              objc.newClosureBlock(
-                  _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureCallable,
-                  (ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1,
-                          ffi.Pointer<objc.ObjCObject> arg2,
-                          ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) =>
-                      fn(arg0, NSData.castFromPointer(arg1, retain: true, release: true), NSString.castFromPointer(arg2, retain: true, release: true), arg3)?.ref.retainAndAutorelease() ??
-                      ffi.nullptr),
-              retain: false,
-              release: true);
+  static objc.ObjCBlock<ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)> fromFunction(
+          Dartinstancetype? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)
+              fn) =>
+      objc.ObjCBlock<ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>(
+          objc.newClosureBlock(
+              (ffi.Pointer<ffi.Void> arg0,
+                      ffi.Pointer<objc.ObjCObject> arg1,
+                      ffi.Pointer<objc.ObjCObject> arg2,
+                      ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) =>
+                  fn(arg0, NSData.castFromPointer(arg1, retain: true, release: true), NSString.castFromPointer(arg2, retain: true, release: true), arg3)?.ref.retainAndAutorelease() ?? ffi.nullptr,
+              _ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_closureCallable.cast(),
+              _ObjectiveCBindings_newClosureBlock_10z9f5k),
+          retain: false,
+          release: true);
 }
 
 /// Call operator for `objc.ObjCBlock<ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData, NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>`.
@@ -10795,61 +11419,52 @@ extension ObjCBlock_instancetype_ffiVoid_NSData_NSString_NSError_CallExtension
     on objc.ObjCBlock<
         ffi.Pointer<objc.ObjCObject>? Function(ffi.Pointer<ffi.Void>, NSData,
             NSString, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)> {
-  Dartinstancetype? call(ffi.Pointer<ffi.Void> arg0, NSData arg1, NSString arg2, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) => ref
-              .pointer.ref.invoke
-              .cast<
-                  ffi.NativeFunction<
-                      instancetype Function(
-                          ffi.Pointer<objc.ObjCBlockImpl> block,
-                          ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCObject> arg1,
-                          ffi.Pointer<objc.ObjCObject> arg2,
-                          ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3)>>()
-              .asFunction<
-                  instancetype Function(
-                      ffi.Pointer<objc.ObjCBlockImpl>,
-                      ffi.Pointer<ffi.Void>,
-                      ffi.Pointer<objc.ObjCObject>,
-                      ffi.Pointer<objc.ObjCObject>,
-                      ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>()
-              (ref.pointer, arg0, arg1.ref.pointer, arg2.ref.pointer, arg3)
-              .address ==
-          0
-      ? null
-      : objc.ObjCObjectBase(
-          ref.pointer.ref.invoke.cast<ffi.NativeFunction<instancetype Function(ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCObject> arg1, ffi.Pointer<objc.ObjCObject> arg2, ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3)>>().asFunction<instancetype Function(ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>, ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>()(ref.pointer, arg0, arg1.ref.pointer, arg2.ref.pointer, arg3),
-          retain: true,
-          release: true);
+  Dartinstancetype? call(ffi.Pointer<ffi.Void> arg0, NSData arg1, NSString arg2,
+          ffi.Pointer<ffi.Pointer<objc.ObjCObject>> arg3) =>
+      _ObjectiveCBindings_invokeBlock_10z9f5k(ref.pointer, arg0,
+                      arg1.ref.pointer, arg2.ref.pointer, arg3)
+                  .address ==
+              0
+          ? null
+          : objc.ObjCObjectBase(
+              _ObjectiveCBindings_invokeBlock_10z9f5k(
+                  ref.pointer, arg0, arg1.ref.pointer, arg2.ref.pointer, arg3),
+              retain: true,
+              release: true);
 }
 
 ffi.Pointer<objc.ObjCObject> _ObjCBlock_objcObjCObject_ffiVoid_fnPtrTrampoline(
-        ffi.Pointer<objc.ObjCBlockImpl> block, ffi.Pointer<ffi.Void> arg0) =>
-    block.ref.target
-        .cast<
-            ffi.NativeFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<ffi.Void> arg0)>>()
-        .asFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<ffi.Void>)>()(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_objcObjCObject_ffiVoid_fnPtrCallable =
+        ffi.Pointer<
+                ffi.NativeFunction<
+                    ffi.Pointer<objc.ObjCObject> Function(
+                        ffi.Pointer<ffi.Void> arg0)>>
+            func,
+        ffi.Pointer<ffi.Void> arg0) =>
+    func.asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>()(arg0);
+final _ObjCBlock_objcObjCObject_ffiVoid_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_fnPtrTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0)>>,
+                ffi.Pointer<ffi.Void>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_fnPtrTrampoline);
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_closureTrampoline(
             ffi.Pointer<objc.ObjCBlockImpl> block,
+            int closureId,
             ffi.Pointer<ffi.Void> arg0) =>
-        (objc.getBlockClosure(block) as ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<ffi.Void>))(arg0);
-ffi.Pointer<ffi.Void> _ObjCBlock_objcObjCObject_ffiVoid_closureCallable =
+        (objc.getBlockClosure(closureId) as ffi.Pointer<objc.ObjCObject>
+            Function(ffi.Pointer<ffi.Void>))(arg0);
+final _ObjCBlock_objcObjCObject_ffiVoid_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>, ffi.Pointer<ffi.Void>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_closureTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>`.
 abstract final class ObjCBlock_objcObjCObject_ffiVoid {
@@ -10871,13 +11486,13 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid {
   /// will result in a crash.
   static objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>
       fromFunctionPointer(
-              ffi.Pointer<
-                      ffi.NativeFunction<
-                          ffi.Pointer<objc.ObjCObject> Function(
-                              ffi.Pointer<ffi.Void> arg0)>>
+              ffi.Pointer<ffi.NativeFunction<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void> arg0)>>
                   ptr) =>
-          objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>(
-              objc.newPointerBlock(_ObjCBlock_objcObjCObject_ffiVoid_fnPtrCallable, ptr.cast()),
+          objc.ObjCBlock<
+                  ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>(
+              _ObjectiveCBindings_newPointerBlock_1mbt9g9(
+                  _ObjCBlock_objcObjCObject_ffiVoid_fnPtrCallable.cast(),
+                  ptr.cast()),
               retain: false,
               release: true);
 
@@ -10892,9 +11507,10 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid {
           objc.ObjCBlock<
                   ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_objcObjCObject_ffiVoid_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0) =>
-                      fn(arg0).ref.retainAndAutorelease()),
+                      fn(arg0).ref.retainAndAutorelease(),
+                  _ObjCBlock_objcObjCObject_ffiVoid_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_1mbt9g9),
               retain: false,
               release: true);
 }
@@ -10903,59 +11519,52 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid {
 extension ObjCBlock_objcObjCObject_ffiVoid_CallExtension on objc
     .ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>)> {
   objc.ObjCObjectBase call(ffi.Pointer<ffi.Void> arg0) => objc.ObjCObjectBase(
-      ref.pointer.ref.invoke
-          .cast<
-              ffi.NativeFunction<
-                  ffi.Pointer<objc.ObjCObject> Function(
-                      ffi.Pointer<objc.ObjCBlockImpl> block,
-                      ffi.Pointer<ffi.Void> arg0)>>()
-          .asFunction<
-              ffi.Pointer<objc.ObjCObject> Function(
-                  ffi.Pointer<objc.ObjCBlockImpl>,
-                  ffi.Pointer<ffi.Void>)>()(ref.pointer, arg0),
+      _ObjectiveCBindings_invokeBlock_1mbt9g9(ref.pointer, arg0),
       retain: true,
       release: true);
 }
 
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrTrampoline(
-            ffi.Pointer<objc.ObjCBlockImpl> block,
+            ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1)>>
+                func,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCSelector> arg1) =>
-        block.ref.target
-            .cast<
-                ffi.NativeFunction<
-                    ffi.Pointer<objc.ObjCObject> Function(
-                        ffi.Pointer<ffi.Void> arg0,
-                        ffi.Pointer<objc.ObjCSelector> arg1)>>()
-            .asFunction<
-                ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>)>()(arg0, arg1);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrCallable =
+        func.asFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>)>()(arg0, arg1);
+final _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrTrampoline);
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureTrampoline(
             ffi.Pointer<objc.ObjCBlockImpl> block,
+            int closureId,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCSelector> arg1) =>
-        (objc.getBlockClosure(block) as ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>))(arg0, arg1);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureCallable =
+        (objc.getBlockClosure(closureId)
+            as ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>))(arg0, arg1);
+final _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>`.
 abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector {
@@ -10977,14 +11586,15 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector {
   /// This block must be invoked by native code running on the same thread as
   /// the isolate that registered it. Invoking the block on the wrong thread
   /// will result in a crash.
-  static objc.ObjCBlock<
-          ffi.Pointer<objc.ObjCObject> Function(
-              ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>
+  static objc
+      .ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>
       fromFunctionPointer(ffi.Pointer<ffi.NativeFunction<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCSelector> arg1)>> ptr) =>
           objc.ObjCBlock<
                   ffi.Pointer<objc.ObjCObject> Function(
                       ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
-              objc.newPointerBlock(_ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrCallable, ptr.cast()),
+              _ObjectiveCBindings_newPointerBlock_50as9u(
+                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_fnPtrCallable.cast(),
+                  ptr.cast()),
               retain: false,
               release: true);
 
@@ -10996,12 +11606,13 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector {
   static objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>
       fromFunction(objc.ObjCObjectBase Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>) fn) =>
           objc.ObjCBlock<
-                  ffi.Pointer<objc.ObjCObject> Function(
-                      ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>)>(
+                  ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>,
+                      ffi.Pointer<objc.ObjCSelector>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCSelector> arg1) =>
-                      fn(arg0, arg1).ref.retainAndAutorelease()),
+                      fn(arg0, arg1).ref.retainAndAutorelease(),
+                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_50as9u),
               retain: false,
               release: true);
 }
@@ -11014,71 +11625,62 @@ extension ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_CallExtension
   objc.ObjCObjectBase call(
           ffi.Pointer<ffi.Void> arg0, ffi.Pointer<objc.ObjCSelector> arg1) =>
       objc.ObjCObjectBase(
-          ref.pointer.ref.invoke
-                  .cast<
-                      ffi.NativeFunction<
-                          ffi.Pointer<objc.ObjCObject> Function(
-                              ffi.Pointer<objc.ObjCBlockImpl> block,
-                              ffi.Pointer<ffi.Void> arg0,
-                              ffi.Pointer<objc.ObjCSelector> arg1)>>()
-                  .asFunction<
-                      ffi.Pointer<objc.ObjCObject> Function(
-                          ffi.Pointer<objc.ObjCBlockImpl>,
-                          ffi.Pointer<ffi.Void>,
-                          ffi.Pointer<objc.ObjCSelector>)>()(
-              ref.pointer, arg0, arg1),
+          _ObjectiveCBindings_invokeBlock_50as9u(ref.pointer, arg0, arg1),
           retain: true,
           release: true);
 }
 
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrTrampoline(
-            ffi.Pointer<objc.ObjCBlockImpl> block,
+            ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2)>>
+                func,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCSelector> arg1,
             ffi.Pointer<objc.ObjCObject> arg2) =>
-        block.ref.target
-            .cast<
-                ffi.NativeFunction<
-                    ffi.Pointer<objc.ObjCObject> Function(
-                        ffi.Pointer<ffi.Void> arg0,
-                        ffi.Pointer<objc.ObjCSelector> arg1,
-                        ffi.Pointer<objc.ObjCObject> arg2)>>()
-            .asFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>,
-                    ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1, arg2);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrCallable =
+        func.asFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1, arg2);
+final _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrTrampoline);
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureTrampoline(
             ffi.Pointer<objc.ObjCBlockImpl> block,
+            int closureId,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCSelector> arg1,
             ffi.Pointer<objc.ObjCObject> arg2) =>
-        (objc.getBlockClosure(block) as ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<ffi.Void>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureCallable =
+        (objc.getBlockClosure(closureId)
+            as ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2);
+final _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>`.
 abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject {
@@ -11109,7 +11711,7 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCO
                       ffi.Pointer<ffi.Void>,
                       ffi.Pointer<objc.ObjCSelector>,
                       ffi.Pointer<objc.ObjCObject>)>(
-              objc.newPointerBlock(_ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrCallable, ptr.cast()),
+              _ObjectiveCBindings_newPointerBlock_1mllhpc(_ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_fnPtrCallable.cast(), ptr.cast()),
               retain: false,
               release: true);
 
@@ -11122,13 +11724,14 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCO
       fromFunction(objc.ObjCObjectBase Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>, objc.ObjCObjectBase) fn) =>
           objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0,
                           ffi.Pointer<objc.ObjCSelector> arg1,
                           ffi.Pointer<objc.ObjCObject> arg2) =>
                       fn(arg0, arg1, objc.ObjCObjectBase(arg2, retain: true, release: true))
                           .ref
-                          .retainAndAutorelease()),
+                          .retainAndAutorelease(),
+                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_1mllhpc),
               retain: false,
               release: true);
 }
@@ -11141,20 +11744,7 @@ extension ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_CallE
   objc.ObjCObjectBase call(ffi.Pointer<ffi.Void> arg0,
           ffi.Pointer<objc.ObjCSelector> arg1, objc.ObjCObjectBase arg2) =>
       objc.ObjCObjectBase(
-          ref.pointer.ref.invoke
-                  .cast<
-                      ffi.NativeFunction<
-                          ffi.Pointer<objc.ObjCObject> Function(
-                              ffi.Pointer<objc.ObjCBlockImpl> block,
-                              ffi.Pointer<ffi.Void> arg0,
-                              ffi.Pointer<objc.ObjCSelector> arg1,
-                              ffi.Pointer<objc.ObjCObject> arg2)>>()
-                  .asFunction<
-                      ffi.Pointer<objc.ObjCObject> Function(
-                          ffi.Pointer<objc.ObjCBlockImpl>,
-                          ffi.Pointer<ffi.Void>,
-                          ffi.Pointer<objc.ObjCSelector>,
-                          ffi.Pointer<objc.ObjCObject>)>()(
+          _ObjectiveCBindings_invokeBlock_1mllhpc(
               ref.pointer, arg0, arg1, arg2.ref.pointer),
           retain: true,
           release: true);
@@ -11162,59 +11752,63 @@ extension ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_CallE
 
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrTrampoline(
-            ffi.Pointer<objc.ObjCBlockImpl> block,
+            ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2,
+                            ffi.Pointer<objc.ObjCObject> arg3)>>
+                func,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCSelector> arg1,
             ffi.Pointer<objc.ObjCObject> arg2,
             ffi.Pointer<objc.ObjCObject> arg3) =>
-        block.ref.target
-            .cast<
-                ffi.NativeFunction<
-                    ffi.Pointer<objc.ObjCObject> Function(
-                        ffi.Pointer<ffi.Void> arg0,
-                        ffi.Pointer<objc.ObjCSelector> arg1,
-                        ffi.Pointer<objc.ObjCObject> arg2,
-                        ffi.Pointer<objc.ObjCObject> arg3)>>()
-            .asFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1, arg2, arg3);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrCallable =
+        func.asFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>()(arg0, arg1, arg2, arg3);
+final _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<
+                    ffi.NativeFunction<
+                        ffi.Pointer<objc.ObjCObject> Function(
+                            ffi.Pointer<ffi.Void> arg0,
+                            ffi.Pointer<objc.ObjCSelector> arg1,
+                            ffi.Pointer<objc.ObjCObject> arg2,
+                            ffi.Pointer<objc.ObjCObject> arg3)>>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrTrampoline);
 ffi.Pointer<objc.ObjCObject>
     _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureTrampoline(
             ffi.Pointer<objc.ObjCBlockImpl> block,
+            int closureId,
             ffi.Pointer<ffi.Void> arg0,
             ffi.Pointer<objc.ObjCSelector> arg1,
             ffi.Pointer<objc.ObjCObject> arg2,
             ffi.Pointer<objc.ObjCObject> arg3) =>
-        (objc.getBlockClosure(block) as ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<ffi.Void>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2, arg3);
-ffi.Pointer<ffi.Void>
-    _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureCallable =
+        (objc.getBlockClosure(closureId)
+            as ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>))(arg0, arg1, arg2, arg3);
+final _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureCallable =
     ffi.Pointer.fromFunction<
-                ffi.Pointer<objc.ObjCObject> Function(
-                    ffi.Pointer<objc.ObjCBlockImpl>,
-                    ffi.Pointer<ffi.Void>,
-                    ffi.Pointer<objc.ObjCSelector>,
-                    ffi.Pointer<objc.ObjCObject>,
-                    ffi.Pointer<objc.ObjCObject>)>(
-            _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureTrampoline)
-        .cast();
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCBlockImpl>,
+                ffi.Int64,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>(
+        _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureTrampoline);
 
 /// Construction methods for `objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>)>`.
 abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject {
@@ -11252,7 +11846,7 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCO
                       ffi.Pointer<objc.ObjCSelector>,
                       ffi.Pointer<objc.ObjCObject>,
                       ffi.Pointer<objc.ObjCObject>)>(
-              objc.newPointerBlock(_ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrCallable, ptr.cast()),
+              _ObjectiveCBindings_newPointerBlock_c7gk2u(_ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_fnPtrCallable.cast(), ptr.cast()),
               retain: false,
               release: true);
 
@@ -11265,14 +11859,15 @@ abstract final class ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCO
       fromFunction(objc.ObjCObjectBase Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>, objc.ObjCObjectBase, objc.ObjCObjectBase) fn) =>
           objc.ObjCBlock<ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<ffi.Void>, ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCObject>)>(
               objc.newClosureBlock(
-                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureCallable,
                   (ffi.Pointer<ffi.Void> arg0,
                           ffi.Pointer<objc.ObjCSelector> arg1,
                           ffi.Pointer<objc.ObjCObject> arg2,
                           ffi.Pointer<objc.ObjCObject> arg3) =>
                       fn(arg0, arg1, objc.ObjCObjectBase(arg2, retain: true, release: true), objc.ObjCObjectBase(arg3, retain: true, release: true))
                           .ref
-                          .retainAndAutorelease()),
+                          .retainAndAutorelease(),
+                  _ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcObjCObject_closureCallable.cast(),
+                  _ObjectiveCBindings_newClosureBlock_c7gk2u),
               retain: false,
               release: true);
 }
@@ -11291,22 +11886,8 @@ extension ObjCBlock_objcObjCObject_ffiVoid_objcObjCSelector_objcObjCObject_objcO
           objc.ObjCObjectBase arg2,
           objc.ObjCObjectBase arg3) =>
       objc.ObjCObjectBase(
-          ref.pointer.ref.invoke
-              .cast<
-                  ffi.NativeFunction<
-                      ffi.Pointer<objc.ObjCObject> Function(
-                          ffi.Pointer<objc.ObjCBlockImpl> block,
-                          ffi.Pointer<ffi.Void> arg0,
-                          ffi.Pointer<objc.ObjCSelector> arg1,
-                          ffi.Pointer<objc.ObjCObject> arg2,
-                          ffi.Pointer<objc.ObjCObject> arg3)>>()
-              .asFunction<
-                  ffi.Pointer<objc.ObjCObject> Function(
-                      ffi.Pointer<objc.ObjCBlockImpl>,
-                      ffi.Pointer<ffi.Void>,
-                      ffi.Pointer<objc.ObjCSelector>,
-                      ffi.Pointer<objc.ObjCObject>,
-                      ffi.Pointer<objc.ObjCObject>)>()(ref.pointer, arg0, arg1, arg2.ref.pointer, arg3.ref.pointer),
+          _ObjectiveCBindings_invokeBlock_c7gk2u(
+              ref.pointer, arg0, arg1, arg2.ref.pointer, arg3.ref.pointer),
           retain: true,
           release: true);
 }
@@ -11328,7 +11909,7 @@ class Protocol extends objc.ObjCObjectBase {
 
   /// Returns whether [obj] is an instance of [Protocol].
   static bool isInstance(objc.ObjCObjectBase obj) {
-    return _objc_msgSend_69e0x1(
+    return _objc_msgSend_19nvye5(
         obj.ref.pointer, _sel_isKindOfClass_, _class_Protocol);
   }
 }
@@ -11377,38 +11958,50 @@ late final _class_NSURL = objc.getClass("NSURL");
 late final _class_NSURLHandle = objc.getClass("NSURLHandle");
 late final _class_NSValue = objc.getClass("NSValue");
 late final _class_Protocol = objc.getClass("Protocol");
-final _objc_msgSend_10i1axw = objc.msgSendPointer
+final _objc_msgSend_102xxo4 = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            NSRange Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong)>>()
+    .asFunction<
+        NSRange Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int)>();
+final _objc_msgSend_102xxo4Stret = objc.msgSendStretPointer
     .cast<
         ffi.NativeFunction<
             ffi.Void Function(
+                ffi.Pointer<NSRange>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.UnsignedLong)>>()
     .asFunction<
         void Function(
+            ffi.Pointer<NSRange>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_1140663 = objc.msgSendPointer
+final _objc_msgSend_11cbyu0 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Bool Function(
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Bool,
                 ffi.UnsignedLong,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        bool Function(
+        ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            bool,
             int,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_11e9f5x = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11420,14 +12013,22 @@ final _objc_msgSend_11e9f5x = objc.msgSendPointer
     .asFunction<
         int Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Uint8>, int)>();
-final _objc_msgSend_12mhqtk = objc.msgSendPointer
+final _objc_msgSend_11spmsz = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedInt)>>()
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_12py2ux = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11436,6 +12037,14 @@ final _objc_msgSend_12py2ux = objc.msgSendPointer
     .asFunction<
         int Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_13mclwd = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Char)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
 final _objc_msgSend_13yqbb6 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11444,131 +12053,134 @@ final _objc_msgSend_13yqbb6 = objc.msgSendPointer
     .asFunction<
         int Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_13z9dkp = objc.msgSendPointer
+final _objc_msgSend_140ec04 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Void Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.UnsignedShort>,
-                ffi.UnsignedLong)>>()
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Void>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
+        void Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.UnsignedShort>,
-            int)>();
-final _objc_msgSend_146986e = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Void>)>();
+final _objc_msgSend_14hpxwa = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.UnsignedLong,
-                ffi.Pointer<objc.ObjCObject>)>>()
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedLong)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_14hvw5k = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Int)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_151sglz = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            int,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_16ydezh = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
+final _objc_msgSend_158ju31 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Long Function(
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Uint8>,
                 ffi.UnsignedLong)>>()
     .asFunction<
-        int Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int)>();
-final _objc_msgSend_1705co6 = objc.msgSendPointer
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Uint8>, int)>();
+final _objc_msgSend_15qeuct = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_17xjpl7 = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_161ne8y = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Long,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.Pointer<ffi.Void>,
+                ffi.UnsignedLong,
+                ffi.Bool)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Void>,
             int,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_189974q = objc.msgSendPointer
+            bool)>();
+final _objc_msgSend_16f0drb = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.LongLong)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_17amj0z = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.Bool)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_197wcu5 = objc.msgSendPointer
+            bool)>();
+final _objc_msgSend_182fzon = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            NSRange Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                NSRange,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            NSRange,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_198mga8 = objc.msgSendPointer
+        NSRange Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_182fzonStret = objc.msgSendStretPointer
     .cast<
         ffi.NativeFunction<
-            NSRange Function(
+            ffi.Void Function(
+                ffi.Pointer<NSRange>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                NSRange,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        NSRange Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int,
-            NSRange,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_198mga8Stret = objc.msgSendStretPointer
+        void Function(ffi.Pointer<NSRange>, ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_1895u4n = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Void Function(
-                ffi.Pointer<NSRange>,
+            ffi.Long Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
@@ -11576,24 +12188,29 @@ final _objc_msgSend_198mga8Stret = objc.msgSendStretPointer
                 NSRange,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        void Function(
-            ffi.Pointer<NSRange>,
+        int Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int,
             NSRange,
             ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_19hbqky = objc.msgSendPointer
+final _objc_msgSend_18qun1e = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Void Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCSelector>)>>()
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCBlockImpl>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCSelector>)>();
+        void Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCBlockImpl>)>();
 final _objc_msgSend_19lrthf = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11608,61 +12225,32 @@ final _objc_msgSend_19lrthf = objc.msgSendPointer
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<ffi.Pointer<ffi.Uint8>>,
             ffi.Pointer<ffi.UnsignedLong>)>();
-final _objc_msgSend_19qmeje = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Void>,
-                ffi.UnsignedLong)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Void>, int)>();
-final _objc_msgSend_19v53ht = objc.msgSendPointer
+final _objc_msgSend_19nvye5 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Bool Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Bool,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            bool,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_1a0iyvk = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Int)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_1aoxlyn = objc.msgSendPointer
+        bool Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_1alewu7 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.Pointer<ffi.UnsignedLong>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>)>();
+            ffi.Pointer<ffi.UnsignedLong>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
 final _objc_msgSend_1b5ysjl = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11679,34 +12267,26 @@ final _objc_msgSend_1b5ysjl = objc.msgSendPointer
             ffi.Pointer<NSFastEnumerationState>,
             ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
             int)>();
-final _objc_msgSend_1bdmr5f = objc.msgSendPointer
+final _objc_msgSend_1ceswyu = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Bool)>>()
+                ffi.UnsignedLong,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Bool>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            bool)>();
-final _objc_msgSend_1c7f48q = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Void Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.UnsignedLong,
-                ffi.Pointer<objc.ObjCObject>)>>()
-    .asFunction<
-        void Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
             int,
-            ffi.Pointer<objc.ObjCObject>)>();
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Bool>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
 final _objc_msgSend_1co9mn4 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11715,22 +12295,14 @@ final _objc_msgSend_1co9mn4 = objc.msgSendPointer
     .asFunction<
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_1cqd8wl = objc.msgSendPointer
+final _objc_msgSend_1cwp428 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                NSRange,
-                ffi.Bool)>>()
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<_NSZone>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            NSRange,
-            bool)>();
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<_NSZone>)>();
 final _objc_msgSend_1d9e4oe = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11749,6 +12321,22 @@ final _objc_msgSend_1deg8x = objc.msgSendPointer
     .asFunction<
         int Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_1dydpdi = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+                ffi.UnsignedLong)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+            int)>();
 final _objc_msgSend_1e3pm0z = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11765,14 +12353,6 @@ final _objc_msgSend_1efxbd8 = objc.msgSendPointer
     .asFunction<
         int Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1f4qa0h = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Float)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, double)>();
 final _objc_msgSend_1fuqfwb = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11781,40 +12361,36 @@ final _objc_msgSend_1fuqfwb = objc.msgSendPointer
     .asFunction<
         ffi.Pointer<ffi.Char> Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1ghpoap = objc.msgSendPointer
+final _objc_msgSend_1ged0jd = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
+                ffi.Bool,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
+            bool,
             ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_1gxo8gv = objc.msgSendPointer
+final _objc_msgSend_1gypgok = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Void Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.UnsignedLong>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.UnsignedLong,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
+        void Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.UnsignedLong>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+            int,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_1h2q612 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11839,40 +12415,22 @@ final _objc_msgSend_1i9r4xy = objc.msgSendPointer
     .asFunction<
         void Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_1ih2cte = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Long)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_1jdvcbf = objc.msgSendPointer
+final _objc_msgSend_1j9bhml = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Void Function(
+            ffi.Bool Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>)>>()
-    .asFunction<
-        void Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_1je1k7e = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Void>,
-                ffi.UnsignedLong,
-                ffi.Bool)>>()
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
+        bool Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Void>,
-            int,
-            bool)>();
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
 final _objc_msgSend_1jtxufi = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11889,6 +12447,24 @@ final _objc_msgSend_1jwityx = objc.msgSendPointer
     .asFunction<
         int Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
+final _objc_msgSend_1k0ezzm = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
 final _objc_msgSend_1k101e3 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -11897,67 +12473,65 @@ final _objc_msgSend_1k101e3 = objc.msgSendPointer
     .asFunction<
         int Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1ko4qka = objc.msgSendPointer
+final _objc_msgSend_1k1o1s7 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.UnsignedChar Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>)>>()
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, NSRange)>>()
     .asFunction<
-        int Function(
-            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1kwndnw = objc.msgSendPointer
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, NSRange)>();
+final _objc_msgSend_1k4kd9s = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            NSRange Function(
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.UnsignedLong)>>()
     .asFunction<
-        NSRange Function(
+        ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_1kwndnwStret = objc.msgSendStretPointer
+final _objc_msgSend_1k745tv = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Void Function(
-                ffi.Pointer<NSRange>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong)>>()
+                ffi.Long)>>()
     .asFunction<
         void Function(
-            ffi.Pointer<NSRange>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_1l3kbc1 = objc.msgSendPointer
+final _objc_msgSend_1ko4qka = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Bool)>>()
+            ffi.UnsignedChar Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, bool)>();
-final _objc_msgSend_1lqqdvl = objc.msgSendPointer
+        int Function(
+            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
+final _objc_msgSend_1lhpu4m = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                ffi.UnsignedLong)>>()
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-            int)>();
-final _objc_msgSend_1lqxdg3 = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_1lsax7n = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Bool Function(
@@ -11974,39 +12548,103 @@ final _objc_msgSend_1lqxdg3 = objc.msgSendPointer
 final _objc_msgSend_1lv8yz3 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Bool Function(
+            ffi.Bool Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<ffi.Char>,
+                ffi.UnsignedLong,
+                ffi.UnsignedLong)>>()
+    .asFunction<
+        bool Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>, int, int)>();
+final _objc_msgSend_1n40f6p = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<ffi.Char>,
+                ffi.Bool,
+                ffi.Pointer<objc.ObjCObject>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<ffi.Char>,
+            bool,
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_1njucl2 = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedShort)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_1nmlvqc = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            NSRange Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
+                NSRange)>>()
+    .asFunction<
+        NSRange Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int,
+            NSRange)>();
+final _objc_msgSend_1nmlvqcStret = objc.msgSendStretPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Void Function(
+                ffi.Pointer<NSRange>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Char>,
+                ffi.Pointer<objc.ObjCObject>,
                 ffi.UnsignedLong,
-                ffi.UnsignedLong)>>()
+                NSRange)>>()
     .asFunction<
-        bool Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>, int, int)>();
-final _objc_msgSend_1okds6o = objc.msgSendPointer
+        void Function(
+            ffi.Pointer<NSRange>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int,
+            NSRange)>();
+final _objc_msgSend_1nomli1 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Long,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
                 ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
             int,
             ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_1p4b7x4 = objc.msgSendPointer
+final _objc_msgSend_1ozwf6k = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.UnsignedLong Function(
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
+                ffi.Double,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        int Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            double,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_1p4gbjy = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12035,14 +12673,32 @@ final _objc_msgSend_1pl9qdv = objc.msgSendPointer
     .asFunction<
         void Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1qrcblu = objc.msgSendPointer
+final _objc_msgSend_1pnyuds = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedLong)>>()
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_1sotr3r = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_1srf6wk = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12053,7 +12709,15 @@ final _objc_msgSend_1srf6wk = objc.msgSendPointer
     .asFunction<
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1uj57oj = objc.msgSendPointer
+final _objc_msgSend_1t6aok9 = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Bool)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, bool)>();
+final _objc_msgSend_1tfztp = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
@@ -12061,16 +12725,44 @@ final _objc_msgSend_1uj57oj = objc.msgSendPointer
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.UnsignedLong,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.UnsignedLong)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             int,
             ffi.Pointer<objc.ObjCObject>,
+            int)>();
+final _objc_msgSend_1tiux5i = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
+            int,
             ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_1tv4uax = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Void Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                NSRange,
+                ffi.Pointer<objc.ObjCObject>)>>()
+    .asFunction<
+        void Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            NSRange,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_1ukqyt8 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12087,64 +12779,106 @@ final _objc_msgSend_1ukqyt8Fpret = objc.msgSendFpretPointer
     .asFunction<
         double Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1wlgx7q = objc.msgSendPointer
+final _objc_msgSend_1vd1c5m = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.UnsignedLong Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>)>>()
+    .asFunction<
+        int Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_1vnlaqg = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Long,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
+            int,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_1vxoo9h = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Bool Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+    .asFunction<
+        bool Function(
+            ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_1wpduvy = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            int,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_1wdb8ji = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Long Function(
+            ffi.Bool Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Long)>>()
     .asFunction<
-        int Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_1wrs2o6 = objc.msgSendPointer
+        bool Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int)>();
+final _objc_msgSend_1wt9a7r = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
+                ffi.UnsignedLong,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                NSRange)>>()
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
+            int,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>,
-            int,
-            NSRange)>();
-final _objc_msgSend_1x359cv = objc.msgSendPointer
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_1x2hskc = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>)>>()
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedLongLong)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_1x911p2 = objc.msgSendPointer
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_1ya1kjn = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Double)>>()
+                ffi.Pointer<objc.ObjCSelector>, ffi.Int64)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, double)>();
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_1ym6zyw = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Long Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>)>>()
+    .asFunction<
+        int Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_2cgrxl = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12161,7 +12895,7 @@ final _objc_msgSend_2cgrxlFpret = objc.msgSendFpretPointer
     .asFunction<
         double Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_2izev6 = objc.msgSendPointer
+final _objc_msgSend_2u4jm6 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
@@ -12169,94 +12903,95 @@ final _objc_msgSend_2izev6 = objc.msgSendPointer
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.UnsignedLong,
+                NSRange)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_3ems5q = objc.msgSendPointer
+            int,
+            NSRange)>();
+final _objc_msgSend_3cbdpb = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Bool>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            int,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Bool>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_3pyzne = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.UnsignedInt Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>)>>()
-    .asFunction<
-        int Function(
-            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_582s3n = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_3ctkt6 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.Pointer<objc.ObjCSelector>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_5ty9km = objc.msgSendPointer
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCSelector>)>();
+final _objc_msgSend_3l8zum = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Bool Function(
+            ffi.Void Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Long)>>()
+                ffi.UnsignedLong)>>()
     .asFunction<
-        bool Function(
+        void Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_62nh5j = objc.msgSendPointer
+final _objc_msgSend_3nbx5e = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.Pointer<ffi.Void>,
+                ffi.UnsignedLong)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_69e0x1 = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Void>, int)>();
+final _objc_msgSend_3pyzne = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Bool Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+            ffi.UnsignedInt Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>)>>()
     .asFunction<
-        bool Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
+        int Function(
+            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
+final _objc_msgSend_56zxyn = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>)>();
+final _objc_msgSend_68x6r1 = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Short)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
 final _objc_msgSend_6ex6p5 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12265,22 +13000,6 @@ final _objc_msgSend_6ex6p5 = objc.msgSendPointer
     .asFunction<
         ffi.Pointer<ffi.Void> Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_6h48uq = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Bool Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
-    .asFunction<
-        bool Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
 final _objc_msgSend_6peh6o = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12289,41 +13008,68 @@ final _objc_msgSend_6peh6o = objc.msgSendPointer
     .asFunction<
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_7iv28v = objc.msgSendPointer
+final _objc_msgSend_6z4k82 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Bool Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+                ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
         bool Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+            ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_7ukip1 = objc.msgSendPointer
+final _objc_msgSend_7g3u2y = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Long)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_7kpg7m = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Uint8>,
+                ffi.Pointer<objc.ObjCObject>,
                 ffi.UnsignedLong)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Uint8>, int)>();
-final _objc_msgSend_83z673 = objc.msgSendPointer
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int)>();
+final _objc_msgSend_7uautw = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, NSRange)>>()
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedChar)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, NSRange)>();
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_8321cp = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int,
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
 final _objc_msgSend_898fog = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12365,30 +13111,6 @@ final _objc_msgSend_8cymbm = objc.msgSendPointer
     .asFunction<
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>, int)>();
-final _objc_msgSend_8o14b = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Long)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_91c9gi = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Void Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCBlockImpl>)>>()
-    .asFunction<
-        void Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCBlockImpl>)>();
 final _objc_msgSend_91o635 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12397,113 +13119,46 @@ final _objc_msgSend_91o635 = objc.msgSendPointer
     .asFunction<
         bool Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_94cet5 = objc.msgSendPointer
+final _objc_msgSend_9b3h4v = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Void>,
                 ffi.UnsignedLong,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_94zdgv = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.LongLong)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_98pnic = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedLongLong)>>()
+                ffi.UnsignedLong)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_a15xhc = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Void>, int, int)>();
+final _objc_msgSend_9x4k8x = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Char>,
+                ffi.Pointer<ffi.UnsignedShort>,
                 ffi.UnsignedLong)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>, int)>();
-final _objc_msgSend_ackzik = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            NSRange Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                NSRange)>>()
-    .asFunction<
-        NSRange Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int,
-            NSRange)>();
-final _objc_msgSend_ackzikStret = objc.msgSendStretPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Void Function(
-                ffi.Pointer<NSRange>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                NSRange)>>()
-    .asFunction<
-        void Function(
-            ffi.Pointer<NSRange>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int,
-            NSRange)>();
-final _objc_msgSend_blqzg8 = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Bool Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
-    .asFunction<
-        bool Function(
+        ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_bo6ep4 = objc.msgSendPointer
+            ffi.Pointer<ffi.UnsignedShort>,
+            int)>();
+final _objc_msgSend_bstjp9 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                NSRange,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+            NSRange,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_c0vg4w = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12520,30 +13175,22 @@ final _objc_msgSend_c0vg4w = objc.msgSendPointer
             NSRange,
             ffi.Pointer<ffi.Void>,
             int)>();
-final _objc_msgSend_cfqbni = objc.msgSendPointer
+final _objc_msgSend_cfx8ce = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-                ffi.UnsignedLong)>>()
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
-            int)>();
-final _objc_msgSend_cvzqr9 = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Short)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_d3i1uy = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12563,7 +13210,15 @@ final _objc_msgSend_d3i1uyStret = objc.msgSendStretPointer
     .asFunction<
         void Function(ffi.Pointer<NSRange>, ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_dcd68g = objc.msgSendPointer
+final _objc_msgSend_degb40 = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedInt)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_diypgk = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
@@ -12577,36 +13232,52 @@ final _objc_msgSend_dcd68g = objc.msgSendPointer
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_dnlotu = objc.msgSendPointer
+final _objc_msgSend_djsa9o = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Void Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.UnsignedLong)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
+        void Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_eeuxub = objc.msgSendPointer
+final _objc_msgSend_dv3z6r = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Long Function(
+            ffi.Bool Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
+                ffi.Bool,
                 ffi.UnsignedLong,
-                NSRange)>>()
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
-        int Function(
+        bool Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
+            bool,
             int,
-            NSRange)>();
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_e9mncn = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<ffi.Void>,
+                ffi.Pointer<ffi.Char>)>>()
+    .asFunction<
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<ffi.Void>,
+            ffi.Pointer<ffi.Char>)>();
 final _objc_msgSend_eh32gn = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12618,36 +13289,25 @@ final _objc_msgSend_eh32gn = objc.msgSendPointer
     .asFunction<
         void Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, NSRange, ffi.Pointer<ffi.Void>)>();
-final _objc_msgSend_exgdqb = objc.msgSendPointer
+final _objc_msgSend_erqryg = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.UnsignedLong,
-                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Char>,
                 ffi.UnsignedLong)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            int,
-            ffi.Pointer<objc.ObjCObject>,
-            int)>();
-final _objc_msgSend_fcs5vo = objc.msgSendPointer
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>, int)>();
+final _objc_msgSend_et8cuh = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong)>>()
+            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.Float)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int)>();
+        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, double)>();
 final _objc_msgSend_gerswc = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12656,28 +13316,66 @@ final _objc_msgSend_gerswc = objc.msgSendPointer
     .asFunction<
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_hglvhy = objc.msgSendPointer
+final _objc_msgSend_gg0462 = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            NSRange Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
+                NSRange,
+                ffi.Pointer<objc.ObjCObject>)>>()
+    .asFunction<
+        NSRange Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int,
+            NSRange,
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_gg0462Stret = objc.msgSendStretPointer
     .cast<
         ffi.NativeFunction<
             ffi.Void Function(
+                ffi.Pointer<NSRange>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.UnsignedLong,
+                NSRange,
+                ffi.Pointer<objc.ObjCObject>)>>()
+    .asFunction<
+        void Function(
+            ffi.Pointer<NSRange>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            int,
+            NSRange,
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_gx50so = objc.msgSendPointer
+    .cast<
+        ffi.NativeFunction<
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong)>>()
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        void Function(
+        ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int)>();
-final _objc_msgSend_hzlb60 = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_hiwitm = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<_NSZone>)>>()
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedLong, ffi.Bool)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<_NSZone>)>();
+            ffi.Pointer<objc.ObjCSelector>, int, bool)>();
 final _objc_msgSend_i30zh3 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12702,100 +13400,70 @@ final _objc_msgSend_i30zh3 = objc.msgSendPointer
             int,
             NSRange,
             ffi.Pointer<NSRange>)>();
-final _objc_msgSend_i38ton = objc.msgSendPointer
+final _objc_msgSend_jsclrq = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Void>,
-                ffi.UnsignedLong,
-                ffi.UnsignedLong)>>()
+            ffi.Bool Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedInt)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Void>, int, int)>();
-final _objc_msgSend_i4hdht = objc.msgSendPointer
+        bool Function(ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>, int)>();
+final _objc_msgSend_k4j8m3 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Long Function(
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<ffi.Void>,
                 ffi.UnsignedLong,
-                NSRange,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.UnsignedLong,
+                ffi.Bool)>>()
     .asFunction<
-        int Function(
+        ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<ffi.Void>,
             int,
-            NSRange,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_i4ny2p = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Void Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                NSRange,
-                ffi.Pointer<objc.ObjCObject>)>>()
-    .asFunction<
-        void Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            NSRange,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_jsclrq = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Bool Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedInt)>>()
-    .asFunction<
-        bool Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_kq0sbq = objc.msgSendPointer
+            int,
+            bool)>();
+final _objc_msgSend_l9p60w = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Void Function(
+            ffi.Bool Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<ffi.Void>)>>()
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
     .asFunction<
-        void Function(
+        bool Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<ffi.Void>)>();
-final _objc_msgSend_o2ktnn = objc.msgSendPointer
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
+final _objc_msgSend_lh0jh5 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Void>,
-                ffi.UnsignedLong,
+                ffi.Pointer<ffi.UnsignedShort>,
                 ffi.UnsignedLong,
                 ffi.Bool)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Void>,
-            int,
+            ffi.Pointer<ffi.UnsignedShort>,
             int,
             bool)>();
-final _objc_msgSend_onx6bi = objc.msgSendPointer
+final _objc_msgSend_oa8mke = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedShort)>>()
+                ffi.Pointer<objc.ObjCSelector>, ffi.Double)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
+            ffi.Pointer<objc.ObjCSelector>, double)>();
 final _objc_msgSend_otx1t4 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12830,68 +13498,34 @@ final _objc_msgSend_p4nurx = objc.msgSendPointer
     .asFunction<
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, NSRange)>();
-final _objc_msgSend_p8i56h = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<objc.ObjCObject>,
-            int,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_pdn1fa = objc.msgSendPointer
+final _objc_msgSend_pfv6jd = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Void Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
+        void Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            int,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_pww1yj = objc.msgSendPointer
+            ffi.Pointer<objc.ObjCObject>)>();
+final _objc_msgSend_pg1fnv = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Void Function(
+            ffi.Long Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Long)>>()
+                ffi.UnsignedLong)>>()
     .asFunction<
-        void Function(
+        int Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
             int)>();
-final _objc_msgSend_qid8e9 = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Char>,
-                ffi.Bool,
-                ffi.Pointer<objc.ObjCObject>)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Char>,
-            bool,
-            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_qm9f5w = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12900,58 +13534,48 @@ final _objc_msgSend_qm9f5w = objc.msgSendPointer
     .asFunction<
         int Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, NSRange)>();
-final _objc_msgSend_qtxoq7 = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.Void>,
-                ffi.Pointer<ffi.Char>)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.Void>,
-            ffi.Pointer<ffi.Char>)>();
-final _objc_msgSend_r25hnf = objc.msgSendPointer
+final _objc_msgSend_qugqlf = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Int64)>>()
+                ffi.Pointer<objc.ObjCSelector>, ffi.Long)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_rqwdif = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<ffi.Char>)>();
-final _objc_msgSend_rsfdlh = objc.msgSendPointer
+final _objc_msgSend_rc4ypv = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
+                ffi.Long,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
+            int,
             ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_rubz6a = objc.msgSendPointer
+final _objc_msgSend_s92gih = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedLong, ffi.Bool)>>()
+            ffi.Pointer<objc.ObjCObject> Function(
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int, bool)>();
+        ffi.Pointer<objc.ObjCObject> Function(
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCSelector>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>,
+            ffi.Pointer<objc.ObjCObject>)>();
 final _objc_msgSend_sz90oi = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -12987,97 +13611,56 @@ final _objc_msgSend_uimyc7Stret = objc.msgSendStretPointer
     .asFunction<
         void Function(ffi.Pointer<NSRange>, ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, NSRange)>();
-final _objc_msgSend_uzucl8 = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.UnsignedChar)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_vdkl2d = objc.msgSendPointer
+final _objc_msgSend_w9bq5x = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Bool Function(
+            ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.UnsignedLong,
-                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>>()
+                NSRange,
+                ffi.Bool)>>()
     .asFunction<
-        bool Function(
+        ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>,
-            int,
-            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>)>();
-final _objc_msgSend_vx1f2d = objc.msgSendPointer
+            NSRange,
+            bool)>();
+final _objc_msgSend_xmlz1t = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>, ffi.Char)>>()
+            ffi.Char Function(ffi.Pointer<objc.ObjCObject>,
+                ffi.Pointer<objc.ObjCSelector>)>>()
     .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, int)>();
-final _objc_msgSend_wjvic9 = objc.msgSendPointer
+        int Function(
+            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
+final _objc_msgSend_xrqic1 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
-            ffi.Void Function(
+            ffi.Long Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCObject>)>>()
+                ffi.UnsignedLong,
+                NSRange)>>()
     .asFunction<
-        void Function(
+        int Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
             ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_x4muu7 = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            NSRange Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<objc.ObjCObject>)>>()
-    .asFunction<
-        NSRange Function(ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_x4muu7Stret = objc.msgSendStretPointer
+            int,
+            NSRange)>();
+final _objc_msgSend_xtuoz7 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Void Function(
-                ffi.Pointer<NSRange>,
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
                 ffi.Pointer<objc.ObjCObject>)>>()
     .asFunction<
-        void Function(ffi.Pointer<NSRange>, ffi.Pointer<objc.ObjCObject>,
+        void Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_xh7c7e = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Pointer<objc.ObjCObject> Function(
-                ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>,
-                ffi.Double,
-                ffi.Pointer<objc.ObjCObject>)>>()
-    .asFunction<
-        ffi.Pointer<objc.ObjCObject> Function(
-            ffi.Pointer<objc.ObjCObject>,
-            ffi.Pointer<objc.ObjCSelector>,
-            double,
-            ffi.Pointer<objc.ObjCObject>)>();
-final _objc_msgSend_xmlz1t = objc.msgSendPointer
-    .cast<
-        ffi.NativeFunction<
-            ffi.Char Function(ffi.Pointer<objc.ObjCObject>,
-                ffi.Pointer<objc.ObjCSelector>)>>()
-    .asFunction<
-        int Function(
-            ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
 final _objc_msgSend_xw2lbc = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -13086,22 +13669,20 @@ final _objc_msgSend_xw2lbc = objc.msgSendPointer
     .asFunction<
         int Function(
             ffi.Pointer<objc.ObjCObject>, ffi.Pointer<objc.ObjCSelector>)>();
-final _objc_msgSend_zsd8q9 = objc.msgSendPointer
+final _objc_msgSend_zmbtbd = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
             ffi.Pointer<objc.ObjCObject> Function(
                 ffi.Pointer<objc.ObjCObject>,
                 ffi.Pointer<objc.ObjCSelector>,
-                ffi.Pointer<ffi.UnsignedShort>,
-                ffi.UnsignedLong,
-                ffi.Bool)>>()
+                ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+                ffi.UnsignedLong)>>()
     .asFunction<
         ffi.Pointer<objc.ObjCObject> Function(
             ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>,
-            ffi.Pointer<ffi.UnsignedShort>,
-            int,
-            bool)>();
+            ffi.Pointer<ffi.Pointer<objc.ObjCObject>>,
+            int)>();
 final _objc_msgSend_zuf90e = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
diff --git a/pkgs/objective_c/src/objective_c.c b/pkgs/objective_c/src/objective_c.c
index 29ccd3244..c3d963944 100644
--- a/pkgs/objective_c/src/objective_c.c
+++ b/pkgs/objective_c/src/objective_c.c
@@ -10,15 +10,31 @@
 #include "include/dart_api_dl.h"
 #include "objective_c_runtime.h"
 
-// Dispose helper for ObjC blocks that wrap a Dart closure. For these blocks,
-// the target is an int ID, and the dispose_port is listening for these IDs.
-void DOBJC_disposeObjCBlockWithClosure(ObjCBlockImpl* block) {
-  Dart_PostInteger_DL(block->dispose_port, (int64_t)block->target);
+typedef struct _ObjCBlockInternal {
+  void *isa;
+  int flags;
+  int reserved;
+  void *invoke;
+  void *descriptor;
+} ObjCBlockInternal;
+
+// https://opensource.apple.com/source/libclosure/libclosure-38/Block_private.h
+extern void *_NSConcreteStackBlock[32];
+extern void *_NSConcreteMallocBlock[32];
+extern void *_NSConcreteAutoBlock[32];
+extern void *_NSConcreteFinalizingBlock[32];
+extern void *_NSConcreteGlobalBlock[32];
+extern void *_NSConcreteWeakBlockVariable[32];
+
+// Dispose helper for ObjC blocks that wrap a Dart closure.
+void DOBJC_disposeObjCBlockWithClosure(int64_t dispose_port, int64_t closure_id) {
+  Dart_PostInteger_DL(dispose_port, closure_id);
 }
 
 bool DOBJC_isValidBlock(ObjCBlockImpl* block) {
   if (block == NULL) return false;
-  void* isa = block->isa;
+  ObjCBlockInternal* blk = (ObjCBlockInternal*)block;
+  void* isa = blk->isa;
   return isa == &_NSConcreteStackBlock || isa == &_NSConcreteMallocBlock ||
          isa == &_NSConcreteAutoBlock || isa == &_NSConcreteFinalizingBlock ||
          isa == &_NSConcreteGlobalBlock || isa == &_NSConcreteWeakBlockVariable;
diff --git a/pkgs/objective_c/src/objective_c.h b/pkgs/objective_c/src/objective_c.h
index 29ffa044b..d4fbabd9b 100644
--- a/pkgs/objective_c/src/objective_c.h
+++ b/pkgs/objective_c/src/objective_c.h
@@ -10,7 +10,7 @@
 #include "objective_c_runtime.h"
 
 // Dispose helper for ObjC blocks that wrap a Dart closure.
-FFI_EXPORT void DOBJC_disposeObjCBlockWithClosure(ObjCBlockImpl *block);
+FFI_EXPORT void DOBJC_disposeObjCBlockWithClosure(int64_t dispose_port, int64_t closure_id);
 
 // Returns whether the block is valid and live. The pointer must point to
 // readable memory, or be null. May (rarely) return false positives.
diff --git a/pkgs/objective_c/src/objective_c_bindings_generated.m b/pkgs/objective_c/src/objective_c_bindings_generated.m
index 951871d0c..9857c2230 100644
--- a/pkgs/objective_c/src/objective_c_bindings_generated.m
+++ b/pkgs/objective_c/src/objective_c_bindings_generated.m
@@ -8,147 +8,697 @@
 #error "This file must be compiled with ARC enabled"
 #endif
 
-id objc_retain(id);
 id objc_retainBlock(id);
 
+@interface _ObjectiveCBindings_BlockDestroyer : NSObject {}
+@property int64_t closure_id;
+@property int64_t dispose_port;
+@property void (*dtor)(int64_t, int64_t);
++ (instancetype)new:(int64_t) closure_id disposePort:(int64_t) dispose_port
+    destructor:(void (*)(int64_t, int64_t)) dtor;
+- (void)dealloc;
+@end
+@implementation _ObjectiveCBindings_BlockDestroyer
++ (instancetype)new:(int64_t) closure_id disposePort:(int64_t) dispose_port
+    destructor:(void (*)(int64_t, int64_t)) dtor {
+  _ObjectiveCBindings_BlockDestroyer* d = [[_ObjectiveCBindings_BlockDestroyer alloc] init];
+  d.closure_id = closure_id;
+  d.dispose_port = dispose_port;
+  d.dtor = dtor;
+  return d;
+}
+- (void)dealloc { self.dtor(self.dispose_port, self.closure_id); }
+@end
+
 Protocol* _ObjectiveCBindings_NSStreamDelegate(void) { return @protocol(NSStreamDelegate); }
 
-typedef void  (^_ListenerTrampoline)(id arg0, id arg1, id arg2);
+typedef id  (^_BlockType)(void * arg0);
+__attribute__((visibility("default"))) __attribute__((used))
+id  _ObjectiveCBindings_invokeBlock_1mbt9g9(
+    _BlockType block, void * arg0)  {
+  return block(arg0);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType _ObjectiveCBindings_newPointerBlock_1mbt9g9(id  (*trampoline)(id  (*)(void * ), void * ), id  (*func)(void * )) NS_RETURNS_RETAINED {
+  return ^id (void * arg0) {
+    return trampoline(func, arg0);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType _ObjectiveCBindings_newClosureBlock_1mbt9g9(
+    id  (*trampoline)(id , int64_t , void * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType weakBlk;
+  _BlockType blk = ^id (void * arg0) {
+    return trampoline(weakBlk, obj.closure_id, arg0);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef unsigned long  (^_BlockType1)(void * arg0);
+__attribute__((visibility("default"))) __attribute__((used))
+unsigned long  _ObjectiveCBindings_invokeBlock_1ckyi24(
+    _BlockType1 block, void * arg0)  {
+  return block(arg0);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType1 _ObjectiveCBindings_newPointerBlock_1ckyi24(unsigned long  (*trampoline)(unsigned long  (*)(void * ), void * ), unsigned long  (*func)(void * )) NS_RETURNS_RETAINED {
+  return ^unsigned long (void * arg0) {
+    return trampoline(func, arg0);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType1 _ObjectiveCBindings_newClosureBlock_1ckyi24(
+    unsigned long  (*trampoline)(id , int64_t , void * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType1 weakBlk;
+  _BlockType1 blk = ^unsigned long (void * arg0) {
+    return trampoline(weakBlk, obj.closure_id, arg0);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef unsigned long  (^_BlockType2)(void * arg0, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline _ObjectiveCBindings_wrapListenerBlock_1j2nt86(_ListenerTrampoline block) NS_RETURNS_RETAINED {
-  return ^void(id arg0, id arg1, id arg2) {
-    objc_retainBlock(block);
-    block(objc_retainBlock(arg0), objc_retain(arg1), objc_retain(arg2));
+unsigned long  _ObjectiveCBindings_invokeBlock_17ap02x(
+    _BlockType2 block, void * arg0, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3)  {
+  return block(arg0, arg1, arg2, arg3);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType2 _ObjectiveCBindings_newPointerBlock_17ap02x(unsigned long  (*trampoline)(unsigned long  (*)(void * , NSFastEnumerationState * , id * , unsigned long ), void * , NSFastEnumerationState * , id * , unsigned long ), unsigned long  (*func)(void * , NSFastEnumerationState * , id * , unsigned long )) NS_RETURNS_RETAINED {
+  return ^unsigned long (void * arg0, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3) {
+    return trampoline(func, arg0, arg1, arg2, arg3);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType2 _ObjectiveCBindings_newClosureBlock_17ap02x(
+    unsigned long  (*trampoline)(id , int64_t , void * , NSFastEnumerationState * , id * , unsigned long ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType2 weakBlk;
+  _BlockType2 blk = ^unsigned long (void * arg0, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1, arg2, arg3);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef struct _NSZone *  (^_BlockType3)(void * arg0);
+__attribute__((visibility("default"))) __attribute__((used))
+struct _NSZone *  _ObjectiveCBindings_invokeBlock_1a8cl66(
+    _BlockType3 block, void * arg0)  {
+  return block(arg0);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType3 _ObjectiveCBindings_newPointerBlock_1a8cl66(struct _NSZone *  (*trampoline)(struct _NSZone *  (*)(void * ), void * ), struct _NSZone *  (*func)(void * )) NS_RETURNS_RETAINED {
+  return ^struct _NSZone * (void * arg0) {
+    return trampoline(func, arg0);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType3 _ObjectiveCBindings_newClosureBlock_1a8cl66(
+    struct _NSZone *  (*trampoline)(id , int64_t , void * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType3 weakBlk;
+  _BlockType3 blk = ^struct _NSZone * (void * arg0) {
+    return trampoline(weakBlk, obj.closure_id, arg0);
   };
+  weakBlk = blk;
+  return blk;
 }
 
-typedef void  (^_BlockingTrampoline)(void * waiter, id arg0, id arg1, id arg2);
+typedef BOOL  (^_BlockType4)(void * arg0);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline _ObjectiveCBindings_wrapBlockingBlock_1j2nt86(
-    _BlockingTrampoline block, _BlockingTrampoline listenerBlock,
+BOOL  _ObjectiveCBindings_invokeBlock_e3qsqz(
+    _BlockType4 block, void * arg0)  {
+  return block(arg0);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType4 _ObjectiveCBindings_newPointerBlock_e3qsqz(BOOL  (*trampoline)(BOOL  (*)(void * ), void * ), BOOL  (*func)(void * )) NS_RETURNS_RETAINED {
+  return ^BOOL (void * arg0) {
+    return trampoline(func, arg0);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType4 _ObjectiveCBindings_newClosureBlock_e3qsqz(
+    BOOL  (*trampoline)(id , int64_t , void * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType4 weakBlk;
+  _BlockType4 blk = ^BOOL (void * arg0) {
+    return trampoline(weakBlk, obj.closure_id, arg0);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef BOOL  (^_BlockType5)(void * arg0, id arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+BOOL  _ObjectiveCBindings_invokeBlock_3su7tt(
+    _BlockType5 block, void * arg0, id arg1)  {
+  return block(arg0, arg1);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType5 _ObjectiveCBindings_newPointerBlock_3su7tt(BOOL  (*trampoline)(BOOL  (*)(void * , id ), void * , id ), BOOL  (*func)(void * , id )) NS_RETURNS_RETAINED {
+  return ^BOOL (void * arg0, id arg1) {
+    return trampoline(func, arg0, arg1);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType5 _ObjectiveCBindings_newClosureBlock_3su7tt(
+    BOOL  (*trampoline)(id , int64_t , void * , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType5 weakBlk;
+  _BlockType5 blk = ^BOOL (void * arg0, id arg1) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef BOOL  (^_BlockType6)(void * arg0, struct objc_selector * arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+BOOL  _ObjectiveCBindings_invokeBlock_w1e3k0(
+    _BlockType6 block, void * arg0, struct objc_selector * arg1)  {
+  return block(arg0, arg1);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType6 _ObjectiveCBindings_newPointerBlock_w1e3k0(BOOL  (*trampoline)(BOOL  (*)(void * , struct objc_selector * ), void * , struct objc_selector * ), BOOL  (*func)(void * , struct objc_selector * )) NS_RETURNS_RETAINED {
+  return ^BOOL (void * arg0, struct objc_selector * arg1) {
+    return trampoline(func, arg0, arg1);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType6 _ObjectiveCBindings_newClosureBlock_w1e3k0(
+    BOOL  (*trampoline)(id , int64_t , void * , struct objc_selector * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType6 weakBlk;
+  _BlockType6 blk = ^BOOL (void * arg0, struct objc_selector * arg1) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockType7)(id arg0, id arg1, id arg2);
+__attribute__((visibility("default"))) __attribute__((used))
+void  _ObjectiveCBindings_invokeBlock_1b3bb6a(
+    _BlockType7 block, id arg0, id arg1, id arg2)  {
+  return block(arg0, arg1, arg2);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType7 _ObjectiveCBindings_newPointerBlock_1b3bb6a(void  (*trampoline)(void  (*)(id , id , id ), id , id , id ), void  (*func)(id , id , id )) NS_RETURNS_RETAINED {
+  return ^void (id arg0, id arg1, id arg2) {
+    return trampoline(func, arg0, arg1, arg2);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType7 _ObjectiveCBindings_newClosureBlock_1b3bb6a(
+    void  (*trampoline)(id , int64_t , id , id , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType7 weakBlk;
+  _BlockType7 blk = ^void (id arg0, id arg1, id arg2) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1, arg2);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType7 _ObjectiveCBindings_newListenerBlock_1b3bb6a(
+    void  (*trampoline)(id , int64_t , id , id , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType7 weakBlk;
+  _BlockType7 blk = ^void (id arg0, id arg1, id arg2) {
+    objc_retainBlock(weakBlk);
+    return trampoline(weakBlk, obj.closure_id, objc_retainBlock(arg0), (__bridge id)(__bridge_retained void*)(arg1), (__bridge id)(__bridge_retained void*)(arg2));
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockingTrampoline7)(void * waiter, id arg0, id arg1, id arg2);
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType7 _ObjectiveCBindings_newBlockingBlock_1b3bb6a(
+    void  (*tramp)(id , int64_t , void * , id , id , id ), void  (*listener_tramp)(id , int64_t , void * , id , id , id ),
+    int64_t closure_id, int64_t dispose_port, void (*dtor)(int64_t, int64_t),
     void* (*newWaiter)(), void (*awaitWaiter)(void*)) NS_RETURNS_RETAINED {
   NSThread *targetThread = [NSThread currentThread];
-  return ^void(id arg0, id arg1, id arg2) {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType7 weakBlk;
+  _BlockType7 blk = ^void (id arg0, id arg1, id arg2) {
+    objc_retainBlock(weakBlk);
     if ([NSThread currentThread] == targetThread) {
-      objc_retainBlock(block);
-      block(nil, objc_retainBlock(arg0), objc_retain(arg1), objc_retain(arg2));
+      tramp(weakBlk, obj.closure_id, nil, objc_retainBlock(arg0), (__bridge id)(__bridge_retained void*)(arg1), (__bridge id)(__bridge_retained void*)(arg2));
     } else {
       void* waiter = newWaiter();
-      objc_retainBlock(listenerBlock);
-      listenerBlock(waiter, objc_retainBlock(arg0), objc_retain(arg1), objc_retain(arg2));
+      listener_tramp(weakBlk, obj.closure_id, waiter, objc_retainBlock(arg0), (__bridge id)(__bridge_retained void*)(arg1), (__bridge id)(__bridge_retained void*)(arg2));
       awaitWaiter(waiter);
     }
   };
+  weakBlk = blk;
+  return blk;
 }
 
-typedef void  (^_ListenerTrampoline1)(void * arg0);
+typedef void  (^_BlockType8)(void * arg0);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline1 _ObjectiveCBindings_wrapListenerBlock_ovsamd(_ListenerTrampoline1 block) NS_RETURNS_RETAINED {
-  return ^void(void * arg0) {
-    objc_retainBlock(block);
-    block(arg0);
+void  _ObjectiveCBindings_invokeBlock_ovsamd(
+    _BlockType8 block, void * arg0)  {
+  return block(arg0);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType8 _ObjectiveCBindings_newPointerBlock_ovsamd(void  (*trampoline)(void  (*)(void * ), void * ), void  (*func)(void * )) NS_RETURNS_RETAINED {
+  return ^void (void * arg0) {
+    return trampoline(func, arg0);
   };
 }
 
-typedef void  (^_BlockingTrampoline1)(void * waiter, void * arg0);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline1 _ObjectiveCBindings_wrapBlockingBlock_ovsamd(
-    _BlockingTrampoline1 block, _BlockingTrampoline1 listenerBlock,
+_BlockType8 _ObjectiveCBindings_newClosureBlock_ovsamd(
+    void  (*trampoline)(id , int64_t , void * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType8 weakBlk;
+  _BlockType8 blk = ^void (void * arg0) {
+    return trampoline(weakBlk, obj.closure_id, arg0);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType8 _ObjectiveCBindings_newListenerBlock_ovsamd(
+    void  (*trampoline)(id , int64_t , void * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType8 weakBlk;
+  _BlockType8 blk = ^void (void * arg0) {
+    objc_retainBlock(weakBlk);
+    return trampoline(weakBlk, obj.closure_id, arg0);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockingTrampoline8)(void * waiter, void * arg0);
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType8 _ObjectiveCBindings_newBlockingBlock_ovsamd(
+    void  (*tramp)(id , int64_t , void * , void * ), void  (*listener_tramp)(id , int64_t , void * , void * ),
+    int64_t closure_id, int64_t dispose_port, void (*dtor)(int64_t, int64_t),
     void* (*newWaiter)(), void (*awaitWaiter)(void*)) NS_RETURNS_RETAINED {
   NSThread *targetThread = [NSThread currentThread];
-  return ^void(void * arg0) {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType8 weakBlk;
+  _BlockType8 blk = ^void (void * arg0) {
+    objc_retainBlock(weakBlk);
     if ([NSThread currentThread] == targetThread) {
-      objc_retainBlock(block);
-      block(nil, arg0);
+      tramp(weakBlk, obj.closure_id, nil, arg0);
     } else {
       void* waiter = newWaiter();
-      objc_retainBlock(listenerBlock);
-      listenerBlock(waiter, arg0);
+      listener_tramp(weakBlk, obj.closure_id, waiter, arg0);
       awaitWaiter(waiter);
     }
   };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockType9)(void * arg0, id arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+void  _ObjectiveCBindings_invokeBlock_18v1jvf(
+    _BlockType9 block, void * arg0, id arg1)  {
+  return block(arg0, arg1);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType9 _ObjectiveCBindings_newPointerBlock_18v1jvf(void  (*trampoline)(void  (*)(void * , id ), void * , id ), void  (*func)(void * , id )) NS_RETURNS_RETAINED {
+  return ^void (void * arg0, id arg1) {
+    return trampoline(func, arg0, arg1);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType9 _ObjectiveCBindings_newClosureBlock_18v1jvf(
+    void  (*trampoline)(id , int64_t , void * , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType9 weakBlk;
+  _BlockType9 blk = ^void (void * arg0, id arg1) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1);
+  };
+  weakBlk = blk;
+  return blk;
 }
 
-typedef void  (^_ListenerTrampoline2)(void * arg0, id arg1);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline2 _ObjectiveCBindings_wrapListenerBlock_wjovn7(_ListenerTrampoline2 block) NS_RETURNS_RETAINED {
-  return ^void(void * arg0, id arg1) {
-    objc_retainBlock(block);
-    block(arg0, objc_retain(arg1));
+_BlockType9 _ObjectiveCBindings_newListenerBlock_18v1jvf(
+    void  (*trampoline)(id , int64_t , void * , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType9 weakBlk;
+  _BlockType9 blk = ^void (void * arg0, id arg1) {
+    objc_retainBlock(weakBlk);
+    return trampoline(weakBlk, obj.closure_id, arg0, (__bridge id)(__bridge_retained void*)(arg1));
   };
+  weakBlk = blk;
+  return blk;
 }
 
-typedef void  (^_BlockingTrampoline2)(void * waiter, void * arg0, id arg1);
+typedef void  (^_BlockingTrampoline9)(void * waiter, void * arg0, id arg1);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline2 _ObjectiveCBindings_wrapBlockingBlock_wjovn7(
-    _BlockingTrampoline2 block, _BlockingTrampoline2 listenerBlock,
+_BlockType9 _ObjectiveCBindings_newBlockingBlock_18v1jvf(
+    void  (*tramp)(id , int64_t , void * , void * , id ), void  (*listener_tramp)(id , int64_t , void * , void * , id ),
+    int64_t closure_id, int64_t dispose_port, void (*dtor)(int64_t, int64_t),
     void* (*newWaiter)(), void (*awaitWaiter)(void*)) NS_RETURNS_RETAINED {
   NSThread *targetThread = [NSThread currentThread];
-  return ^void(void * arg0, id arg1) {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType9 weakBlk;
+  _BlockType9 blk = ^void (void * arg0, id arg1) {
+    objc_retainBlock(weakBlk);
     if ([NSThread currentThread] == targetThread) {
-      objc_retainBlock(block);
-      block(nil, arg0, objc_retain(arg1));
+      tramp(weakBlk, obj.closure_id, nil, arg0, (__bridge id)(__bridge_retained void*)(arg1));
     } else {
       void* waiter = newWaiter();
-      objc_retainBlock(listenerBlock);
-      listenerBlock(waiter, arg0, objc_retain(arg1));
+      listener_tramp(weakBlk, obj.closure_id, waiter, arg0, (__bridge id)(__bridge_retained void*)(arg1));
       awaitWaiter(waiter);
     }
   };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockType10)(void * arg0, id arg1, NSStreamEvent arg2);
+__attribute__((visibility("default"))) __attribute__((used))
+void  _ObjectiveCBindings_invokeBlock_hoampi(
+    _BlockType10 block, void * arg0, id arg1, NSStreamEvent arg2)  {
+  return block(arg0, arg1, arg2);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType10 _ObjectiveCBindings_newPointerBlock_hoampi(void  (*trampoline)(void  (*)(void * , id , NSStreamEvent ), void * , id , NSStreamEvent ), void  (*func)(void * , id , NSStreamEvent )) NS_RETURNS_RETAINED {
+  return ^void (void * arg0, id arg1, NSStreamEvent arg2) {
+    return trampoline(func, arg0, arg1, arg2);
+  };
 }
 
-typedef void  (^_ListenerTrampoline3)(void * arg0, id arg1, NSStreamEvent arg2);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline3 _ObjectiveCBindings_wrapListenerBlock_18d6mda(_ListenerTrampoline3 block) NS_RETURNS_RETAINED {
-  return ^void(void * arg0, id arg1, NSStreamEvent arg2) {
-    objc_retainBlock(block);
-    block(arg0, objc_retain(arg1), arg2);
+_BlockType10 _ObjectiveCBindings_newClosureBlock_hoampi(
+    void  (*trampoline)(id , int64_t , void * , id , NSStreamEvent ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType10 weakBlk;
+  _BlockType10 blk = ^void (void * arg0, id arg1, NSStreamEvent arg2) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1, arg2);
   };
+  weakBlk = blk;
+  return blk;
 }
 
-typedef void  (^_BlockingTrampoline3)(void * waiter, void * arg0, id arg1, NSStreamEvent arg2);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline3 _ObjectiveCBindings_wrapBlockingBlock_18d6mda(
-    _BlockingTrampoline3 block, _BlockingTrampoline3 listenerBlock,
+_BlockType10 _ObjectiveCBindings_newListenerBlock_hoampi(
+    void  (*trampoline)(id , int64_t , void * , id , NSStreamEvent ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType10 weakBlk;
+  _BlockType10 blk = ^void (void * arg0, id arg1, NSStreamEvent arg2) {
+    objc_retainBlock(weakBlk);
+    return trampoline(weakBlk, obj.closure_id, arg0, (__bridge id)(__bridge_retained void*)(arg1), arg2);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockingTrampoline10)(void * waiter, void * arg0, id arg1, NSStreamEvent arg2);
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType10 _ObjectiveCBindings_newBlockingBlock_hoampi(
+    void  (*tramp)(id , int64_t , void * , void * , id , NSStreamEvent ), void  (*listener_tramp)(id , int64_t , void * , void * , id , NSStreamEvent ),
+    int64_t closure_id, int64_t dispose_port, void (*dtor)(int64_t, int64_t),
     void* (*newWaiter)(), void (*awaitWaiter)(void*)) NS_RETURNS_RETAINED {
   NSThread *targetThread = [NSThread currentThread];
-  return ^void(void * arg0, id arg1, NSStreamEvent arg2) {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType10 weakBlk;
+  _BlockType10 blk = ^void (void * arg0, id arg1, NSStreamEvent arg2) {
+    objc_retainBlock(weakBlk);
     if ([NSThread currentThread] == targetThread) {
-      objc_retainBlock(block);
-      block(nil, arg0, objc_retain(arg1), arg2);
+      tramp(weakBlk, obj.closure_id, nil, arg0, (__bridge id)(__bridge_retained void*)(arg1), arg2);
     } else {
       void* waiter = newWaiter();
-      objc_retainBlock(listenerBlock);
-      listenerBlock(waiter, arg0, objc_retain(arg1), arg2);
+      listener_tramp(weakBlk, obj.closure_id, waiter, arg0, (__bridge id)(__bridge_retained void*)(arg1), arg2);
       awaitWaiter(waiter);
     }
   };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockType11)(id arg0, id arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+void  _ObjectiveCBindings_invokeBlock_pfv6jd(
+    _BlockType11 block, id arg0, id arg1)  {
+  return block(arg0, arg1);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType11 _ObjectiveCBindings_newPointerBlock_pfv6jd(void  (*trampoline)(void  (*)(id , id ), id , id ), void  (*func)(id , id )) NS_RETURNS_RETAINED {
+  return ^void (id arg0, id arg1) {
+    return trampoline(func, arg0, arg1);
+  };
 }
 
-typedef void  (^_ListenerTrampoline4)(id arg0, id arg1);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline4 _ObjectiveCBindings_wrapListenerBlock_wjvic9(_ListenerTrampoline4 block) NS_RETURNS_RETAINED {
-  return ^void(id arg0, id arg1) {
-    objc_retainBlock(block);
-    block(objc_retain(arg0), objc_retain(arg1));
+_BlockType11 _ObjectiveCBindings_newClosureBlock_pfv6jd(
+    void  (*trampoline)(id , int64_t , id , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType11 weakBlk;
+  _BlockType11 blk = ^void (id arg0, id arg1) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1);
   };
+  weakBlk = blk;
+  return blk;
 }
 
-typedef void  (^_BlockingTrampoline4)(void * waiter, id arg0, id arg1);
 __attribute__((visibility("default"))) __attribute__((used))
-_ListenerTrampoline4 _ObjectiveCBindings_wrapBlockingBlock_wjvic9(
-    _BlockingTrampoline4 block, _BlockingTrampoline4 listenerBlock,
+_BlockType11 _ObjectiveCBindings_newListenerBlock_pfv6jd(
+    void  (*trampoline)(id , int64_t , id , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType11 weakBlk;
+  _BlockType11 blk = ^void (id arg0, id arg1) {
+    objc_retainBlock(weakBlk);
+    return trampoline(weakBlk, obj.closure_id, (__bridge id)(__bridge_retained void*)(arg0), (__bridge id)(__bridge_retained void*)(arg1));
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef void  (^_BlockingTrampoline11)(void * waiter, id arg0, id arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType11 _ObjectiveCBindings_newBlockingBlock_pfv6jd(
+    void  (*tramp)(id , int64_t , void * , id , id ), void  (*listener_tramp)(id , int64_t , void * , id , id ),
+    int64_t closure_id, int64_t dispose_port, void (*dtor)(int64_t, int64_t),
     void* (*newWaiter)(), void (*awaitWaiter)(void*)) NS_RETURNS_RETAINED {
   NSThread *targetThread = [NSThread currentThread];
-  return ^void(id arg0, id arg1) {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType11 weakBlk;
+  _BlockType11 blk = ^void (id arg0, id arg1) {
+    objc_retainBlock(weakBlk);
     if ([NSThread currentThread] == targetThread) {
-      objc_retainBlock(block);
-      block(nil, objc_retain(arg0), objc_retain(arg1));
+      tramp(weakBlk, obj.closure_id, nil, (__bridge id)(__bridge_retained void*)(arg0), (__bridge id)(__bridge_retained void*)(arg1));
     } else {
       void* waiter = newWaiter();
-      objc_retainBlock(listenerBlock);
-      listenerBlock(waiter, objc_retain(arg0), objc_retain(arg1));
+      listener_tramp(weakBlk, obj.closure_id, waiter, (__bridge id)(__bridge_retained void*)(arg0), (__bridge id)(__bridge_retained void*)(arg1));
       awaitWaiter(waiter);
     }
   };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef id  (^_BlockType12)(void * arg0, id arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+id  _ObjectiveCBindings_invokeBlock_xr62hr(
+    _BlockType12 block, void * arg0, id arg1) NS_RETURNS_RETAINED {
+  return block(arg0, arg1);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType12 _ObjectiveCBindings_newPointerBlock_xr62hr(id  (*trampoline)(id  (*)(void * , id ), void * , id ), id  (*func)(void * , id )) NS_RETURNS_RETAINED {
+  return ^id (void * arg0, id arg1) {
+    return trampoline(func, arg0, arg1);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType12 _ObjectiveCBindings_newClosureBlock_xr62hr(
+    id  (*trampoline)(id , int64_t , void * , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType12 weakBlk;
+  _BlockType12 blk = ^id (void * arg0, id arg1) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef id  (^_BlockType13)(void * arg0, id arg1, id arg2, id * arg3);
+__attribute__((visibility("default"))) __attribute__((used))
+id  _ObjectiveCBindings_invokeBlock_10z9f5k(
+    _BlockType13 block, void * arg0, id arg1, id arg2, id * arg3)  {
+  return block(arg0, arg1, arg2, arg3);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType13 _ObjectiveCBindings_newPointerBlock_10z9f5k(id  (*trampoline)(id  (*)(void * , id , id , id * ), void * , id , id , id * ), id  (*func)(void * , id , id , id * )) NS_RETURNS_RETAINED {
+  return ^id (void * arg0, id arg1, id arg2, id * arg3) {
+    return trampoline(func, arg0, arg1, arg2, arg3);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType13 _ObjectiveCBindings_newClosureBlock_10z9f5k(
+    id  (*trampoline)(id , int64_t , void * , id , id , id * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType13 weakBlk;
+  _BlockType13 blk = ^id (void * arg0, id arg1, id arg2, id * arg3) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1, arg2, arg3);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef id  (^_BlockType14)(void * arg0, struct objc_selector * arg1);
+__attribute__((visibility("default"))) __attribute__((used))
+id  _ObjectiveCBindings_invokeBlock_50as9u(
+    _BlockType14 block, void * arg0, struct objc_selector * arg1)  {
+  return block(arg0, arg1);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType14 _ObjectiveCBindings_newPointerBlock_50as9u(id  (*trampoline)(id  (*)(void * , struct objc_selector * ), void * , struct objc_selector * ), id  (*func)(void * , struct objc_selector * )) NS_RETURNS_RETAINED {
+  return ^id (void * arg0, struct objc_selector * arg1) {
+    return trampoline(func, arg0, arg1);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType14 _ObjectiveCBindings_newClosureBlock_50as9u(
+    id  (*trampoline)(id , int64_t , void * , struct objc_selector * ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType14 weakBlk;
+  _BlockType14 blk = ^id (void * arg0, struct objc_selector * arg1) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef id  (^_BlockType15)(void * arg0, struct objc_selector * arg1, id arg2);
+__attribute__((visibility("default"))) __attribute__((used))
+id  _ObjectiveCBindings_invokeBlock_1mllhpc(
+    _BlockType15 block, void * arg0, struct objc_selector * arg1, id arg2)  {
+  return block(arg0, arg1, arg2);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType15 _ObjectiveCBindings_newPointerBlock_1mllhpc(id  (*trampoline)(id  (*)(void * , struct objc_selector * , id ), void * , struct objc_selector * , id ), id  (*func)(void * , struct objc_selector * , id )) NS_RETURNS_RETAINED {
+  return ^id (void * arg0, struct objc_selector * arg1, id arg2) {
+    return trampoline(func, arg0, arg1, arg2);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType15 _ObjectiveCBindings_newClosureBlock_1mllhpc(
+    id  (*trampoline)(id , int64_t , void * , struct objc_selector * , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType15 weakBlk;
+  _BlockType15 blk = ^id (void * arg0, struct objc_selector * arg1, id arg2) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1, arg2);
+  };
+  weakBlk = blk;
+  return blk;
+}
+
+typedef id  (^_BlockType16)(void * arg0, struct objc_selector * arg1, id arg2, id arg3);
+__attribute__((visibility("default"))) __attribute__((used))
+id  _ObjectiveCBindings_invokeBlock_c7gk2u(
+    _BlockType16 block, void * arg0, struct objc_selector * arg1, id arg2, id arg3)  {
+  return block(arg0, arg1, arg2, arg3);
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType16 _ObjectiveCBindings_newPointerBlock_c7gk2u(id  (*trampoline)(id  (*)(void * , struct objc_selector * , id , id ), void * , struct objc_selector * , id , id ), id  (*func)(void * , struct objc_selector * , id , id )) NS_RETURNS_RETAINED {
+  return ^id (void * arg0, struct objc_selector * arg1, id arg2, id arg3) {
+    return trampoline(func, arg0, arg1, arg2, arg3);
+  };
+}
+
+__attribute__((visibility("default"))) __attribute__((used))
+_BlockType16 _ObjectiveCBindings_newClosureBlock_c7gk2u(
+    id  (*trampoline)(id , int64_t , void * , struct objc_selector * , id , id ), int64_t closure_id, int64_t dispose_port,
+    void (*dtor)(int64_t, int64_t)) NS_RETURNS_RETAINED {
+  _ObjectiveCBindings_BlockDestroyer* obj = [_ObjectiveCBindings_BlockDestroyer
+      new:closure_id disposePort:dispose_port destructor:dtor];
+  __weak __block _BlockType16 weakBlk;
+  _BlockType16 blk = ^id (void * arg0, struct objc_selector * arg1, id arg2, id arg3) {
+    return trampoline(weakBlk, obj.closure_id, arg0, arg1, arg2, arg3);
+  };
+  weakBlk = blk;
+  return blk;
 }
diff --git a/pkgs/objective_c/src/objective_c_runtime.h b/pkgs/objective_c/src/objective_c_runtime.h
index f911c549f..4e1824373 100644
--- a/pkgs/objective_c/src/objective_c_runtime.h
+++ b/pkgs/objective_c/src/objective_c_runtime.h
@@ -13,6 +13,7 @@
 
 typedef struct _ObjCSelector ObjCSelector;
 typedef struct _ObjCObject ObjCObject;
+typedef struct _ObjCBlockImpl ObjCBlockImpl;
 typedef struct _ObjCProtocol ObjCProtocol;
 
 ObjCSelector *sel_registerName(const char *name);
@@ -31,35 +32,6 @@ void objc_msgSend(void);
 void objc_msgSend_fpret(void);
 void objc_msgSend_stret(void);
 
-// See https://clang.llvm.org/docs/Block-ABI-Apple.html
-typedef struct _ObjCBlockDesc {
-  unsigned long int reserved;
-  unsigned long int size;  // sizeof(ObjCBlockImpl)
-  void (*copy_helper)(void *dst, void *src);
-  void (*dispose_helper)(void *src);
-  const char *signature;
-} ObjCBlockDesc;
-
-typedef struct _ObjCBlockImpl {
-  void *isa;  // _NSConcreteGlobalBlock
-  int flags;
-  int reserved;
-  void *invoke;  // RET (*invoke)(ObjCBlockImpl *, ARGS...);
-  ObjCBlockDesc *descriptor;
-
-  // Captured variables follow. These are specific to our use case.
-  void *target;
-  Dart_Port dispose_port;
-} ObjCBlockImpl;
-
-// https://opensource.apple.com/source/libclosure/libclosure-38/Block_private.h
-extern void *_NSConcreteStackBlock[32];
-extern void *_NSConcreteMallocBlock[32];
-extern void *_NSConcreteAutoBlock[32];
-extern void *_NSConcreteFinalizingBlock[32];
-extern void *_NSConcreteGlobalBlock[32];
-extern void *_NSConcreteWeakBlockVariable[32];
-
 typedef struct _ObjCMethodDesc {
   ObjCSelector* name;
   const char* types;
diff --git a/pkgs/objective_c/test/generate_code_test.dart b/pkgs/objective_c/test/generate_code_test.dart
index 5e2e2af1c..4bd0f3a26 100644
--- a/pkgs/objective_c/test/generate_code_test.dart
+++ b/pkgs/objective_c/test/generate_code_test.dart
@@ -26,7 +26,6 @@ void main() {
           File('lib/src/c_bindings_generated.dart').readAsStringSync();
       expect(cBindings, contains('sel_registerName'));
       expect(cBindings, contains('objc_msgSend'));
-      expect(cBindings, contains('_NSConcreteGlobalBlock'));
       expect(cBindings, contains('_ObjCBlock'));
 
       final objcBindings = File('lib/src/objective_c_bindings_generated.dart')
diff --git a/pkgs/objective_c/test/main.c b/pkgs/objective_c/test/main.c
index 88bd241be..422d5548f 100644
--- a/pkgs/objective_c/test/main.c
+++ b/pkgs/objective_c/test/main.c
@@ -15,13 +15,10 @@
   }
 
 int main() {
-  ASSERT_SYMBOL("DOBJC_disposeObjCBlockWithClosure"); // objective_c.c
-  ASSERT_SYMBOL("DOBJC_runOnMainThread");
-
-  ASSERT_SYMBOL("DOBJC_disposeObjCBlockWithClosure"); // objective_c.c
-  ASSERT_SYMBOL("DOBJC_runOnMainThread");             // objective_c.m
-  ASSERT_SYMBOL("OBJC_CLASS_$_DOBJCDartProxy");       // proxy.m
+  ASSERT_SYMBOL("DOBJC_finalizeObject");         // objective_c.c
+  ASSERT_SYMBOL("DOBJC_runOnMainThread");        // objective_c.m
+  ASSERT_SYMBOL("OBJC_CLASS_$_DOBJCDartProxy");  // proxy.m
   // objective_c_bindings_generated.m
-  ASSERT_SYMBOL("_ObjectiveCBindings_wrapListenerBlock_ovsamd");
+  ASSERT_SYMBOL("_ObjectiveCBindings_newListenerBlock_ovsamd");
   return 0;
 }
diff --git a/pkgs/objective_c/test/setup.dart b/pkgs/objective_c/test/setup.dart
index e78993627..07e8ba8c4 100644
--- a/pkgs/objective_c/test/setup.dart
+++ b/pkgs/objective_c/test/setup.dart
@@ -92,12 +92,12 @@ void main(List<String> arguments) {
 
   // Sanity check that the dylib was created correctly.
   final lib = DynamicLibrary.open(outputFile);
-  lib.lookup('DOBJC_disposeObjCBlockWithClosure'); // objective_c.c
+  lib.lookup('DOBJC_finalizeObject'); // objective_c.c
   lib.lookup('DOBJC_runOnMainThread'); // objective_c.m
   lib.lookup('Dart_InitializeApiDL'); // dart_api_dl.c
   lib.lookup('OBJC_CLASS_\$_DOBJCDartProxy'); // proxy.m
   // objective_c_bindings_generated.m
-  lib.lookup('_ObjectiveCBindings_wrapListenerBlock_ovsamd');
+  lib.lookup('_ObjectiveCBindings_newListenerBlock_ovsamd');
 
   // Sanity check that the executable can find FFI symbols.
   _linkMain([...objFiles, cMain], '$cMain.exe');