diff --git a/Lib/test/clinic.test.c b/Lib/test/clinic.test.c
index e4f146c0841188..0dfcc281985100 100644
--- a/Lib/test/clinic.test.c
+++ b/Lib/test/clinic.test.c
@@ -4758,7 +4758,7 @@ static PyObject *
 Test_cls_with_param_impl(TestObj *self, PyTypeObject *cls, int a);
 
 static PyObject *
-Test_cls_with_param(TestObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+Test_cls_with_param(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -4798,7 +4798,7 @@ Test_cls_with_param(TestObj *self, PyTypeObject *cls, PyObject *const *args, Py_
     if (a == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = Test_cls_with_param_impl(self, cls, a);
+    return_value = Test_cls_with_param_impl((TestObj *)self, cls, a);
 
 exit:
     return return_value;
@@ -4806,7 +4806,7 @@ Test_cls_with_param(TestObj *self, PyTypeObject *cls, PyObject *const *args, Py_
 
 static PyObject *
 Test_cls_with_param_impl(TestObj *self, PyTypeObject *cls, int a)
-/*[clinic end generated code: output=83a391eea66d08f8 input=af158077bd237ef9]*/
+/*[clinic end generated code: output=7e893134a81fef92 input=af158077bd237ef9]*/
 
 
 /*[clinic input]
@@ -4908,18 +4908,18 @@ static PyObject *
 Test_cls_no_params_impl(TestObj *self, PyTypeObject *cls);
 
 static PyObject *
-Test_cls_no_params(TestObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+Test_cls_no_params(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "cls_no_params() takes no arguments");
         return NULL;
     }
-    return Test_cls_no_params_impl(self, cls);
+    return Test_cls_no_params_impl((TestObj *)self, cls);
 }
 
 static PyObject *
 Test_cls_no_params_impl(TestObj *self, PyTypeObject *cls)
-/*[clinic end generated code: output=4d68b4652c144af3 input=e7e2e4e344e96a11]*/
+/*[clinic end generated code: output=8845de054449f40a input=e7e2e4e344e96a11]*/
 
 
 /*[clinic input]
@@ -4945,7 +4945,7 @@ Test_metho_not_default_return_converter(TestObj *self, PyObject *a)
     PyObject *return_value = NULL;
     int _return_value;
 
-    _return_value = Test_metho_not_default_return_converter_impl(self, a);
+    _return_value = Test_metho_not_default_return_converter_impl((TestObj *)self, a);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -4957,7 +4957,7 @@ Test_metho_not_default_return_converter(TestObj *self, PyObject *a)
 
 static int
 Test_metho_not_default_return_converter_impl(TestObj *self, PyObject *a)
-/*[clinic end generated code: output=3350de11bd538007 input=428657129b521177]*/
+/*[clinic end generated code: output=b2cce75a7af2e6ce input=428657129b521177]*/
 
 
 /*[clinic input]
@@ -4983,7 +4983,7 @@ static PyObject *
 Test_an_metho_arg_named_arg_impl(TestObj *self, int arg);
 
 static PyObject *
-Test_an_metho_arg_named_arg(TestObj *self, PyObject *arg_)
+Test_an_metho_arg_named_arg(PyObject *self, PyObject *arg_)
 {
     PyObject *return_value = NULL;
     int arg;
@@ -4992,7 +4992,7 @@ Test_an_metho_arg_named_arg(TestObj *self, PyObject *arg_)
     if (arg == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = Test_an_metho_arg_named_arg_impl(self, arg);
+    return_value = Test_an_metho_arg_named_arg_impl((TestObj *)self, arg);
 
 exit:
     return return_value;
@@ -5000,7 +5000,7 @@ Test_an_metho_arg_named_arg(TestObj *self, PyObject *arg_)
 
 static PyObject *
 Test_an_metho_arg_named_arg_impl(TestObj *self, int arg)
-/*[clinic end generated code: output=9f04de4a62287e28 input=2a53a57cf5624f95]*/
+/*[clinic end generated code: output=38554f09950d07e7 input=2a53a57cf5624f95]*/
 
 
 /*[clinic input]
@@ -5289,14 +5289,14 @@ static PyObject *
 Test_meth_coexist_impl(TestObj *self);
 
 static PyObject *
-Test_meth_coexist(TestObj *self, PyObject *Py_UNUSED(ignored))
+Test_meth_coexist(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return Test_meth_coexist_impl(self);
+    return Test_meth_coexist_impl((TestObj *)self);
 }
 
 static PyObject *
 Test_meth_coexist_impl(TestObj *self)
-/*[clinic end generated code: output=808a293d0cd27439 input=2a1d75b5e6fec6dd]*/
+/*[clinic end generated code: output=7edf4e95b29f06fa input=2a1d75b5e6fec6dd]*/
 
 /*[clinic input]
 @getter
@@ -5317,14 +5317,14 @@ static PyObject *
 Test_property_get_impl(TestObj *self);
 
 static PyObject *
-Test_property_get(TestObj *self, void *Py_UNUSED(context))
+Test_property_get(PyObject *self, void *Py_UNUSED(context))
 {
-    return Test_property_get_impl(self);
+    return Test_property_get_impl((TestObj *)self);
 }
 
 static PyObject *
 Test_property_get_impl(TestObj *self)
-/*[clinic end generated code: output=7cadd0f539805266 input=2d92b3449fbc7d2b]*/
+/*[clinic end generated code: output=b38d68abd3466a6e input=2d92b3449fbc7d2b]*/
 
 /*[clinic input]
 @setter
@@ -5345,18 +5345,18 @@ static int
 Test_property_set_impl(TestObj *self, PyObject *value);
 
 static int
-Test_property_set(TestObj *self, PyObject *value, void *Py_UNUSED(context))
+Test_property_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
-    return_value = Test_property_set_impl(self, value);
+    return_value = Test_property_set_impl((TestObj *)self, value);
 
     return return_value;
 }
 
 static int
 Test_property_set_impl(TestObj *self, PyObject *value)
-/*[clinic end generated code: output=e4342fe9bb1d7817 input=3bc3f46a23c83a88]*/
+/*[clinic end generated code: output=49f925ab2a33b637 input=3bc3f46a23c83a88]*/
 
 /*[clinic input]
 @setter
@@ -5377,18 +5377,18 @@ static int
 Test_setter_first_with_docstr_set_impl(TestObj *self, PyObject *value);
 
 static int
-Test_setter_first_with_docstr_set(TestObj *self, PyObject *value, void *Py_UNUSED(context))
+Test_setter_first_with_docstr_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
-    return_value = Test_setter_first_with_docstr_set_impl(self, value);
+    return_value = Test_setter_first_with_docstr_set_impl((TestObj *)self, value);
 
     return return_value;
 }
 
 static int
 Test_setter_first_with_docstr_set_impl(TestObj *self, PyObject *value)
-/*[clinic end generated code: output=e4d76b558a4061db input=31a045ce11bbe961]*/
+/*[clinic end generated code: output=5aaf44373c0af545 input=31a045ce11bbe961]*/
 
 /*[clinic input]
 @getter
@@ -5418,14 +5418,14 @@ static PyObject *
 Test_setter_first_with_docstr_get_impl(TestObj *self);
 
 static PyObject *
-Test_setter_first_with_docstr_get(TestObj *self, void *Py_UNUSED(context))
+Test_setter_first_with_docstr_get(PyObject *self, void *Py_UNUSED(context))
 {
-    return Test_setter_first_with_docstr_get_impl(self);
+    return Test_setter_first_with_docstr_get_impl((TestObj *)self);
 }
 
 static PyObject *
 Test_setter_first_with_docstr_get_impl(TestObj *self)
-/*[clinic end generated code: output=749a30266f9fb443 input=10af4e43b3cb34dc]*/
+/*[clinic end generated code: output=fe6e3aa844a24920 input=10af4e43b3cb34dc]*/
 
 /*[clinic input]
 output push
@@ -5708,7 +5708,7 @@ Test__pyarg_parsestackandkeywords_impl(TestObj *self, PyTypeObject *cls,
                                        Py_ssize_t key_length);
 
 static PyObject *
-Test__pyarg_parsestackandkeywords(TestObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+Test__pyarg_parsestackandkeywords(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -5731,7 +5731,7 @@ Test__pyarg_parsestackandkeywords(TestObj *self, PyTypeObject *cls, PyObject *co
         &key, &key_length)) {
         goto exit;
     }
-    return_value = Test__pyarg_parsestackandkeywords_impl(self, cls, key, key_length);
+    return_value = Test__pyarg_parsestackandkeywords_impl((TestObj *)self, cls, key, key_length);
 
 exit:
     return return_value;
@@ -5741,7 +5741,7 @@ static PyObject *
 Test__pyarg_parsestackandkeywords_impl(TestObj *self, PyTypeObject *cls,
                                        const char *key,
                                        Py_ssize_t key_length)
-/*[clinic end generated code: output=4fda8a7f2547137c input=fc72ef4b4cfafabc]*/
+/*[clinic end generated code: output=7060c213d7b8200e input=fc72ef4b4cfafabc]*/
 
 
 /*[clinic input]
diff --git a/Modules/_ctypes/clinic/_ctypes.c.h b/Modules/_ctypes/clinic/_ctypes.c.h
index 405a3c9238d77d..1f2e871137ed79 100644
--- a/Modules/_ctypes/clinic/_ctypes.c.h
+++ b/Modules/_ctypes/clinic/_ctypes.c.h
@@ -331,7 +331,7 @@ PyCPointerType_set_type_impl(PyTypeObject *self, PyTypeObject *cls,
                              PyObject *type);
 
 static PyObject *
-PyCPointerType_set_type(PyTypeObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+PyCPointerType_set_type(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -356,7 +356,7 @@ PyCPointerType_set_type(PyTypeObject *self, PyTypeObject *cls, PyObject *const *
         goto exit;
     }
     type = args[0];
-    return_value = PyCPointerType_set_type_impl(self, cls, type);
+    return_value = PyCPointerType_set_type_impl((PyTypeObject *)self, cls, type);
 
 exit:
     return return_value;
@@ -616,12 +616,12 @@ static int
 _ctypes_CFuncPtr_errcheck_set_impl(PyCFuncPtrObject *self, PyObject *value);
 
 static int
-_ctypes_CFuncPtr_errcheck_set(PyCFuncPtrObject *self, PyObject *value, void *Py_UNUSED(context))
+_ctypes_CFuncPtr_errcheck_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ctypes_CFuncPtr_errcheck_set_impl(self, value);
+    return_value = _ctypes_CFuncPtr_errcheck_set_impl((PyCFuncPtrObject *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -648,12 +648,12 @@ static PyObject *
 _ctypes_CFuncPtr_errcheck_get_impl(PyCFuncPtrObject *self);
 
 static PyObject *
-_ctypes_CFuncPtr_errcheck_get(PyCFuncPtrObject *self, void *Py_UNUSED(context))
+_ctypes_CFuncPtr_errcheck_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ctypes_CFuncPtr_errcheck_get_impl(self);
+    return_value = _ctypes_CFuncPtr_errcheck_get_impl((PyCFuncPtrObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -673,12 +673,12 @@ static int
 _ctypes_CFuncPtr_restype_set_impl(PyCFuncPtrObject *self, PyObject *value);
 
 static int
-_ctypes_CFuncPtr_restype_set(PyCFuncPtrObject *self, PyObject *value, void *Py_UNUSED(context))
+_ctypes_CFuncPtr_restype_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ctypes_CFuncPtr_restype_set_impl(self, value);
+    return_value = _ctypes_CFuncPtr_restype_set_impl((PyCFuncPtrObject *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -705,12 +705,12 @@ static PyObject *
 _ctypes_CFuncPtr_restype_get_impl(PyCFuncPtrObject *self);
 
 static PyObject *
-_ctypes_CFuncPtr_restype_get(PyCFuncPtrObject *self, void *Py_UNUSED(context))
+_ctypes_CFuncPtr_restype_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ctypes_CFuncPtr_restype_get_impl(self);
+    return_value = _ctypes_CFuncPtr_restype_get_impl((PyCFuncPtrObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -730,12 +730,12 @@ static int
 _ctypes_CFuncPtr_argtypes_set_impl(PyCFuncPtrObject *self, PyObject *value);
 
 static int
-_ctypes_CFuncPtr_argtypes_set(PyCFuncPtrObject *self, PyObject *value, void *Py_UNUSED(context))
+_ctypes_CFuncPtr_argtypes_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ctypes_CFuncPtr_argtypes_set_impl(self, value);
+    return_value = _ctypes_CFuncPtr_argtypes_set_impl((PyCFuncPtrObject *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -762,12 +762,12 @@ static PyObject *
 _ctypes_CFuncPtr_argtypes_get_impl(PyCFuncPtrObject *self);
 
 static PyObject *
-_ctypes_CFuncPtr_argtypes_get(PyCFuncPtrObject *self, void *Py_UNUSED(context))
+_ctypes_CFuncPtr_argtypes_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ctypes_CFuncPtr_argtypes_get_impl(self);
+    return_value = _ctypes_CFuncPtr_argtypes_get_impl((PyCFuncPtrObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -793,4 +793,4 @@ Simple_from_outparm(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py
     }
     return Simple_from_outparm_impl(self, cls);
 }
-/*[clinic end generated code: output=cb3583522a2c5ce5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a18d87239b6fb8ca input=a9049054013a1b77]*/
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 368d10411366c4..cf8bd60f3e3f81 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -4947,7 +4947,7 @@ datetime.time.replace
     minute: int(c_default="TIME_GET_MINUTE(self)") = unchanged
     second: int(c_default="TIME_GET_SECOND(self)") = unchanged
     microsecond: int(c_default="TIME_GET_MICROSECOND(self)") = unchanged
-    tzinfo: object(c_default="HASTZINFO(self) ? self->tzinfo : Py_None") = unchanged
+    tzinfo: object(c_default="HASTZINFO(self) ? ((PyDateTime_Time *)self)->tzinfo : Py_None") = unchanged
     *
     fold: int(c_default="TIME_GET_FOLD(self)") = unchanged
 
@@ -4958,7 +4958,7 @@ static PyObject *
 datetime_time_replace_impl(PyDateTime_Time *self, int hour, int minute,
                            int second, int microsecond, PyObject *tzinfo,
                            int fold)
-/*[clinic end generated code: output=0b89a44c299e4f80 input=9b6a35b1e704b0ca]*/
+/*[clinic end generated code: output=0b89a44c299e4f80 input=abf23656e8df4e97]*/
 {
     return new_time_subclass_fold_ex(hour, minute, second, microsecond, tzinfo,
                                      fold, (PyObject *)Py_TYPE(self));
@@ -6449,7 +6449,7 @@ datetime.datetime.replace
     minute: int(c_default="DATE_GET_MINUTE(self)") = unchanged
     second: int(c_default="DATE_GET_SECOND(self)") = unchanged
     microsecond: int(c_default="DATE_GET_MICROSECOND(self)") = unchanged
-    tzinfo: object(c_default="HASTZINFO(self) ? self->tzinfo : Py_None") = unchanged
+    tzinfo: object(c_default="HASTZINFO(self) ? ((PyDateTime_DateTime *)self)->tzinfo : Py_None") = unchanged
     *
     fold: int(c_default="DATE_GET_FOLD(self)") = unchanged
 
@@ -6461,7 +6461,7 @@ datetime_datetime_replace_impl(PyDateTime_DateTime *self, int year,
                                int month, int day, int hour, int minute,
                                int second, int microsecond, PyObject *tzinfo,
                                int fold)
-/*[clinic end generated code: output=00bc96536833fddb input=9b38253d56d9bcad]*/
+/*[clinic end generated code: output=00bc96536833fddb input=fd972762d604d3e7]*/
 {
     return new_datetime_subclass_fold_ex(year, month, day, hour, minute,
                                          second, microsecond, tzinfo, fold,
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index fb66d3db0f7a1f..16095333db6638 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -588,7 +588,7 @@ _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer)
 
 /*[clinic input]
 _io.BytesIO.truncate
-    size: Py_ssize_t(accept={int, NoneType}, c_default="self->pos") = None
+    size: Py_ssize_t(accept={int, NoneType}, c_default="((bytesio *)self)->pos") = None
     /
 
 Truncate the file to at most size bytes.
@@ -599,7 +599,7 @@ The current file position is unchanged.  Returns the new size.
 
 static PyObject *
 _io_BytesIO_truncate_impl(bytesio *self, Py_ssize_t size)
-/*[clinic end generated code: output=9ad17650c15fa09b input=423759dd42d2f7c1]*/
+/*[clinic end generated code: output=9ad17650c15fa09b input=dae4295e11c1bbb4]*/
 {
     CHECK_CLOSED(self);
     CHECK_EXPORTS(self);
diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h
index e035bd99baca5f..8ab8000fafee02 100644
--- a/Modules/_io/clinic/bufferedio.c.h
+++ b/Modules/_io/clinic/bufferedio.c.h
@@ -288,12 +288,12 @@ static PyObject *
 _io__Buffered___sizeof___impl(buffered *self);
 
 static PyObject *
-_io__Buffered___sizeof__(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered___sizeof___impl(self);
+    return_value = _io__Buffered___sizeof___impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -319,12 +319,12 @@ static PyObject *
 _io__Buffered_simple_flush_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_simple_flush(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_simple_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_simple_flush_impl(self);
+    return_value = _io__Buffered_simple_flush_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -344,12 +344,12 @@ static PyObject *
 _io__Buffered_closed_get_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_closed_get(buffered *self, void *Py_UNUSED(context))
+_io__Buffered_closed_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_closed_get_impl(self);
+    return_value = _io__Buffered_closed_get_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -367,12 +367,12 @@ static PyObject *
 _io__Buffered_close_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_close(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_close_impl(self);
+    return_value = _io__Buffered_close_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -390,12 +390,12 @@ static PyObject *
 _io__Buffered_detach_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_detach(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_detach(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_detach_impl(self);
+    return_value = _io__Buffered_detach_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -413,12 +413,12 @@ static PyObject *
 _io__Buffered_seekable_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_seekable(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_seekable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_seekable_impl(self);
+    return_value = _io__Buffered_seekable_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -436,12 +436,12 @@ static PyObject *
 _io__Buffered_readable_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_readable(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_readable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_readable_impl(self);
+    return_value = _io__Buffered_readable_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -459,12 +459,12 @@ static PyObject *
 _io__Buffered_writable_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_writable(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_writable_impl(self);
+    return_value = _io__Buffered_writable_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -484,12 +484,12 @@ static PyObject *
 _io__Buffered_name_get_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_name_get(buffered *self, void *Py_UNUSED(context))
+_io__Buffered_name_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_name_get_impl(self);
+    return_value = _io__Buffered_name_get_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -509,12 +509,12 @@ static PyObject *
 _io__Buffered_mode_get_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_mode_get(buffered *self, void *Py_UNUSED(context))
+_io__Buffered_mode_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_mode_get_impl(self);
+    return_value = _io__Buffered_mode_get_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -532,12 +532,12 @@ static PyObject *
 _io__Buffered_fileno_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_fileno(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_fileno_impl(self);
+    return_value = _io__Buffered_fileno_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -555,12 +555,12 @@ static PyObject *
 _io__Buffered_isatty_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_isatty(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_isatty(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_isatty_impl(self);
+    return_value = _io__Buffered_isatty_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -578,12 +578,12 @@ static PyObject *
 _io__Buffered_flush_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_flush(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_flush_impl(self);
+    return_value = _io__Buffered_flush_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -601,7 +601,7 @@ static PyObject *
 _io__Buffered_peek_impl(buffered *self, Py_ssize_t size);
 
 static PyObject *
-_io__Buffered_peek(buffered *self, PyObject *const *args, Py_ssize_t nargs)
+_io__Buffered_peek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = 0;
@@ -626,7 +626,7 @@ _io__Buffered_peek(buffered *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_peek_impl(self, size);
+    return_value = _io__Buffered_peek_impl((buffered *)self, size);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -645,7 +645,7 @@ static PyObject *
 _io__Buffered_read_impl(buffered *self, Py_ssize_t n);
 
 static PyObject *
-_io__Buffered_read(buffered *self, PyObject *const *args, Py_ssize_t nargs)
+_io__Buffered_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t n = -1;
@@ -661,7 +661,7 @@ _io__Buffered_read(buffered *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_read_impl(self, n);
+    return_value = _io__Buffered_read_impl((buffered *)self, n);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -680,7 +680,7 @@ static PyObject *
 _io__Buffered_read1_impl(buffered *self, Py_ssize_t n);
 
 static PyObject *
-_io__Buffered_read1(buffered *self, PyObject *const *args, Py_ssize_t nargs)
+_io__Buffered_read1(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t n = -1;
@@ -705,7 +705,7 @@ _io__Buffered_read1(buffered *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_read1_impl(self, n);
+    return_value = _io__Buffered_read1_impl((buffered *)self, n);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -724,7 +724,7 @@ static PyObject *
 _io__Buffered_readinto_impl(buffered *self, Py_buffer *buffer);
 
 static PyObject *
-_io__Buffered_readinto(buffered *self, PyObject *arg)
+_io__Buffered_readinto(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer buffer = {NULL, NULL};
@@ -734,7 +734,7 @@ _io__Buffered_readinto(buffered *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_readinto_impl(self, &buffer);
+    return_value = _io__Buffered_readinto_impl((buffered *)self, &buffer);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -758,7 +758,7 @@ static PyObject *
 _io__Buffered_readinto1_impl(buffered *self, Py_buffer *buffer);
 
 static PyObject *
-_io__Buffered_readinto1(buffered *self, PyObject *arg)
+_io__Buffered_readinto1(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer buffer = {NULL, NULL};
@@ -768,7 +768,7 @@ _io__Buffered_readinto1(buffered *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_readinto1_impl(self, &buffer);
+    return_value = _io__Buffered_readinto1_impl((buffered *)self, &buffer);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -792,7 +792,7 @@ static PyObject *
 _io__Buffered_readline_impl(buffered *self, Py_ssize_t size);
 
 static PyObject *
-_io__Buffered_readline(buffered *self, PyObject *const *args, Py_ssize_t nargs)
+_io__Buffered_readline(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -808,7 +808,7 @@ _io__Buffered_readline(buffered *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_readline_impl(self, size);
+    return_value = _io__Buffered_readline_impl((buffered *)self, size);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -827,12 +827,12 @@ static PyObject *
 _io__Buffered_tell_impl(buffered *self);
 
 static PyObject *
-_io__Buffered_tell(buffered *self, PyObject *Py_UNUSED(ignored))
+_io__Buffered_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_tell_impl(self);
+    return_value = _io__Buffered_tell_impl((buffered *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -850,7 +850,7 @@ static PyObject *
 _io__Buffered_seek_impl(buffered *self, PyObject *targetobj, int whence);
 
 static PyObject *
-_io__Buffered_seek(buffered *self, PyObject *const *args, Py_ssize_t nargs)
+_io__Buffered_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *targetobj;
@@ -869,7 +869,7 @@ _io__Buffered_seek(buffered *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_seek_impl(self, targetobj, whence);
+    return_value = _io__Buffered_seek_impl((buffered *)self, targetobj, whence);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -888,7 +888,7 @@ static PyObject *
 _io__Buffered_truncate_impl(buffered *self, PyTypeObject *cls, PyObject *pos);
 
 static PyObject *
-_io__Buffered_truncate(buffered *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io__Buffered_truncate(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -918,7 +918,7 @@ _io__Buffered_truncate(buffered *self, PyTypeObject *cls, PyObject *const *args,
     pos = args[0];
 skip_optional_posonly:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io__Buffered_truncate_impl(self, cls, pos);
+    return_value = _io__Buffered_truncate_impl((buffered *)self, cls, pos);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1089,7 +1089,7 @@ static PyObject *
 _io_BufferedWriter_write_impl(buffered *self, Py_buffer *buffer);
 
 static PyObject *
-_io_BufferedWriter_write(buffered *self, PyObject *arg)
+_io_BufferedWriter_write(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer buffer = {NULL, NULL};
@@ -1098,7 +1098,7 @@ _io_BufferedWriter_write(buffered *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_BufferedWriter_write_impl(self, &buffer);
+    return_value = _io_BufferedWriter_write_impl((buffered *)self, &buffer);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1246,4 +1246,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=8f28a97987a9fbe1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f019d29701ba2556 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h
index 98d88698c5e9b7..5528df952c33fb 100644
--- a/Modules/_io/clinic/bytesio.c.h
+++ b/Modules/_io/clinic/bytesio.c.h
@@ -22,9 +22,9 @@ static PyObject *
 _io_BytesIO_readable_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_readable(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_readable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_readable_impl(self);
+    return _io_BytesIO_readable_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_writable__doc__,
@@ -40,9 +40,9 @@ static PyObject *
 _io_BytesIO_writable_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_writable(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_writable_impl(self);
+    return _io_BytesIO_writable_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_seekable__doc__,
@@ -58,9 +58,9 @@ static PyObject *
 _io_BytesIO_seekable_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_seekable(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_seekable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_seekable_impl(self);
+    return _io_BytesIO_seekable_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_flush__doc__,
@@ -76,9 +76,9 @@ static PyObject *
 _io_BytesIO_flush_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_flush(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_flush_impl(self);
+    return _io_BytesIO_flush_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_getbuffer__doc__,
@@ -94,13 +94,13 @@ static PyObject *
 _io_BytesIO_getbuffer_impl(bytesio *self, PyTypeObject *cls);
 
 static PyObject *
-_io_BytesIO_getbuffer(bytesio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_BytesIO_getbuffer(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "getbuffer() takes no arguments");
         return NULL;
     }
-    return _io_BytesIO_getbuffer_impl(self, cls);
+    return _io_BytesIO_getbuffer_impl((bytesio *)self, cls);
 }
 
 PyDoc_STRVAR(_io_BytesIO_getvalue__doc__,
@@ -116,9 +116,9 @@ static PyObject *
 _io_BytesIO_getvalue_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_getvalue(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_getvalue(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_getvalue_impl(self);
+    return _io_BytesIO_getvalue_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_isatty__doc__,
@@ -136,9 +136,9 @@ static PyObject *
 _io_BytesIO_isatty_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_isatty(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_isatty(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_isatty_impl(self);
+    return _io_BytesIO_isatty_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_tell__doc__,
@@ -154,9 +154,9 @@ static PyObject *
 _io_BytesIO_tell_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_tell(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_tell_impl(self);
+    return _io_BytesIO_tell_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO_read__doc__,
@@ -175,7 +175,7 @@ static PyObject *
 _io_BytesIO_read_impl(bytesio *self, Py_ssize_t size);
 
 static PyObject *
-_io_BytesIO_read(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_BytesIO_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -190,7 +190,7 @@ _io_BytesIO_read(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_BytesIO_read_impl(self, size);
+    return_value = _io_BytesIO_read_impl((bytesio *)self, size);
 
 exit:
     return return_value;
@@ -212,7 +212,7 @@ static PyObject *
 _io_BytesIO_read1_impl(bytesio *self, Py_ssize_t size);
 
 static PyObject *
-_io_BytesIO_read1(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_BytesIO_read1(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -227,7 +227,7 @@ _io_BytesIO_read1(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_BytesIO_read1_impl(self, size);
+    return_value = _io_BytesIO_read1_impl((bytesio *)self, size);
 
 exit:
     return return_value;
@@ -250,7 +250,7 @@ static PyObject *
 _io_BytesIO_readline_impl(bytesio *self, Py_ssize_t size);
 
 static PyObject *
-_io_BytesIO_readline(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_BytesIO_readline(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -265,7 +265,7 @@ _io_BytesIO_readline(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_BytesIO_readline_impl(self, size);
+    return_value = _io_BytesIO_readline_impl((bytesio *)self, size);
 
 exit:
     return return_value;
@@ -288,7 +288,7 @@ static PyObject *
 _io_BytesIO_readlines_impl(bytesio *self, PyObject *arg);
 
 static PyObject *
-_io_BytesIO_readlines(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_BytesIO_readlines(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *arg = Py_None;
@@ -301,7 +301,7 @@ _io_BytesIO_readlines(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
     }
     arg = args[0];
 skip_optional:
-    return_value = _io_BytesIO_readlines_impl(self, arg);
+    return_value = _io_BytesIO_readlines_impl((bytesio *)self, arg);
 
 exit:
     return return_value;
@@ -323,7 +323,7 @@ static PyObject *
 _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer);
 
 static PyObject *
-_io_BytesIO_readinto(bytesio *self, PyObject *arg)
+_io_BytesIO_readinto(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer buffer = {NULL, NULL};
@@ -332,7 +332,7 @@ _io_BytesIO_readinto(bytesio *self, PyObject *arg)
         _PyArg_BadArgument("readinto", "argument", "read-write bytes-like object", arg);
         goto exit;
     }
-    return_value = _io_BytesIO_readinto_impl(self, &buffer);
+    return_value = _io_BytesIO_readinto_impl((bytesio *)self, &buffer);
 
 exit:
     /* Cleanup for buffer */
@@ -359,10 +359,10 @@ static PyObject *
 _io_BytesIO_truncate_impl(bytesio *self, Py_ssize_t size);
 
 static PyObject *
-_io_BytesIO_truncate(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_BytesIO_truncate(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
-    Py_ssize_t size = self->pos;
+    Py_ssize_t size = ((bytesio *)self)->pos;
 
     if (!_PyArg_CheckPositional("truncate", nargs, 0, 1)) {
         goto exit;
@@ -374,7 +374,7 @@ _io_BytesIO_truncate(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_BytesIO_truncate_impl(self, size);
+    return_value = _io_BytesIO_truncate_impl((bytesio *)self, size);
 
 exit:
     return return_value;
@@ -399,7 +399,7 @@ static PyObject *
 _io_BytesIO_seek_impl(bytesio *self, Py_ssize_t pos, int whence);
 
 static PyObject *
-_io_BytesIO_seek(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_BytesIO_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t pos;
@@ -428,7 +428,7 @@ _io_BytesIO_seek(bytesio *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_BytesIO_seek_impl(self, pos, whence);
+    return_value = _io_BytesIO_seek_impl((bytesio *)self, pos, whence);
 
 exit:
     return return_value;
@@ -471,9 +471,9 @@ static PyObject *
 _io_BytesIO_close_impl(bytesio *self);
 
 static PyObject *
-_io_BytesIO_close(bytesio *self, PyObject *Py_UNUSED(ignored))
+_io_BytesIO_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_BytesIO_close_impl(self);
+    return _io_BytesIO_close_impl((bytesio *)self);
 }
 
 PyDoc_STRVAR(_io_BytesIO___init____doc__,
@@ -535,4 +535,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=985ff54e89f6036e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8a5e153bc7584b55 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h
index 0b8b4a49ac24b6..22d27bce67799e 100644
--- a/Modules/_io/clinic/fileio.c.h
+++ b/Modules/_io/clinic/fileio.c.h
@@ -25,13 +25,13 @@ static PyObject *
 _io_FileIO_close_impl(fileio *self, PyTypeObject *cls);
 
 static PyObject *
-_io_FileIO_close(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_FileIO_close(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "close() takes no arguments");
         return NULL;
     }
-    return _io_FileIO_close_impl(self, cls);
+    return _io_FileIO_close_impl((fileio *)self, cls);
 }
 
 PyDoc_STRVAR(_io_FileIO___init____doc__,
@@ -151,9 +151,9 @@ static PyObject *
 _io_FileIO_fileno_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_fileno(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_fileno_impl(self);
+    return _io_FileIO_fileno_impl((fileio *)self);
 }
 
 PyDoc_STRVAR(_io_FileIO_readable__doc__,
@@ -169,9 +169,9 @@ static PyObject *
 _io_FileIO_readable_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_readable(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_readable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_readable_impl(self);
+    return _io_FileIO_readable_impl((fileio *)self);
 }
 
 PyDoc_STRVAR(_io_FileIO_writable__doc__,
@@ -187,9 +187,9 @@ static PyObject *
 _io_FileIO_writable_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_writable(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_writable_impl(self);
+    return _io_FileIO_writable_impl((fileio *)self);
 }
 
 PyDoc_STRVAR(_io_FileIO_seekable__doc__,
@@ -205,9 +205,9 @@ static PyObject *
 _io_FileIO_seekable_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_seekable(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_seekable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_seekable_impl(self);
+    return _io_FileIO_seekable_impl((fileio *)self);
 }
 
 PyDoc_STRVAR(_io_FileIO_readinto__doc__,
@@ -223,7 +223,7 @@ static PyObject *
 _io_FileIO_readinto_impl(fileio *self, PyTypeObject *cls, Py_buffer *buffer);
 
 static PyObject *
-_io_FileIO_readinto(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_FileIO_readinto(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -251,7 +251,7 @@ _io_FileIO_readinto(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_s
         _PyArg_BadArgument("readinto", "argument 1", "read-write bytes-like object", args[0]);
         goto exit;
     }
-    return_value = _io_FileIO_readinto_impl(self, cls, &buffer);
+    return_value = _io_FileIO_readinto_impl((fileio *)self, cls, &buffer);
 
 exit:
     /* Cleanup for buffer */
@@ -278,9 +278,9 @@ static PyObject *
 _io_FileIO_readall_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_readall(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_readall(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_readall_impl(self);
+    return _io_FileIO_readall_impl((fileio *)self);
 }
 
 PyDoc_STRVAR(_io_FileIO_read__doc__,
@@ -300,7 +300,7 @@ static PyObject *
 _io_FileIO_read_impl(fileio *self, PyTypeObject *cls, Py_ssize_t size);
 
 static PyObject *
-_io_FileIO_read(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_FileIO_read(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -331,7 +331,7 @@ _io_FileIO_read(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize
         goto exit;
     }
 skip_optional_posonly:
-    return_value = _io_FileIO_read_impl(self, cls, size);
+    return_value = _io_FileIO_read_impl((fileio *)self, cls, size);
 
 exit:
     return return_value;
@@ -354,7 +354,7 @@ static PyObject *
 _io_FileIO_write_impl(fileio *self, PyTypeObject *cls, Py_buffer *b);
 
 static PyObject *
-_io_FileIO_write(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_FileIO_write(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -381,7 +381,7 @@ _io_FileIO_write(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssiz
     if (PyObject_GetBuffer(args[0], &b, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _io_FileIO_write_impl(self, cls, &b);
+    return_value = _io_FileIO_write_impl((fileio *)self, cls, &b);
 
 exit:
     /* Cleanup for b */
@@ -413,7 +413,7 @@ static PyObject *
 _io_FileIO_seek_impl(fileio *self, PyObject *pos, int whence);
 
 static PyObject *
-_io_FileIO_seek(fileio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_FileIO_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *pos;
@@ -431,7 +431,7 @@ _io_FileIO_seek(fileio *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_FileIO_seek_impl(self, pos, whence);
+    return_value = _io_FileIO_seek_impl((fileio *)self, pos, whence);
 
 exit:
     return return_value;
@@ -452,9 +452,9 @@ static PyObject *
 _io_FileIO_tell_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_tell(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_tell_impl(self);
+    return _io_FileIO_tell_impl((fileio *)self);
 }
 
 #if defined(HAVE_FTRUNCATE)
@@ -475,7 +475,7 @@ static PyObject *
 _io_FileIO_truncate_impl(fileio *self, PyTypeObject *cls, PyObject *posobj);
 
 static PyObject *
-_io_FileIO_truncate(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_FileIO_truncate(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -504,7 +504,7 @@ _io_FileIO_truncate(fileio *self, PyTypeObject *cls, PyObject *const *args, Py_s
     }
     posobj = args[0];
 skip_optional_posonly:
-    return_value = _io_FileIO_truncate_impl(self, cls, posobj);
+    return_value = _io_FileIO_truncate_impl((fileio *)self, cls, posobj);
 
 exit:
     return return_value;
@@ -525,12 +525,12 @@ static PyObject *
 _io_FileIO_isatty_impl(fileio *self);
 
 static PyObject *
-_io_FileIO_isatty(fileio *self, PyObject *Py_UNUSED(ignored))
+_io_FileIO_isatty(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_FileIO_isatty_impl(self);
+    return _io_FileIO_isatty_impl((fileio *)self);
 }
 
 #ifndef _IO_FILEIO_TRUNCATE_METHODDEF
     #define _IO_FILEIO_TRUNCATE_METHODDEF
 #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */
-/*[clinic end generated code: output=1c262ae135da4dcb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=dcbeb6a0b13e4b1f input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h
index 6f9205af32f010..bc571698806bde 100644
--- a/Modules/_io/clinic/stringio.c.h
+++ b/Modules/_io/clinic/stringio.c.h
@@ -23,12 +23,12 @@ static PyObject *
 _io_StringIO_getvalue_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_getvalue(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO_getvalue(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_getvalue_impl(self);
+    return_value = _io_StringIO_getvalue_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -47,12 +47,12 @@ static PyObject *
 _io_StringIO_tell_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_tell(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_tell_impl(self);
+    return_value = _io_StringIO_tell_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -74,7 +74,7 @@ static PyObject *
 _io_StringIO_read_impl(stringio *self, Py_ssize_t size);
 
 static PyObject *
-_io_StringIO_read(stringio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_StringIO_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -90,7 +90,7 @@ _io_StringIO_read(stringio *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_read_impl(self, size);
+    return_value = _io_StringIO_read_impl((stringio *)self, size);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -112,7 +112,7 @@ static PyObject *
 _io_StringIO_readline_impl(stringio *self, Py_ssize_t size);
 
 static PyObject *
-_io_StringIO_readline(stringio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_StringIO_readline(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -128,7 +128,7 @@ _io_StringIO_readline(stringio *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_readline_impl(self, size);
+    return_value = _io_StringIO_readline_impl((stringio *)self, size);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -152,10 +152,10 @@ static PyObject *
 _io_StringIO_truncate_impl(stringio *self, Py_ssize_t size);
 
 static PyObject *
-_io_StringIO_truncate(stringio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_StringIO_truncate(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
-    Py_ssize_t size = self->pos;
+    Py_ssize_t size = ((stringio *)self)->pos;
 
     if (!_PyArg_CheckPositional("truncate", nargs, 0, 1)) {
         goto exit;
@@ -168,7 +168,7 @@ _io_StringIO_truncate(stringio *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_truncate_impl(self, size);
+    return_value = _io_StringIO_truncate_impl((stringio *)self, size);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -194,7 +194,7 @@ static PyObject *
 _io_StringIO_seek_impl(stringio *self, Py_ssize_t pos, int whence);
 
 static PyObject *
-_io_StringIO_seek(stringio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_StringIO_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t pos;
@@ -224,7 +224,7 @@ _io_StringIO_seek(stringio *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_seek_impl(self, pos, whence);
+    return_value = _io_StringIO_seek_impl((stringio *)self, pos, whence);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -252,7 +252,7 @@ _io_StringIO_write(stringio *self, PyObject *obj)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_write_impl(self, obj);
+    return_value = _io_StringIO_write_impl((stringio *)self, obj);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -276,12 +276,12 @@ static PyObject *
 _io_StringIO_close_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_close(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_close_impl(self);
+    return_value = _io_StringIO_close_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -371,12 +371,12 @@ static PyObject *
 _io_StringIO_readable_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_readable(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO_readable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_readable_impl(self);
+    return_value = _io_StringIO_readable_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -395,12 +395,12 @@ static PyObject *
 _io_StringIO_writable_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_writable(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_writable_impl(self);
+    return_value = _io_StringIO_writable_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -419,12 +419,12 @@ static PyObject *
 _io_StringIO_seekable_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_seekable(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO_seekable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_seekable_impl(self);
+    return_value = _io_StringIO_seekable_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -442,12 +442,12 @@ static PyObject *
 _io_StringIO___getstate___impl(stringio *self);
 
 static PyObject *
-_io_StringIO___getstate__(stringio *self, PyObject *Py_UNUSED(ignored))
+_io_StringIO___getstate__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO___getstate___impl(self);
+    return_value = _io_StringIO___getstate___impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -470,7 +470,7 @@ _io_StringIO___setstate__(stringio *self, PyObject *state)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO___setstate___impl(self, state);
+    return_value = _io_StringIO___setstate___impl((stringio *)self, state);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -490,12 +490,12 @@ static PyObject *
 _io_StringIO_closed_get_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_closed_get(stringio *self, void *Py_UNUSED(context))
+_io_StringIO_closed_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_closed_get_impl(self);
+    return_value = _io_StringIO_closed_get_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -515,12 +515,12 @@ static PyObject *
 _io_StringIO_line_buffering_get_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_line_buffering_get(stringio *self, void *Py_UNUSED(context))
+_io_StringIO_line_buffering_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_line_buffering_get_impl(self);
+    return_value = _io_StringIO_line_buffering_get_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -540,14 +540,14 @@ static PyObject *
 _io_StringIO_newlines_get_impl(stringio *self);
 
 static PyObject *
-_io_StringIO_newlines_get(stringio *self, void *Py_UNUSED(context))
+_io_StringIO_newlines_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_StringIO_newlines_get_impl(self);
+    return_value = _io_StringIO_newlines_get_impl((stringio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
 }
-/*[clinic end generated code: output=9d2b092274469d42 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7796e223e778a214 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h
index 0acc1f060c811b..9ce1d70ad71052 100644
--- a/Modules/_io/clinic/textio.c.h
+++ b/Modules/_io/clinic/textio.c.h
@@ -379,7 +379,7 @@ _io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self,
                                           PyObject *input, int final);
 
 static PyObject *
-_io_IncrementalNewlineDecoder_decode(nldecoder_object *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_IncrementalNewlineDecoder_decode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -426,7 +426,7 @@ _io_IncrementalNewlineDecoder_decode(nldecoder_object *self, PyObject *const *ar
         goto exit;
     }
 skip_optional_pos:
-    return_value = _io_IncrementalNewlineDecoder_decode_impl(self, input, final);
+    return_value = _io_IncrementalNewlineDecoder_decode_impl((nldecoder_object *)self, input, final);
 
 exit:
     return return_value;
@@ -444,9 +444,9 @@ static PyObject *
 _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self);
 
 static PyObject *
-_io_IncrementalNewlineDecoder_getstate(nldecoder_object *self, PyObject *Py_UNUSED(ignored))
+_io_IncrementalNewlineDecoder_getstate(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_IncrementalNewlineDecoder_getstate_impl(self);
+    return _io_IncrementalNewlineDecoder_getstate_impl((nldecoder_object *)self);
 }
 
 PyDoc_STRVAR(_io_IncrementalNewlineDecoder_setstate__doc__,
@@ -469,9 +469,9 @@ static PyObject *
 _io_IncrementalNewlineDecoder_reset_impl(nldecoder_object *self);
 
 static PyObject *
-_io_IncrementalNewlineDecoder_reset(nldecoder_object *self, PyObject *Py_UNUSED(ignored))
+_io_IncrementalNewlineDecoder_reset(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io_IncrementalNewlineDecoder_reset_impl(self);
+    return _io_IncrementalNewlineDecoder_reset_impl((nldecoder_object *)self);
 }
 
 PyDoc_STRVAR(_io_TextIOWrapper___init____doc__,
@@ -654,7 +654,7 @@ _io_TextIOWrapper_reconfigure_impl(textio *self, PyObject *encoding,
                                    PyObject *write_through_obj);
 
 static PyObject *
-_io_TextIOWrapper_reconfigure(textio *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_TextIOWrapper_reconfigure(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -725,7 +725,7 @@ _io_TextIOWrapper_reconfigure(textio *self, PyObject *const *args, Py_ssize_t na
     write_through_obj = args[4];
 skip_optional_kwonly:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_reconfigure_impl(self, encoding, errors, newline_obj, line_buffering_obj, write_through_obj);
+    return_value = _io_TextIOWrapper_reconfigure_impl((textio *)self, encoding, errors, newline_obj, line_buffering_obj, write_through_obj);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -744,12 +744,12 @@ static PyObject *
 _io_TextIOWrapper_detach_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_detach(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_detach(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_detach_impl(self);
+    return_value = _io_TextIOWrapper_detach_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -767,7 +767,7 @@ static PyObject *
 _io_TextIOWrapper_write_impl(textio *self, PyObject *text);
 
 static PyObject *
-_io_TextIOWrapper_write(textio *self, PyObject *arg)
+_io_TextIOWrapper_write(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *text;
@@ -778,7 +778,7 @@ _io_TextIOWrapper_write(textio *self, PyObject *arg)
     }
     text = arg;
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_write_impl(self, text);
+    return_value = _io_TextIOWrapper_write_impl((textio *)self, text);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -797,7 +797,7 @@ static PyObject *
 _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n);
 
 static PyObject *
-_io_TextIOWrapper_read(textio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_TextIOWrapper_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t n = -1;
@@ -813,7 +813,7 @@ _io_TextIOWrapper_read(textio *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_read_impl(self, n);
+    return_value = _io_TextIOWrapper_read_impl((textio *)self, n);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -832,7 +832,7 @@ static PyObject *
 _io_TextIOWrapper_readline_impl(textio *self, Py_ssize_t size);
 
 static PyObject *
-_io_TextIOWrapper_readline(textio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_TextIOWrapper_readline(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t size = -1;
@@ -857,7 +857,7 @@ _io_TextIOWrapper_readline(textio *self, PyObject *const *args, Py_ssize_t nargs
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_readline_impl(self, size);
+    return_value = _io_TextIOWrapper_readline_impl((textio *)self, size);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -894,7 +894,7 @@ static PyObject *
 _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence);
 
 static PyObject *
-_io_TextIOWrapper_seek(textio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_TextIOWrapper_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *cookieObj;
@@ -913,7 +913,7 @@ _io_TextIOWrapper_seek(textio *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_seek_impl(self, cookieObj, whence);
+    return_value = _io_TextIOWrapper_seek_impl((textio *)self, cookieObj, whence);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -936,12 +936,12 @@ static PyObject *
 _io_TextIOWrapper_tell_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_tell(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_tell_impl(self);
+    return_value = _io_TextIOWrapper_tell_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -959,7 +959,7 @@ static PyObject *
 _io_TextIOWrapper_truncate_impl(textio *self, PyObject *pos);
 
 static PyObject *
-_io_TextIOWrapper_truncate(textio *self, PyObject *const *args, Py_ssize_t nargs)
+_io_TextIOWrapper_truncate(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *pos = Py_None;
@@ -973,7 +973,7 @@ _io_TextIOWrapper_truncate(textio *self, PyObject *const *args, Py_ssize_t nargs
     pos = args[0];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_truncate_impl(self, pos);
+    return_value = _io_TextIOWrapper_truncate_impl((textio *)self, pos);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -992,12 +992,12 @@ static PyObject *
 _io_TextIOWrapper_fileno_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_fileno(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_fileno_impl(self);
+    return_value = _io_TextIOWrapper_fileno_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1015,12 +1015,12 @@ static PyObject *
 _io_TextIOWrapper_seekable_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_seekable(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_seekable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_seekable_impl(self);
+    return_value = _io_TextIOWrapper_seekable_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1038,12 +1038,12 @@ static PyObject *
 _io_TextIOWrapper_readable_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_readable(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_readable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_readable_impl(self);
+    return_value = _io_TextIOWrapper_readable_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1061,12 +1061,12 @@ static PyObject *
 _io_TextIOWrapper_writable_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_writable(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_writable_impl(self);
+    return_value = _io_TextIOWrapper_writable_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1084,12 +1084,12 @@ static PyObject *
 _io_TextIOWrapper_isatty_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_isatty(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_isatty(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_isatty_impl(self);
+    return_value = _io_TextIOWrapper_isatty_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1107,12 +1107,12 @@ static PyObject *
 _io_TextIOWrapper_flush_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_flush(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_flush_impl(self);
+    return_value = _io_TextIOWrapper_flush_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1130,12 +1130,12 @@ static PyObject *
 _io_TextIOWrapper_close_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_close(textio *self, PyObject *Py_UNUSED(ignored))
+_io_TextIOWrapper_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_close_impl(self);
+    return_value = _io_TextIOWrapper_close_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1155,12 +1155,12 @@ static PyObject *
 _io_TextIOWrapper_name_get_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_name_get(textio *self, void *Py_UNUSED(context))
+_io_TextIOWrapper_name_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_name_get_impl(self);
+    return_value = _io_TextIOWrapper_name_get_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1180,12 +1180,12 @@ static PyObject *
 _io_TextIOWrapper_closed_get_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_closed_get(textio *self, void *Py_UNUSED(context))
+_io_TextIOWrapper_closed_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_closed_get_impl(self);
+    return_value = _io_TextIOWrapper_closed_get_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1205,12 +1205,12 @@ static PyObject *
 _io_TextIOWrapper_newlines_get_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_newlines_get(textio *self, void *Py_UNUSED(context))
+_io_TextIOWrapper_newlines_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_newlines_get_impl(self);
+    return_value = _io_TextIOWrapper_newlines_get_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1230,12 +1230,12 @@ static PyObject *
 _io_TextIOWrapper_errors_get_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper_errors_get(textio *self, void *Py_UNUSED(context))
+_io_TextIOWrapper_errors_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper_errors_get_impl(self);
+    return_value = _io_TextIOWrapper_errors_get_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1255,12 +1255,12 @@ static PyObject *
 _io_TextIOWrapper__CHUNK_SIZE_get_impl(textio *self);
 
 static PyObject *
-_io_TextIOWrapper__CHUNK_SIZE_get(textio *self, void *Py_UNUSED(context))
+_io_TextIOWrapper__CHUNK_SIZE_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper__CHUNK_SIZE_get_impl(self);
+    return_value = _io_TextIOWrapper__CHUNK_SIZE_get_impl((textio *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1280,14 +1280,14 @@ static int
 _io_TextIOWrapper__CHUNK_SIZE_set_impl(textio *self, PyObject *value);
 
 static int
-_io_TextIOWrapper__CHUNK_SIZE_set(textio *self, PyObject *value, void *Py_UNUSED(context))
+_io_TextIOWrapper__CHUNK_SIZE_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _io_TextIOWrapper__CHUNK_SIZE_set_impl(self, value);
+    return_value = _io_TextIOWrapper__CHUNK_SIZE_set_impl((textio *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
 }
-/*[clinic end generated code: output=423a320f087792b9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6e64e43113a97340 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/winconsoleio.c.h b/Modules/_io/clinic/winconsoleio.c.h
index df281dfeb13fef..ba6dcde6e01064 100644
--- a/Modules/_io/clinic/winconsoleio.c.h
+++ b/Modules/_io/clinic/winconsoleio.c.h
@@ -27,13 +27,13 @@ static PyObject *
 _io__WindowsConsoleIO_close_impl(winconsoleio *self, PyTypeObject *cls);
 
 static PyObject *
-_io__WindowsConsoleIO_close(winconsoleio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io__WindowsConsoleIO_close(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "close() takes no arguments");
         return NULL;
     }
-    return _io__WindowsConsoleIO_close_impl(self, cls);
+    return _io__WindowsConsoleIO_close_impl((winconsoleio *)self, cls);
 }
 
 #endif /* defined(HAVE_WINDOWS_CONSOLE_IO) */
@@ -154,9 +154,9 @@ static PyObject *
 _io__WindowsConsoleIO_fileno_impl(winconsoleio *self);
 
 static PyObject *
-_io__WindowsConsoleIO_fileno(winconsoleio *self, PyObject *Py_UNUSED(ignored))
+_io__WindowsConsoleIO_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io__WindowsConsoleIO_fileno_impl(self);
+    return _io__WindowsConsoleIO_fileno_impl((winconsoleio *)self);
 }
 
 #endif /* defined(HAVE_WINDOWS_CONSOLE_IO) */
@@ -176,9 +176,9 @@ static PyObject *
 _io__WindowsConsoleIO_readable_impl(winconsoleio *self);
 
 static PyObject *
-_io__WindowsConsoleIO_readable(winconsoleio *self, PyObject *Py_UNUSED(ignored))
+_io__WindowsConsoleIO_readable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io__WindowsConsoleIO_readable_impl(self);
+    return _io__WindowsConsoleIO_readable_impl((winconsoleio *)self);
 }
 
 #endif /* defined(HAVE_WINDOWS_CONSOLE_IO) */
@@ -198,9 +198,9 @@ static PyObject *
 _io__WindowsConsoleIO_writable_impl(winconsoleio *self);
 
 static PyObject *
-_io__WindowsConsoleIO_writable(winconsoleio *self, PyObject *Py_UNUSED(ignored))
+_io__WindowsConsoleIO_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io__WindowsConsoleIO_writable_impl(self);
+    return _io__WindowsConsoleIO_writable_impl((winconsoleio *)self);
 }
 
 #endif /* defined(HAVE_WINDOWS_CONSOLE_IO) */
@@ -221,7 +221,7 @@ _io__WindowsConsoleIO_readinto_impl(winconsoleio *self, PyTypeObject *cls,
                                     Py_buffer *buffer);
 
 static PyObject *
-_io__WindowsConsoleIO_readinto(winconsoleio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io__WindowsConsoleIO_readinto(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -249,7 +249,7 @@ _io__WindowsConsoleIO_readinto(winconsoleio *self, PyTypeObject *cls, PyObject *
         _PyArg_BadArgument("readinto", "argument 1", "read-write bytes-like object", args[0]);
         goto exit;
     }
-    return_value = _io__WindowsConsoleIO_readinto_impl(self, cls, &buffer);
+    return_value = _io__WindowsConsoleIO_readinto_impl((winconsoleio *)self, cls, &buffer);
 
 exit:
     /* Cleanup for buffer */
@@ -279,9 +279,9 @@ static PyObject *
 _io__WindowsConsoleIO_readall_impl(winconsoleio *self);
 
 static PyObject *
-_io__WindowsConsoleIO_readall(winconsoleio *self, PyObject *Py_UNUSED(ignored))
+_io__WindowsConsoleIO_readall(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io__WindowsConsoleIO_readall_impl(self);
+    return _io__WindowsConsoleIO_readall_impl((winconsoleio *)self);
 }
 
 #endif /* defined(HAVE_WINDOWS_CONSOLE_IO) */
@@ -306,7 +306,7 @@ _io__WindowsConsoleIO_read_impl(winconsoleio *self, PyTypeObject *cls,
                                 Py_ssize_t size);
 
 static PyObject *
-_io__WindowsConsoleIO_read(winconsoleio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io__WindowsConsoleIO_read(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -337,7 +337,7 @@ _io__WindowsConsoleIO_read(winconsoleio *self, PyTypeObject *cls, PyObject *cons
         goto exit;
     }
 skip_optional_posonly:
-    return_value = _io__WindowsConsoleIO_read_impl(self, cls, size);
+    return_value = _io__WindowsConsoleIO_read_impl((winconsoleio *)self, cls, size);
 
 exit:
     return return_value;
@@ -364,7 +364,7 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, PyTypeObject *cls,
                                  Py_buffer *b);
 
 static PyObject *
-_io__WindowsConsoleIO_write(winconsoleio *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io__WindowsConsoleIO_write(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -391,7 +391,7 @@ _io__WindowsConsoleIO_write(winconsoleio *self, PyTypeObject *cls, PyObject *con
     if (PyObject_GetBuffer(args[0], &b, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _io__WindowsConsoleIO_write_impl(self, cls, &b);
+    return_value = _io__WindowsConsoleIO_write_impl((winconsoleio *)self, cls, &b);
 
 exit:
     /* Cleanup for b */
@@ -419,9 +419,9 @@ static PyObject *
 _io__WindowsConsoleIO_isatty_impl(winconsoleio *self);
 
 static PyObject *
-_io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored))
+_io__WindowsConsoleIO_isatty(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _io__WindowsConsoleIO_isatty_impl(self);
+    return _io__WindowsConsoleIO_isatty_impl((winconsoleio *)self);
 }
 
 #endif /* defined(HAVE_WINDOWS_CONSOLE_IO) */
@@ -461,4 +461,4 @@ _io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored))
 #ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
     #define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
 #endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */
-/*[clinic end generated code: output=78e0f6abf4de2d6d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=edc47f5c49589045 input=a9049054013a1b77]*/
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 65e8d97aa8ac19..687f584ee6caff 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -437,7 +437,7 @@ stringio_iternext(stringio *self)
 /*[clinic input]
 @critical_section
 _io.StringIO.truncate
-    pos as size: Py_ssize_t(accept={int, NoneType}, c_default="self->pos") = None
+    pos as size: Py_ssize_t(accept={int, NoneType}, c_default="((stringio *)self)->pos") = None
     /
 
 Truncate size to pos.
@@ -449,7 +449,7 @@ Returns the new absolute position.
 
 static PyObject *
 _io_StringIO_truncate_impl(stringio *self, Py_ssize_t size)
-/*[clinic end generated code: output=eb3aef8e06701365 input=461b872dce238452]*/
+/*[clinic end generated code: output=eb3aef8e06701365 input=fa8a6c98bb2ba780]*/
 {
     CHECK_INITIALIZED(self);
     CHECK_CLOSED(self);
diff --git a/Modules/_multiprocessing/clinic/semaphore.c.h b/Modules/_multiprocessing/clinic/semaphore.c.h
index 2702c3369c76ed..e789137ec1e013 100644
--- a/Modules/_multiprocessing/clinic/semaphore.c.h
+++ b/Modules/_multiprocessing/clinic/semaphore.c.h
@@ -25,7 +25,7 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking,
                                       PyObject *timeout_obj);
 
 static PyObject *
-_multiprocessing_SemLock_acquire(SemLockObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multiprocessing_SemLock_acquire(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -78,7 +78,7 @@ _multiprocessing_SemLock_acquire(SemLockObject *self, PyObject *const *args, Py_
     timeout_obj = args[1];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock_acquire_impl(self, blocking, timeout_obj);
+    return_value = _multiprocessing_SemLock_acquire_impl((SemLockObject *)self, blocking, timeout_obj);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -102,12 +102,12 @@ static PyObject *
 _multiprocessing_SemLock_release_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock_release(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock_release(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock_release_impl(self);
+    return_value = _multiprocessing_SemLock_release_impl((SemLockObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -131,7 +131,7 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking,
                                       PyObject *timeout_obj);
 
 static PyObject *
-_multiprocessing_SemLock_acquire(SemLockObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multiprocessing_SemLock_acquire(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -184,7 +184,7 @@ _multiprocessing_SemLock_acquire(SemLockObject *self, PyObject *const *args, Py_
     timeout_obj = args[1];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock_acquire_impl(self, blocking, timeout_obj);
+    return_value = _multiprocessing_SemLock_acquire_impl((SemLockObject *)self, blocking, timeout_obj);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -208,12 +208,12 @@ static PyObject *
 _multiprocessing_SemLock_release_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock_release(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock_release(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock_release_impl(self);
+    return_value = _multiprocessing_SemLock_release_impl((SemLockObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -358,12 +358,12 @@ static PyObject *
 _multiprocessing_SemLock__count_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock__count(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock__count(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock__count_impl(self);
+    return_value = _multiprocessing_SemLock__count_impl((SemLockObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -386,9 +386,9 @@ static PyObject *
 _multiprocessing_SemLock__is_mine_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock__is_mine(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock__is_mine(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multiprocessing_SemLock__is_mine_impl(self);
+    return _multiprocessing_SemLock__is_mine_impl((SemLockObject *)self);
 }
 
 #endif /* defined(HAVE_MP_SEMAPHORE) */
@@ -408,9 +408,9 @@ static PyObject *
 _multiprocessing_SemLock__get_value_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock__get_value(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock__get_value(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multiprocessing_SemLock__get_value_impl(self);
+    return _multiprocessing_SemLock__get_value_impl((SemLockObject *)self);
 }
 
 #endif /* defined(HAVE_MP_SEMAPHORE) */
@@ -430,9 +430,9 @@ static PyObject *
 _multiprocessing_SemLock__is_zero_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock__is_zero(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock__is_zero(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multiprocessing_SemLock__is_zero_impl(self);
+    return _multiprocessing_SemLock__is_zero_impl((SemLockObject *)self);
 }
 
 #endif /* defined(HAVE_MP_SEMAPHORE) */
@@ -452,9 +452,9 @@ static PyObject *
 _multiprocessing_SemLock__after_fork_impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock__after_fork(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock__after_fork(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multiprocessing_SemLock__after_fork_impl(self);
+    return _multiprocessing_SemLock__after_fork_impl((SemLockObject *)self);
 }
 
 #endif /* defined(HAVE_MP_SEMAPHORE) */
@@ -474,12 +474,12 @@ static PyObject *
 _multiprocessing_SemLock___enter___impl(SemLockObject *self);
 
 static PyObject *
-_multiprocessing_SemLock___enter__(SemLockObject *self, PyObject *Py_UNUSED(ignored))
+_multiprocessing_SemLock___enter__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock___enter___impl(self);
+    return_value = _multiprocessing_SemLock___enter___impl((SemLockObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -504,7 +504,7 @@ _multiprocessing_SemLock___exit___impl(SemLockObject *self,
                                        PyObject *exc_value, PyObject *exc_tb);
 
 static PyObject *
-_multiprocessing_SemLock___exit__(SemLockObject *self, PyObject *const *args, Py_ssize_t nargs)
+_multiprocessing_SemLock___exit__(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *exc_type = Py_None;
@@ -528,7 +528,7 @@ _multiprocessing_SemLock___exit__(SemLockObject *self, PyObject *const *args, Py
     exc_tb = args[2];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _multiprocessing_SemLock___exit___impl(self, exc_type, exc_value, exc_tb);
+    return_value = _multiprocessing_SemLock___exit___impl((SemLockObject *)self, exc_type, exc_value, exc_tb);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -576,4 +576,4 @@ _multiprocessing_SemLock___exit__(SemLockObject *self, PyObject *const *args, Py
 #ifndef _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF
     #define _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF
 #endif /* !defined(_MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF) */
-/*[clinic end generated code: output=9023d3e48a24afd2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e28d0fdbfefd1235 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/blob.c.h b/Modules/_sqlite/clinic/blob.c.h
index b95ba948aaf97f..921e7cbd7ffcab 100644
--- a/Modules/_sqlite/clinic/blob.c.h
+++ b/Modules/_sqlite/clinic/blob.c.h
@@ -17,9 +17,9 @@ static PyObject *
 blob_close_impl(pysqlite_Blob *self);
 
 static PyObject *
-blob_close(pysqlite_Blob *self, PyObject *Py_UNUSED(ignored))
+blob_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return blob_close_impl(self);
+    return blob_close_impl((pysqlite_Blob *)self);
 }
 
 PyDoc_STRVAR(blob_read__doc__,
@@ -42,7 +42,7 @@ static PyObject *
 blob_read_impl(pysqlite_Blob *self, int length);
 
 static PyObject *
-blob_read(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
+blob_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int length = -1;
@@ -58,7 +58,7 @@ blob_read(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = blob_read_impl(self, length);
+    return_value = blob_read_impl((pysqlite_Blob *)self, length);
 
 exit:
     return return_value;
@@ -80,7 +80,7 @@ static PyObject *
 blob_write_impl(pysqlite_Blob *self, Py_buffer *data);
 
 static PyObject *
-blob_write(pysqlite_Blob *self, PyObject *arg)
+blob_write(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer data = {NULL, NULL};
@@ -88,7 +88,7 @@ blob_write(pysqlite_Blob *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &data, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = blob_write_impl(self, &data);
+    return_value = blob_write_impl((pysqlite_Blob *)self, &data);
 
 exit:
     /* Cleanup for data */
@@ -116,7 +116,7 @@ static PyObject *
 blob_seek_impl(pysqlite_Blob *self, int offset, int origin);
 
 static PyObject *
-blob_seek(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
+blob_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int offset;
@@ -137,7 +137,7 @@ blob_seek(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = blob_seek_impl(self, offset, origin);
+    return_value = blob_seek_impl((pysqlite_Blob *)self, offset, origin);
 
 exit:
     return return_value;
@@ -156,9 +156,9 @@ static PyObject *
 blob_tell_impl(pysqlite_Blob *self);
 
 static PyObject *
-blob_tell(pysqlite_Blob *self, PyObject *Py_UNUSED(ignored))
+blob_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return blob_tell_impl(self);
+    return blob_tell_impl((pysqlite_Blob *)self);
 }
 
 PyDoc_STRVAR(blob_enter__doc__,
@@ -174,9 +174,9 @@ static PyObject *
 blob_enter_impl(pysqlite_Blob *self);
 
 static PyObject *
-blob_enter(pysqlite_Blob *self, PyObject *Py_UNUSED(ignored))
+blob_enter(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return blob_enter_impl(self);
+    return blob_enter_impl((pysqlite_Blob *)self);
 }
 
 PyDoc_STRVAR(blob_exit__doc__,
@@ -193,7 +193,7 @@ blob_exit_impl(pysqlite_Blob *self, PyObject *type, PyObject *val,
                PyObject *tb);
 
 static PyObject *
-blob_exit(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
+blob_exit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *type;
@@ -206,9 +206,9 @@ blob_exit(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
     type = args[0];
     val = args[1];
     tb = args[2];
-    return_value = blob_exit_impl(self, type, val, tb);
+    return_value = blob_exit_impl((pysqlite_Blob *)self, type, val, tb);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=31abd55660e0c5af input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f03f4ba622b67ae0 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h
index 42eb6eb2f12554..82fba44eb1b074 100644
--- a/Modules/_sqlite/clinic/connection.c.h
+++ b/Modules/_sqlite/clinic/connection.c.h
@@ -182,7 +182,7 @@ static PyObject *
 pysqlite_connection_cursor_impl(pysqlite_Connection *self, PyObject *factory);
 
 static PyObject *
-pysqlite_connection_cursor(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_cursor(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -224,7 +224,7 @@ pysqlite_connection_cursor(pysqlite_Connection *self, PyObject *const *args, Py_
     }
     factory = args[0];
 skip_optional_pos:
-    return_value = pysqlite_connection_cursor_impl(self, factory);
+    return_value = pysqlite_connection_cursor_impl((pysqlite_Connection *)self, factory);
 
 exit:
     return return_value;
@@ -255,7 +255,7 @@ blobopen_impl(pysqlite_Connection *self, const char *table, const char *col,
               sqlite3_int64 row, int readonly, const char *name);
 
 static PyObject *
-blobopen(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+blobopen(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -351,7 +351,7 @@ blobopen(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyO
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = blobopen_impl(self, table, col, row, readonly, name);
+    return_value = blobopen_impl((pysqlite_Connection *)self, table, col, row, readonly, name);
 
 exit:
     return return_value;
@@ -372,9 +372,9 @@ static PyObject *
 pysqlite_connection_close_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_close(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_close_impl(self);
+    return pysqlite_connection_close_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_commit__doc__,
@@ -392,9 +392,9 @@ static PyObject *
 pysqlite_connection_commit_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_commit(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_commit(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_commit_impl(self);
+    return pysqlite_connection_commit_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_rollback__doc__,
@@ -412,9 +412,9 @@ static PyObject *
 pysqlite_connection_rollback_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_rollback(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_rollback(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_rollback_impl(self);
+    return pysqlite_connection_rollback_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_create_function__doc__,
@@ -449,7 +449,7 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_create_function(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_create_function(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -525,7 +525,7 @@ pysqlite_connection_create_function(pysqlite_Connection *self, PyTypeObject *cls
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = pysqlite_connection_create_function_impl(self, cls, name, narg, func, deterministic);
+    return_value = pysqlite_connection_create_function_impl((pysqlite_Connection *)self, cls, name, narg, func, deterministic);
 
 exit:
     return return_value;
@@ -557,7 +557,7 @@ create_window_function_impl(pysqlite_Connection *self, PyTypeObject *cls,
                             PyObject *aggregate_class);
 
 static PyObject *
-create_window_function(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+create_window_function(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -601,7 +601,7 @@ create_window_function(pysqlite_Connection *self, PyTypeObject *cls, PyObject *c
         goto exit;
     }
     aggregate_class = args[2];
-    return_value = create_window_function_impl(self, cls, name, num_params, aggregate_class);
+    return_value = create_window_function_impl((pysqlite_Connection *)self, cls, name, num_params, aggregate_class);
 
 exit:
     return return_value;
@@ -642,7 +642,7 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_create_aggregate(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_create_aggregate(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -708,7 +708,7 @@ pysqlite_connection_create_aggregate(pysqlite_Connection *self, PyTypeObject *cl
         goto exit;
     }
     aggregate_class = args[2];
-    return_value = pysqlite_connection_create_aggregate_impl(self, cls, name, n_arg, aggregate_class);
+    return_value = pysqlite_connection_create_aggregate_impl((pysqlite_Connection *)self, cls, name, n_arg, aggregate_class);
 
 exit:
     return return_value;
@@ -745,7 +745,7 @@ pysqlite_connection_set_authorizer_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_set_authorizer(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_set_authorizer(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -792,7 +792,7 @@ pysqlite_connection_set_authorizer(pysqlite_Connection *self, PyTypeObject *cls,
         }
     }
     callable = args[0];
-    return_value = pysqlite_connection_set_authorizer_impl(self, cls, callable);
+    return_value = pysqlite_connection_set_authorizer_impl((pysqlite_Connection *)self, cls, callable);
 
 exit:
     return return_value;
@@ -839,7 +839,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_set_progress_handler(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_set_progress_handler(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -891,7 +891,7 @@ pysqlite_connection_set_progress_handler(pysqlite_Connection *self, PyTypeObject
     if (n == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = pysqlite_connection_set_progress_handler_impl(self, cls, callable, n);
+    return_value = pysqlite_connection_set_progress_handler_impl((pysqlite_Connection *)self, cls, callable, n);
 
 exit:
     return return_value;
@@ -928,7 +928,7 @@ pysqlite_connection_set_trace_callback_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_set_trace_callback(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -975,7 +975,7 @@ pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject *
         }
     }
     callable = args[0];
-    return_value = pysqlite_connection_set_trace_callback_impl(self, cls, callable);
+    return_value = pysqlite_connection_set_trace_callback_impl((pysqlite_Connection *)self, cls, callable);
 
 exit:
     return return_value;
@@ -997,7 +997,7 @@ pysqlite_connection_enable_load_extension_impl(pysqlite_Connection *self,
                                                int onoff);
 
 static PyObject *
-pysqlite_connection_enable_load_extension(pysqlite_Connection *self, PyObject *arg)
+pysqlite_connection_enable_load_extension(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int onoff;
@@ -1006,7 +1006,7 @@ pysqlite_connection_enable_load_extension(pysqlite_Connection *self, PyObject *a
     if (onoff < 0) {
         goto exit;
     }
-    return_value = pysqlite_connection_enable_load_extension_impl(self, onoff);
+    return_value = pysqlite_connection_enable_load_extension_impl((pysqlite_Connection *)self, onoff);
 
 exit:
     return return_value;
@@ -1031,7 +1031,7 @@ pysqlite_connection_load_extension_impl(pysqlite_Connection *self,
                                         const char *entrypoint);
 
 static PyObject *
-pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_load_extension(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1104,7 +1104,7 @@ pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *const *a
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = pysqlite_connection_load_extension_impl(self, extension_name, entrypoint);
+    return_value = pysqlite_connection_load_extension_impl((pysqlite_Connection *)self, extension_name, entrypoint);
 
 exit:
     return return_value;
@@ -1126,7 +1126,7 @@ pysqlite_connection_execute_impl(pysqlite_Connection *self, PyObject *sql,
                                  PyObject *parameters);
 
 static PyObject *
-pysqlite_connection_execute(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_connection_execute(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -1145,7 +1145,7 @@ pysqlite_connection_execute(pysqlite_Connection *self, PyObject *const *args, Py
     }
     parameters = args[1];
 skip_optional:
-    return_value = pysqlite_connection_execute_impl(self, sql, parameters);
+    return_value = pysqlite_connection_execute_impl((pysqlite_Connection *)self, sql, parameters);
 
 exit:
     return return_value;
@@ -1165,7 +1165,7 @@ pysqlite_connection_executemany_impl(pysqlite_Connection *self,
                                      PyObject *sql, PyObject *parameters);
 
 static PyObject *
-pysqlite_connection_executemany(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_connection_executemany(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -1180,7 +1180,7 @@ pysqlite_connection_executemany(pysqlite_Connection *self, PyObject *const *args
     }
     sql = args[0];
     parameters = args[1];
-    return_value = pysqlite_connection_executemany_impl(self, sql, parameters);
+    return_value = pysqlite_connection_executemany_impl((pysqlite_Connection *)self, sql, parameters);
 
 exit:
     return return_value;
@@ -1208,9 +1208,9 @@ static PyObject *
 pysqlite_connection_interrupt_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_interrupt(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_interrupt(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_interrupt_impl(self);
+    return pysqlite_connection_interrupt_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_iterdump__doc__,
@@ -1230,7 +1230,7 @@ pysqlite_connection_iterdump_impl(pysqlite_Connection *self,
                                   PyObject *filter);
 
 static PyObject *
-pysqlite_connection_iterdump(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_iterdump(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1272,7 +1272,7 @@ pysqlite_connection_iterdump(pysqlite_Connection *self, PyObject *const *args, P
     }
     filter = args[0];
 skip_optional_kwonly:
-    return_value = pysqlite_connection_iterdump_impl(self, filter);
+    return_value = pysqlite_connection_iterdump_impl((pysqlite_Connection *)self, filter);
 
 exit:
     return return_value;
@@ -1295,7 +1295,7 @@ pysqlite_connection_backup_impl(pysqlite_Connection *self,
                                 double sleep);
 
 static PyObject *
-pysqlite_connection_backup(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_backup(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1388,7 +1388,7 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *const *args, Py_
         }
     }
 skip_optional_kwonly:
-    return_value = pysqlite_connection_backup_impl(self, target, pages, progress, name, sleep);
+    return_value = pysqlite_connection_backup_impl((pysqlite_Connection *)self, target, pages, progress, name, sleep);
 
 exit:
     return return_value;
@@ -1410,7 +1410,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
                                           PyObject *callable);
 
 static PyObject *
-pysqlite_connection_create_collation(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_create_collation(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1449,7 +1449,7 @@ pysqlite_connection_create_collation(pysqlite_Connection *self, PyTypeObject *cl
         goto exit;
     }
     callable = args[1];
-    return_value = pysqlite_connection_create_collation_impl(self, cls, name, callable);
+    return_value = pysqlite_connection_create_collation_impl((pysqlite_Connection *)self, cls, name, callable);
 
 exit:
     return return_value;
@@ -1478,7 +1478,7 @@ static PyObject *
 serialize_impl(pysqlite_Connection *self, const char *name);
 
 static PyObject *
-serialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+serialize(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1532,7 +1532,7 @@ serialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, Py
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = serialize_impl(self, name);
+    return_value = serialize_impl((pysqlite_Connection *)self, name);
 
 exit:
     return return_value;
@@ -1568,7 +1568,7 @@ deserialize_impl(pysqlite_Connection *self, Py_buffer *data,
                  const char *name);
 
 static PyObject *
-deserialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+deserialize(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1638,7 +1638,7 @@ deserialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs,
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = deserialize_impl(self, &data, name);
+    return_value = deserialize_impl((pysqlite_Connection *)self, &data, name);
 
 exit:
     /* Cleanup for data */
@@ -1666,9 +1666,9 @@ static PyObject *
 pysqlite_connection_enter_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_enter(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_enter(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_enter_impl(self);
+    return pysqlite_connection_enter_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_exit__doc__,
@@ -1687,7 +1687,7 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, PyObject *exc_type,
                               PyObject *exc_value, PyObject *exc_tb);
 
 static PyObject *
-pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_connection_exit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *exc_type;
@@ -1700,7 +1700,7 @@ pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ss
     exc_type = args[0];
     exc_value = args[1];
     exc_tb = args[2];
-    return_value = pysqlite_connection_exit_impl(self, exc_type, exc_value, exc_tb);
+    return_value = pysqlite_connection_exit_impl((pysqlite_Connection *)self, exc_type, exc_value, exc_tb);
 
 exit:
     return return_value;
@@ -1729,7 +1729,7 @@ static PyObject *
 setlimit_impl(pysqlite_Connection *self, int category, int limit);
 
 static PyObject *
-setlimit(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+setlimit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int category;
@@ -1746,7 +1746,7 @@ setlimit(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
     if (limit == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = setlimit_impl(self, category, limit);
+    return_value = setlimit_impl((pysqlite_Connection *)self, category, limit);
 
 exit:
     return return_value;
@@ -1768,7 +1768,7 @@ static PyObject *
 getlimit_impl(pysqlite_Connection *self, int category);
 
 static PyObject *
-getlimit(pysqlite_Connection *self, PyObject *arg)
+getlimit(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int category;
@@ -1777,7 +1777,7 @@ getlimit(pysqlite_Connection *self, PyObject *arg)
     if (category == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = getlimit_impl(self, category);
+    return_value = getlimit_impl((pysqlite_Connection *)self, category);
 
 exit:
     return return_value;
@@ -1799,7 +1799,7 @@ static PyObject *
 setconfig_impl(pysqlite_Connection *self, int op, int enable);
 
 static PyObject *
-setconfig(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+setconfig(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int op;
@@ -1820,7 +1820,7 @@ setconfig(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = setconfig_impl(self, op, enable);
+    return_value = setconfig_impl((pysqlite_Connection *)self, op, enable);
 
 exit:
     return return_value;
@@ -1842,7 +1842,7 @@ static int
 getconfig_impl(pysqlite_Connection *self, int op);
 
 static PyObject *
-getconfig(pysqlite_Connection *self, PyObject *arg)
+getconfig(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int op;
@@ -1852,7 +1852,7 @@ getconfig(pysqlite_Connection *self, PyObject *arg)
     if (op == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    _return_value = getconfig_impl(self, op);
+    _return_value = getconfig_impl((pysqlite_Connection *)self, op);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -1881,4 +1881,4 @@ getconfig(pysqlite_Connection *self, PyObject *arg)
 #ifndef DESERIALIZE_METHODDEF
     #define DESERIALIZE_METHODDEF
 #endif /* !defined(DESERIALIZE_METHODDEF) */
-/*[clinic end generated code: output=a8fd19301c7390cc input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c59effb407b8ea4d input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h
index ca7823cf5aef5b..590e429e9139f1 100644
--- a/Modules/_sqlite/clinic/cursor.c.h
+++ b/Modules/_sqlite/clinic/cursor.c.h
@@ -52,7 +52,7 @@ pysqlite_cursor_execute_impl(pysqlite_Cursor *self, PyObject *sql,
                              PyObject *parameters);
 
 static PyObject *
-pysqlite_cursor_execute(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_cursor_execute(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -71,7 +71,7 @@ pysqlite_cursor_execute(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t
     }
     parameters = args[1];
 skip_optional:
-    return_value = pysqlite_cursor_execute_impl(self, sql, parameters);
+    return_value = pysqlite_cursor_execute_impl((pysqlite_Cursor *)self, sql, parameters);
 
 exit:
     return return_value;
@@ -91,7 +91,7 @@ pysqlite_cursor_executemany_impl(pysqlite_Cursor *self, PyObject *sql,
                                  PyObject *seq_of_parameters);
 
 static PyObject *
-pysqlite_cursor_executemany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_cursor_executemany(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -106,7 +106,7 @@ pysqlite_cursor_executemany(pysqlite_Cursor *self, PyObject *const *args, Py_ssi
     }
     sql = args[0];
     seq_of_parameters = args[1];
-    return_value = pysqlite_cursor_executemany_impl(self, sql, seq_of_parameters);
+    return_value = pysqlite_cursor_executemany_impl((pysqlite_Cursor *)self, sql, seq_of_parameters);
 
 exit:
     return return_value;
@@ -126,7 +126,7 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
                                    const char *sql_script);
 
 static PyObject *
-pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *arg)
+pysqlite_cursor_executescript(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *sql_script;
@@ -144,7 +144,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = pysqlite_cursor_executescript_impl(self, sql_script);
+    return_value = pysqlite_cursor_executescript_impl((pysqlite_Cursor *)self, sql_script);
 
 exit:
     return return_value;
@@ -163,9 +163,9 @@ static PyObject *
 pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self);
 
 static PyObject *
-pysqlite_cursor_fetchone(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
+pysqlite_cursor_fetchone(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_cursor_fetchone_impl(self);
+    return pysqlite_cursor_fetchone_impl((pysqlite_Cursor *)self);
 }
 
 PyDoc_STRVAR(pysqlite_cursor_fetchmany__doc__,
@@ -184,7 +184,7 @@ static PyObject *
 pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows);
 
 static PyObject *
-pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_cursor_fetchmany(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -214,7 +214,7 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize
     #undef KWTUPLE
     PyObject *argsbuf[1];
     Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
-    int maxrows = self->arraysize;
+    int maxrows = ((pysqlite_Cursor *)self)->arraysize;
 
     args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser,
             /*minpos*/ 0, /*maxpos*/ 1, /*minkw*/ 0, /*varpos*/ 0, argsbuf);
@@ -229,7 +229,7 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize
         goto exit;
     }
 skip_optional_pos:
-    return_value = pysqlite_cursor_fetchmany_impl(self, maxrows);
+    return_value = pysqlite_cursor_fetchmany_impl((pysqlite_Cursor *)self, maxrows);
 
 exit:
     return return_value;
@@ -248,9 +248,9 @@ static PyObject *
 pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self);
 
 static PyObject *
-pysqlite_cursor_fetchall(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
+pysqlite_cursor_fetchall(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_cursor_fetchall_impl(self);
+    return pysqlite_cursor_fetchall_impl((pysqlite_Cursor *)self);
 }
 
 PyDoc_STRVAR(pysqlite_cursor_setinputsizes__doc__,
@@ -276,7 +276,7 @@ pysqlite_cursor_setoutputsize_impl(pysqlite_Cursor *self, PyObject *size,
                                    PyObject *column);
 
 static PyObject *
-pysqlite_cursor_setoutputsize(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_cursor_setoutputsize(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *size;
@@ -291,7 +291,7 @@ pysqlite_cursor_setoutputsize(pysqlite_Cursor *self, PyObject *const *args, Py_s
     }
     column = args[1];
 skip_optional:
-    return_value = pysqlite_cursor_setoutputsize_impl(self, size, column);
+    return_value = pysqlite_cursor_setoutputsize_impl((pysqlite_Cursor *)self, size, column);
 
 exit:
     return return_value;
@@ -310,8 +310,8 @@ static PyObject *
 pysqlite_cursor_close_impl(pysqlite_Cursor *self);
 
 static PyObject *
-pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
+pysqlite_cursor_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_cursor_close_impl(self);
+    return pysqlite_cursor_close_impl((pysqlite_Cursor *)self);
 }
-/*[clinic end generated code: output=f0804afc5f8646c1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=82620ca7622b547c input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/row.c.h b/Modules/_sqlite/clinic/row.c.h
index e8d1dbf2ba8bc9..068906744e445f 100644
--- a/Modules/_sqlite/clinic/row.c.h
+++ b/Modules/_sqlite/clinic/row.c.h
@@ -52,8 +52,8 @@ static PyObject *
 pysqlite_row_keys_impl(pysqlite_Row *self);
 
 static PyObject *
-pysqlite_row_keys(pysqlite_Row *self, PyObject *Py_UNUSED(ignored))
+pysqlite_row_keys(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_row_keys_impl(self);
+    return pysqlite_row_keys_impl((pysqlite_Row *)self);
 }
-/*[clinic end generated code: output=788bf817acc02b8e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6c1acbb48f386468 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 0fbd408f18cf6a..24e97fcf1897e9 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -1155,7 +1155,7 @@ pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self)
 /*[clinic input]
 _sqlite3.Cursor.fetchmany as pysqlite_cursor_fetchmany
 
-    size as maxrows: int(c_default='self->arraysize') = 1
+    size as maxrows: int(c_default='((pysqlite_Cursor *)self)->arraysize') = 1
         The default value is set by the Cursor.arraysize attribute.
 
 Fetches several rows from the resultset.
@@ -1163,7 +1163,7 @@ Fetches several rows from the resultset.
 
 static PyObject *
 pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows)
-/*[clinic end generated code: output=a8ef31fea64d0906 input=c26e6ca3f34debd0]*/
+/*[clinic end generated code: output=a8ef31fea64d0906 input=035dbe44a1005bf2]*/
 {
     PyObject* row;
     PyObject* list;
diff --git a/Modules/_sre/clinic/sre.c.h b/Modules/_sre/clinic/sre.c.h
index 87e4785a428468..cfc6813f37f012 100644
--- a/Modules/_sre/clinic/sre.c.h
+++ b/Modules/_sre/clinic/sre.c.h
@@ -179,7 +179,7 @@ _sre_SRE_Pattern_match_impl(PatternObject *self, PyTypeObject *cls,
                             Py_ssize_t endpos);
 
 static PyObject *
-_sre_SRE_Pattern_match(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_match(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -252,7 +252,7 @@ _sre_SRE_Pattern_match(PatternObject *self, PyTypeObject *cls, PyObject *const *
         endpos = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_match_impl(self, cls, string, pos, endpos);
+    return_value = _sre_SRE_Pattern_match_impl((PatternObject *)self, cls, string, pos, endpos);
 
 exit:
     return return_value;
@@ -273,7 +273,7 @@ _sre_SRE_Pattern_fullmatch_impl(PatternObject *self, PyTypeObject *cls,
                                 Py_ssize_t endpos);
 
 static PyObject *
-_sre_SRE_Pattern_fullmatch(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_fullmatch(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -346,7 +346,7 @@ _sre_SRE_Pattern_fullmatch(PatternObject *self, PyTypeObject *cls, PyObject *con
         endpos = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_fullmatch_impl(self, cls, string, pos, endpos);
+    return_value = _sre_SRE_Pattern_fullmatch_impl((PatternObject *)self, cls, string, pos, endpos);
 
 exit:
     return return_value;
@@ -369,7 +369,7 @@ _sre_SRE_Pattern_search_impl(PatternObject *self, PyTypeObject *cls,
                              Py_ssize_t endpos);
 
 static PyObject *
-_sre_SRE_Pattern_search(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_search(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -442,7 +442,7 @@ _sre_SRE_Pattern_search(PatternObject *self, PyTypeObject *cls, PyObject *const
         endpos = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_search_impl(self, cls, string, pos, endpos);
+    return_value = _sre_SRE_Pattern_search_impl((PatternObject *)self, cls, string, pos, endpos);
 
 exit:
     return return_value;
@@ -462,7 +462,7 @@ _sre_SRE_Pattern_findall_impl(PatternObject *self, PyObject *string,
                               Py_ssize_t pos, Py_ssize_t endpos);
 
 static PyObject *
-_sre_SRE_Pattern_findall(PatternObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_findall(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -535,7 +535,7 @@ _sre_SRE_Pattern_findall(PatternObject *self, PyObject *const *args, Py_ssize_t
         endpos = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_findall_impl(self, string, pos, endpos);
+    return_value = _sre_SRE_Pattern_findall_impl((PatternObject *)self, string, pos, endpos);
 
 exit:
     return return_value;
@@ -558,7 +558,7 @@ _sre_SRE_Pattern_finditer_impl(PatternObject *self, PyTypeObject *cls,
                                Py_ssize_t endpos);
 
 static PyObject *
-_sre_SRE_Pattern_finditer(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_finditer(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -631,7 +631,7 @@ _sre_SRE_Pattern_finditer(PatternObject *self, PyTypeObject *cls, PyObject *cons
         endpos = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_finditer_impl(self, cls, string, pos, endpos);
+    return_value = _sre_SRE_Pattern_finditer_impl((PatternObject *)self, cls, string, pos, endpos);
 
 exit:
     return return_value;
@@ -651,7 +651,7 @@ _sre_SRE_Pattern_scanner_impl(PatternObject *self, PyTypeObject *cls,
                               Py_ssize_t endpos);
 
 static PyObject *
-_sre_SRE_Pattern_scanner(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_scanner(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -724,7 +724,7 @@ _sre_SRE_Pattern_scanner(PatternObject *self, PyTypeObject *cls, PyObject *const
         endpos = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_scanner_impl(self, cls, string, pos, endpos);
+    return_value = _sre_SRE_Pattern_scanner_impl((PatternObject *)self, cls, string, pos, endpos);
 
 exit:
     return return_value;
@@ -744,7 +744,7 @@ _sre_SRE_Pattern_split_impl(PatternObject *self, PyObject *string,
                             Py_ssize_t maxsplit);
 
 static PyObject *
-_sre_SRE_Pattern_split(PatternObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_split(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -799,7 +799,7 @@ _sre_SRE_Pattern_split(PatternObject *self, PyObject *const *args, Py_ssize_t na
         maxsplit = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_split_impl(self, string, maxsplit);
+    return_value = _sre_SRE_Pattern_split_impl((PatternObject *)self, string, maxsplit);
 
 exit:
     return return_value;
@@ -819,7 +819,7 @@ _sre_SRE_Pattern_sub_impl(PatternObject *self, PyTypeObject *cls,
                           PyObject *repl, PyObject *string, Py_ssize_t count);
 
 static PyObject *
-_sre_SRE_Pattern_sub(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_sub(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -876,7 +876,7 @@ _sre_SRE_Pattern_sub(PatternObject *self, PyTypeObject *cls, PyObject *const *ar
         count = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_sub_impl(self, cls, repl, string, count);
+    return_value = _sre_SRE_Pattern_sub_impl((PatternObject *)self, cls, repl, string, count);
 
 exit:
     return return_value;
@@ -897,7 +897,7 @@ _sre_SRE_Pattern_subn_impl(PatternObject *self, PyTypeObject *cls,
                            Py_ssize_t count);
 
 static PyObject *
-_sre_SRE_Pattern_subn(PatternObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Pattern_subn(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -954,7 +954,7 @@ _sre_SRE_Pattern_subn(PatternObject *self, PyTypeObject *cls, PyObject *const *a
         count = ival;
     }
 skip_optional_pos:
-    return_value = _sre_SRE_Pattern_subn_impl(self, cls, repl, string, count);
+    return_value = _sre_SRE_Pattern_subn_impl((PatternObject *)self, cls, repl, string, count);
 
 exit:
     return return_value;
@@ -972,9 +972,9 @@ static PyObject *
 _sre_SRE_Pattern___copy___impl(PatternObject *self);
 
 static PyObject *
-_sre_SRE_Pattern___copy__(PatternObject *self, PyObject *Py_UNUSED(ignored))
+_sre_SRE_Pattern___copy__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _sre_SRE_Pattern___copy___impl(self);
+    return _sre_SRE_Pattern___copy___impl((PatternObject *)self);
 }
 
 PyDoc_STRVAR(_sre_SRE_Pattern___deepcopy____doc__,
@@ -1001,7 +1001,7 @@ _sre_SRE_Pattern__fail_after_impl(PatternObject *self, int count,
                                   PyObject *exception);
 
 static PyObject *
-_sre_SRE_Pattern__fail_after(PatternObject *self, PyObject *const *args, Py_ssize_t nargs)
+_sre_SRE_Pattern__fail_after(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int count;
@@ -1015,7 +1015,7 @@ _sre_SRE_Pattern__fail_after(PatternObject *self, PyObject *const *args, Py_ssiz
         goto exit;
     }
     exception = args[1];
-    return_value = _sre_SRE_Pattern__fail_after_impl(self, count, exception);
+    return_value = _sre_SRE_Pattern__fail_after_impl((PatternObject *)self, count, exception);
 
 exit:
     return return_value;
@@ -1169,7 +1169,7 @@ static PyObject *
 _sre_SRE_Match_expand_impl(MatchObject *self, PyObject *template);
 
 static PyObject *
-_sre_SRE_Match_expand(MatchObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Match_expand(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1206,7 +1206,7 @@ _sre_SRE_Match_expand(MatchObject *self, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
     template = args[0];
-    return_value = _sre_SRE_Match_expand_impl(self, template);
+    return_value = _sre_SRE_Match_expand_impl((MatchObject *)self, template);
 
 exit:
     return return_value;
@@ -1228,7 +1228,7 @@ static PyObject *
 _sre_SRE_Match_groups_impl(MatchObject *self, PyObject *default_value);
 
 static PyObject *
-_sre_SRE_Match_groups(MatchObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Match_groups(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1270,7 +1270,7 @@ _sre_SRE_Match_groups(MatchObject *self, PyObject *const *args, Py_ssize_t nargs
     }
     default_value = args[0];
 skip_optional_pos:
-    return_value = _sre_SRE_Match_groups_impl(self, default_value);
+    return_value = _sre_SRE_Match_groups_impl((MatchObject *)self, default_value);
 
 exit:
     return return_value;
@@ -1292,7 +1292,7 @@ static PyObject *
 _sre_SRE_Match_groupdict_impl(MatchObject *self, PyObject *default_value);
 
 static PyObject *
-_sre_SRE_Match_groupdict(MatchObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Match_groupdict(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1334,7 +1334,7 @@ _sre_SRE_Match_groupdict(MatchObject *self, PyObject *const *args, Py_ssize_t na
     }
     default_value = args[0];
 skip_optional_pos:
-    return_value = _sre_SRE_Match_groupdict_impl(self, default_value);
+    return_value = _sre_SRE_Match_groupdict_impl((MatchObject *)self, default_value);
 
 exit:
     return return_value;
@@ -1353,7 +1353,7 @@ static Py_ssize_t
 _sre_SRE_Match_start_impl(MatchObject *self, PyObject *group);
 
 static PyObject *
-_sre_SRE_Match_start(MatchObject *self, PyObject *const *args, Py_ssize_t nargs)
+_sre_SRE_Match_start(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *group = NULL;
@@ -1367,7 +1367,7 @@ _sre_SRE_Match_start(MatchObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     group = args[0];
 skip_optional:
-    _return_value = _sre_SRE_Match_start_impl(self, group);
+    _return_value = _sre_SRE_Match_start_impl((MatchObject *)self, group);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -1390,7 +1390,7 @@ static Py_ssize_t
 _sre_SRE_Match_end_impl(MatchObject *self, PyObject *group);
 
 static PyObject *
-_sre_SRE_Match_end(MatchObject *self, PyObject *const *args, Py_ssize_t nargs)
+_sre_SRE_Match_end(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *group = NULL;
@@ -1404,7 +1404,7 @@ _sre_SRE_Match_end(MatchObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     group = args[0];
 skip_optional:
-    _return_value = _sre_SRE_Match_end_impl(self, group);
+    _return_value = _sre_SRE_Match_end_impl((MatchObject *)self, group);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -1427,7 +1427,7 @@ static PyObject *
 _sre_SRE_Match_span_impl(MatchObject *self, PyObject *group);
 
 static PyObject *
-_sre_SRE_Match_span(MatchObject *self, PyObject *const *args, Py_ssize_t nargs)
+_sre_SRE_Match_span(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *group = NULL;
@@ -1440,7 +1440,7 @@ _sre_SRE_Match_span(MatchObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     group = args[0];
 skip_optional:
-    return_value = _sre_SRE_Match_span_impl(self, group);
+    return_value = _sre_SRE_Match_span_impl((MatchObject *)self, group);
 
 exit:
     return return_value;
@@ -1458,9 +1458,9 @@ static PyObject *
 _sre_SRE_Match___copy___impl(MatchObject *self);
 
 static PyObject *
-_sre_SRE_Match___copy__(MatchObject *self, PyObject *Py_UNUSED(ignored))
+_sre_SRE_Match___copy__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _sre_SRE_Match___copy___impl(self);
+    return _sre_SRE_Match___copy___impl((MatchObject *)self);
 }
 
 PyDoc_STRVAR(_sre_SRE_Match___deepcopy____doc__,
@@ -1483,13 +1483,13 @@ static PyObject *
 _sre_SRE_Scanner_match_impl(ScannerObject *self, PyTypeObject *cls);
 
 static PyObject *
-_sre_SRE_Scanner_match(ScannerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Scanner_match(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "match() takes no arguments");
         return NULL;
     }
-    return _sre_SRE_Scanner_match_impl(self, cls);
+    return _sre_SRE_Scanner_match_impl((ScannerObject *)self, cls);
 }
 
 PyDoc_STRVAR(_sre_SRE_Scanner_search__doc__,
@@ -1504,16 +1504,16 @@ static PyObject *
 _sre_SRE_Scanner_search_impl(ScannerObject *self, PyTypeObject *cls);
 
 static PyObject *
-_sre_SRE_Scanner_search(ScannerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_sre_SRE_Scanner_search(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "search() takes no arguments");
         return NULL;
     }
-    return _sre_SRE_Scanner_search_impl(self, cls);
+    return _sre_SRE_Scanner_search_impl((ScannerObject *)self, cls);
 }
 
 #ifndef _SRE_SRE_PATTERN__FAIL_AFTER_METHODDEF
     #define _SRE_SRE_PATTERN__FAIL_AFTER_METHODDEF
 #endif /* !defined(_SRE_SRE_PATTERN__FAIL_AFTER_METHODDEF) */
-/*[clinic end generated code: output=f8cb77f2261f0b2e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3654103c87eb4830 input=a9049054013a1b77]*/
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index a7d0f509aed3d1..c15a582a92aa4a 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -965,13 +965,13 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
         }
     }
     if (owner && owner != Py_None) {
-        if (_ssl__SSLSocket_owner_set(self, owner, NULL) == -1) {
+        if (_ssl__SSLSocket_owner_set((PyObject *)self, owner, NULL) < 0) {
             Py_DECREF(self);
             return NULL;
         }
     }
     if (session && session != Py_None) {
-        if (_ssl__SSLSocket_session_set(self, session, NULL) == -1) {
+        if (_ssl__SSLSocket_session_set((PyObject *)self, session, NULL) < 0) {
             Py_DECREF(self);
             return NULL;
         }
diff --git a/Modules/_ssl/clinic/cert.c.h b/Modules/_ssl/clinic/cert.c.h
index 19559442cd9b88..3e0c5b405092db 100644
--- a/Modules/_ssl/clinic/cert.c.h
+++ b/Modules/_ssl/clinic/cert.c.h
@@ -20,7 +20,7 @@ static PyObject *
 _ssl_Certificate_public_bytes_impl(PySSLCertificate *self, int format);
 
 static PyObject *
-_ssl_Certificate_public_bytes(PySSLCertificate *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl_Certificate_public_bytes(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -65,7 +65,7 @@ _ssl_Certificate_public_bytes(PySSLCertificate *self, PyObject *const *args, Py_
         goto exit;
     }
 skip_optional_pos:
-    return_value = _ssl_Certificate_public_bytes_impl(self, format);
+    return_value = _ssl_Certificate_public_bytes_impl((PySSLCertificate *)self, format);
 
 exit:
     return return_value;
@@ -83,8 +83,8 @@ static PyObject *
 _ssl_Certificate_get_info_impl(PySSLCertificate *self);
 
 static PyObject *
-_ssl_Certificate_get_info(PySSLCertificate *self, PyObject *Py_UNUSED(ignored))
+_ssl_Certificate_get_info(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _ssl_Certificate_get_info_impl(self);
+    return _ssl_Certificate_get_info_impl((PySSLCertificate *)self);
 }
-/*[clinic end generated code: output=e5fa354db5fc56b4 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=51365b498b975ee0 input=a9049054013a1b77]*/
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index b80c964f20d65e..dda7b63ebcc938 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1557,7 +1557,7 @@ array_array_fromfile_impl(arrayobject *self, PyTypeObject *cls, PyObject *f,
 
     not_enough_bytes = (PyBytes_GET_SIZE(b) != nbytes);
 
-    res = array_array_frombytes(self, b);
+    res = array_array_frombytes((PyObject *)self, b);
     Py_DECREF(b);
     if (res == NULL)
         return NULL;
@@ -2797,8 +2797,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
             else if (initial != NULL && (PyByteArray_Check(initial) ||
                                PyBytes_Check(initial))) {
                 PyObject *v;
-                v = array_array_frombytes((arrayobject *)a,
-                                          initial);
+                v = array_array_frombytes((PyObject *)a, initial);
                 if (v == NULL) {
                     Py_DECREF(a);
                     return NULL;
diff --git a/Modules/cjkcodecs/clinic/multibytecodec.c.h b/Modules/cjkcodecs/clinic/multibytecodec.c.h
index 7e7ea9e0fdfa8e..d77bbd48066354 100644
--- a/Modules/cjkcodecs/clinic/multibytecodec.c.h
+++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h
@@ -28,7 +28,7 @@ _multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self,
                                            const char *errors);
 
 static PyObject *
-_multibytecodec_MultibyteCodec_encode(MultibyteCodecObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteCodec_encode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -89,7 +89,7 @@ _multibytecodec_MultibyteCodec_encode(MultibyteCodecObject *self, PyObject *cons
         goto exit;
     }
 skip_optional_pos:
-    return_value = _multibytecodec_MultibyteCodec_encode_impl(self, input, errors);
+    return_value = _multibytecodec_MultibyteCodec_encode_impl((MultibyteCodecObject *)self, input, errors);
 
 exit:
     return return_value;
@@ -115,7 +115,7 @@ _multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self,
                                            const char *errors);
 
 static PyObject *
-_multibytecodec_MultibyteCodec_decode(MultibyteCodecObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteCodec_decode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -178,7 +178,7 @@ _multibytecodec_MultibyteCodec_decode(MultibyteCodecObject *self, PyObject *cons
         goto exit;
     }
 skip_optional_pos:
-    return_value = _multibytecodec_MultibyteCodec_decode_impl(self, &input, errors);
+    return_value = _multibytecodec_MultibyteCodec_decode_impl((MultibyteCodecObject *)self, &input, errors);
 
 exit:
     /* Cleanup for input */
@@ -203,7 +203,7 @@ _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEnco
                                                         int final);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalEncoder_encode(MultibyteIncrementalEncoderObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteIncrementalEncoder_encode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -250,7 +250,7 @@ _multibytecodec_MultibyteIncrementalEncoder_encode(MultibyteIncrementalEncoderOb
         goto exit;
     }
 skip_optional_pos:
-    return_value = _multibytecodec_MultibyteIncrementalEncoder_encode_impl(self, input, final);
+    return_value = _multibytecodec_MultibyteIncrementalEncoder_encode_impl((MultibyteIncrementalEncoderObject *)self, input, final);
 
 exit:
     return return_value;
@@ -268,9 +268,9 @@ static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_getstate_impl(MultibyteIncrementalEncoderObject *self);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalEncoder_getstate(MultibyteIncrementalEncoderObject *self, PyObject *Py_UNUSED(ignored))
+_multibytecodec_MultibyteIncrementalEncoder_getstate(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multibytecodec_MultibyteIncrementalEncoder_getstate_impl(self);
+    return _multibytecodec_MultibyteIncrementalEncoder_getstate_impl((MultibyteIncrementalEncoderObject *)self);
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_setstate__doc__,
@@ -286,7 +286,7 @@ _multibytecodec_MultibyteIncrementalEncoder_setstate_impl(MultibyteIncrementalEn
                                                           PyLongObject *statelong);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalEncoder_setstate(MultibyteIncrementalEncoderObject *self, PyObject *arg)
+_multibytecodec_MultibyteIncrementalEncoder_setstate(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyLongObject *statelong;
@@ -296,7 +296,7 @@ _multibytecodec_MultibyteIncrementalEncoder_setstate(MultibyteIncrementalEncoder
         goto exit;
     }
     statelong = (PyLongObject *)arg;
-    return_value = _multibytecodec_MultibyteIncrementalEncoder_setstate_impl(self, statelong);
+    return_value = _multibytecodec_MultibyteIncrementalEncoder_setstate_impl((MultibyteIncrementalEncoderObject *)self, statelong);
 
 exit:
     return return_value;
@@ -314,9 +314,9 @@ static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_reset_impl(MultibyteIncrementalEncoderObject *self);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalEncoder_reset(MultibyteIncrementalEncoderObject *self, PyObject *Py_UNUSED(ignored))
+_multibytecodec_MultibyteIncrementalEncoder_reset(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multibytecodec_MultibyteIncrementalEncoder_reset_impl(self);
+    return _multibytecodec_MultibyteIncrementalEncoder_reset_impl((MultibyteIncrementalEncoderObject *)self);
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_decode__doc__,
@@ -333,7 +333,7 @@ _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDeco
                                                         int final);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalDecoder_decode(MultibyteIncrementalDecoderObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteIncrementalDecoder_decode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -382,7 +382,7 @@ _multibytecodec_MultibyteIncrementalDecoder_decode(MultibyteIncrementalDecoderOb
         goto exit;
     }
 skip_optional_pos:
-    return_value = _multibytecodec_MultibyteIncrementalDecoder_decode_impl(self, &input, final);
+    return_value = _multibytecodec_MultibyteIncrementalDecoder_decode_impl((MultibyteIncrementalDecoderObject *)self, &input, final);
 
 exit:
     /* Cleanup for input */
@@ -405,9 +405,9 @@ static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_getstate_impl(MultibyteIncrementalDecoderObject *self);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalDecoder_getstate(MultibyteIncrementalDecoderObject *self, PyObject *Py_UNUSED(ignored))
+_multibytecodec_MultibyteIncrementalDecoder_getstate(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multibytecodec_MultibyteIncrementalDecoder_getstate_impl(self);
+    return _multibytecodec_MultibyteIncrementalDecoder_getstate_impl((MultibyteIncrementalDecoderObject *)self);
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_setstate__doc__,
@@ -423,7 +423,7 @@ _multibytecodec_MultibyteIncrementalDecoder_setstate_impl(MultibyteIncrementalDe
                                                           PyObject *state);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalDecoder_setstate(MultibyteIncrementalDecoderObject *self, PyObject *arg)
+_multibytecodec_MultibyteIncrementalDecoder_setstate(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *state;
@@ -433,7 +433,7 @@ _multibytecodec_MultibyteIncrementalDecoder_setstate(MultibyteIncrementalDecoder
         goto exit;
     }
     state = arg;
-    return_value = _multibytecodec_MultibyteIncrementalDecoder_setstate_impl(self, state);
+    return_value = _multibytecodec_MultibyteIncrementalDecoder_setstate_impl((MultibyteIncrementalDecoderObject *)self, state);
 
 exit:
     return return_value;
@@ -451,9 +451,9 @@ static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_reset_impl(MultibyteIncrementalDecoderObject *self);
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalDecoder_reset(MultibyteIncrementalDecoderObject *self, PyObject *Py_UNUSED(ignored))
+_multibytecodec_MultibyteIncrementalDecoder_reset(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multibytecodec_MultibyteIncrementalDecoder_reset_impl(self);
+    return _multibytecodec_MultibyteIncrementalDecoder_reset_impl((MultibyteIncrementalDecoderObject *)self);
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteStreamReader_read__doc__,
@@ -469,7 +469,7 @@ _multibytecodec_MultibyteStreamReader_read_impl(MultibyteStreamReaderObject *sel
                                                 PyObject *sizeobj);
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_read(MultibyteStreamReaderObject *self, PyObject *const *args, Py_ssize_t nargs)
+_multibytecodec_MultibyteStreamReader_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sizeobj = Py_None;
@@ -482,7 +482,7 @@ _multibytecodec_MultibyteStreamReader_read(MultibyteStreamReaderObject *self, Py
     }
     sizeobj = args[0];
 skip_optional:
-    return_value = _multibytecodec_MultibyteStreamReader_read_impl(self, sizeobj);
+    return_value = _multibytecodec_MultibyteStreamReader_read_impl((MultibyteStreamReaderObject *)self, sizeobj);
 
 exit:
     return return_value;
@@ -501,7 +501,7 @@ _multibytecodec_MultibyteStreamReader_readline_impl(MultibyteStreamReaderObject
                                                     PyObject *sizeobj);
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_readline(MultibyteStreamReaderObject *self, PyObject *const *args, Py_ssize_t nargs)
+_multibytecodec_MultibyteStreamReader_readline(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sizeobj = Py_None;
@@ -514,7 +514,7 @@ _multibytecodec_MultibyteStreamReader_readline(MultibyteStreamReaderObject *self
     }
     sizeobj = args[0];
 skip_optional:
-    return_value = _multibytecodec_MultibyteStreamReader_readline_impl(self, sizeobj);
+    return_value = _multibytecodec_MultibyteStreamReader_readline_impl((MultibyteStreamReaderObject *)self, sizeobj);
 
 exit:
     return return_value;
@@ -533,7 +533,7 @@ _multibytecodec_MultibyteStreamReader_readlines_impl(MultibyteStreamReaderObject
                                                      PyObject *sizehintobj);
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_readlines(MultibyteStreamReaderObject *self, PyObject *const *args, Py_ssize_t nargs)
+_multibytecodec_MultibyteStreamReader_readlines(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sizehintobj = Py_None;
@@ -546,7 +546,7 @@ _multibytecodec_MultibyteStreamReader_readlines(MultibyteStreamReaderObject *sel
     }
     sizehintobj = args[0];
 skip_optional:
-    return_value = _multibytecodec_MultibyteStreamReader_readlines_impl(self, sizehintobj);
+    return_value = _multibytecodec_MultibyteStreamReader_readlines_impl((MultibyteStreamReaderObject *)self, sizehintobj);
 
 exit:
     return return_value;
@@ -564,9 +564,9 @@ static PyObject *
 _multibytecodec_MultibyteStreamReader_reset_impl(MultibyteStreamReaderObject *self);
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_reset(MultibyteStreamReaderObject *self, PyObject *Py_UNUSED(ignored))
+_multibytecodec_MultibyteStreamReader_reset(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _multibytecodec_MultibyteStreamReader_reset_impl(self);
+    return _multibytecodec_MultibyteStreamReader_reset_impl((MultibyteStreamReaderObject *)self);
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteStreamWriter_write__doc__,
@@ -583,7 +583,7 @@ _multibytecodec_MultibyteStreamWriter_write_impl(MultibyteStreamWriterObject *se
                                                  PyObject *strobj);
 
 static PyObject *
-_multibytecodec_MultibyteStreamWriter_write(MultibyteStreamWriterObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteStreamWriter_write(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -608,7 +608,7 @@ _multibytecodec_MultibyteStreamWriter_write(MultibyteStreamWriterObject *self, P
         goto exit;
     }
     strobj = args[0];
-    return_value = _multibytecodec_MultibyteStreamWriter_write_impl(self, cls, strobj);
+    return_value = _multibytecodec_MultibyteStreamWriter_write_impl((MultibyteStreamWriterObject *)self, cls, strobj);
 
 exit:
     return return_value;
@@ -628,7 +628,7 @@ _multibytecodec_MultibyteStreamWriter_writelines_impl(MultibyteStreamWriterObjec
                                                       PyObject *lines);
 
 static PyObject *
-_multibytecodec_MultibyteStreamWriter_writelines(MultibyteStreamWriterObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteStreamWriter_writelines(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -653,7 +653,7 @@ _multibytecodec_MultibyteStreamWriter_writelines(MultibyteStreamWriterObject *se
         goto exit;
     }
     lines = args[0];
-    return_value = _multibytecodec_MultibyteStreamWriter_writelines_impl(self, cls, lines);
+    return_value = _multibytecodec_MultibyteStreamWriter_writelines_impl((MultibyteStreamWriterObject *)self, cls, lines);
 
 exit:
     return return_value;
@@ -672,13 +672,13 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se
                                                  PyTypeObject *cls);
 
 static PyObject *
-_multibytecodec_MultibyteStreamWriter_reset(MultibyteStreamWriterObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_multibytecodec_MultibyteStreamWriter_reset(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "reset() takes no arguments");
         return NULL;
     }
-    return _multibytecodec_MultibyteStreamWriter_reset_impl(self, cls);
+    return _multibytecodec_MultibyteStreamWriter_reset_impl((MultibyteStreamWriterObject *)self, cls);
 }
 
 PyDoc_STRVAR(_multibytecodec___create_codec__doc__,
@@ -688,4 +688,4 @@ PyDoc_STRVAR(_multibytecodec___create_codec__doc__,
 
 #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF    \
     {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
-/*[clinic end generated code: output=60e1fa3a7615c148 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6571941b8e45b013 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h
index 3a37cdd9b5fa83..794585572b13b9 100644
--- a/Modules/clinic/_asynciomodule.c.h
+++ b/Modules/clinic/_asynciomodule.c.h
@@ -97,12 +97,12 @@ static PyObject *
 _asyncio_Future_result_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future_result(FutureObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Future_result(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_result_impl(self);
+    return_value = _asyncio_Future_result_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -126,7 +126,7 @@ static PyObject *
 _asyncio_Future_exception_impl(FutureObj *self, PyTypeObject *cls);
 
 static PyObject *
-_asyncio_Future_exception(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_exception(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
 
@@ -135,7 +135,7 @@ _asyncio_Future_exception(FutureObj *self, PyTypeObject *cls, PyObject *const *a
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_exception_impl(self, cls);
+    return_value = _asyncio_Future_exception_impl((FutureObj *)self, cls);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -159,7 +159,7 @@ _asyncio_Future_set_result_impl(FutureObj *self, PyTypeObject *cls,
                                 PyObject *result);
 
 static PyObject *
-_asyncio_Future_set_result(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_set_result(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -185,7 +185,7 @@ _asyncio_Future_set_result(FutureObj *self, PyTypeObject *cls, PyObject *const *
     }
     result = args[0];
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_set_result_impl(self, cls, result);
+    return_value = _asyncio_Future_set_result_impl((FutureObj *)self, cls, result);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -209,7 +209,7 @@ _asyncio_Future_set_exception_impl(FutureObj *self, PyTypeObject *cls,
                                    PyObject *exception);
 
 static PyObject *
-_asyncio_Future_set_exception(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_set_exception(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -235,7 +235,7 @@ _asyncio_Future_set_exception(FutureObj *self, PyTypeObject *cls, PyObject *cons
     }
     exception = args[0];
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_set_exception_impl(self, cls, exception);
+    return_value = _asyncio_Future_set_exception_impl((FutureObj *)self, cls, exception);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -260,7 +260,7 @@ _asyncio_Future_add_done_callback_impl(FutureObj *self, PyTypeObject *cls,
                                        PyObject *fn, PyObject *context);
 
 static PyObject *
-_asyncio_Future_add_done_callback(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_add_done_callback(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -305,7 +305,7 @@ _asyncio_Future_add_done_callback(FutureObj *self, PyTypeObject *cls, PyObject *
     context = args[1];
 skip_optional_kwonly:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_add_done_callback_impl(self, cls, fn, context);
+    return_value = _asyncio_Future_add_done_callback_impl((FutureObj *)self, cls, fn, context);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -328,7 +328,7 @@ _asyncio_Future_remove_done_callback_impl(FutureObj *self, PyTypeObject *cls,
                                           PyObject *fn);
 
 static PyObject *
-_asyncio_Future_remove_done_callback(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_remove_done_callback(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -354,7 +354,7 @@ _asyncio_Future_remove_done_callback(FutureObj *self, PyTypeObject *cls, PyObjec
     }
     fn = args[0];
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_remove_done_callback_impl(self, cls, fn);
+    return_value = _asyncio_Future_remove_done_callback_impl((FutureObj *)self, cls, fn);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -379,7 +379,7 @@ _asyncio_Future_cancel_impl(FutureObj *self, PyTypeObject *cls,
                             PyObject *msg);
 
 static PyObject *
-_asyncio_Future_cancel(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_cancel(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -422,7 +422,7 @@ _asyncio_Future_cancel(FutureObj *self, PyTypeObject *cls, PyObject *const *args
     msg = args[0];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_cancel_impl(self, cls, msg);
+    return_value = _asyncio_Future_cancel_impl((FutureObj *)self, cls, msg);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -442,12 +442,12 @@ static PyObject *
 _asyncio_Future_cancelled_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future_cancelled(FutureObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Future_cancelled(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_cancelled_impl(self);
+    return_value = _asyncio_Future_cancelled_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -469,12 +469,12 @@ static PyObject *
 _asyncio_Future_done_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future_done(FutureObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Future_done(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_done_impl(self);
+    return_value = _asyncio_Future_done_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -493,7 +493,7 @@ static PyObject *
 _asyncio_Future_get_loop_impl(FutureObj *self, PyTypeObject *cls);
 
 static PyObject *
-_asyncio_Future_get_loop(FutureObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Future_get_loop(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
 
@@ -502,7 +502,7 @@ _asyncio_Future_get_loop(FutureObj *self, PyTypeObject *cls, PyObject *const *ar
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future_get_loop_impl(self, cls);
+    return_value = _asyncio_Future_get_loop_impl((FutureObj *)self, cls);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -523,12 +523,12 @@ static PyObject *
 _asyncio_Future__asyncio_future_blocking_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__asyncio_future_blocking_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__asyncio_future_blocking_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__asyncio_future_blocking_get_impl(self);
+    return_value = _asyncio_Future__asyncio_future_blocking_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -549,12 +549,12 @@ _asyncio_Future__asyncio_future_blocking_set_impl(FutureObj *self,
                                                   PyObject *value);
 
 static int
-_asyncio_Future__asyncio_future_blocking_set(FutureObj *self, PyObject *value, void *Py_UNUSED(context))
+_asyncio_Future__asyncio_future_blocking_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__asyncio_future_blocking_set_impl(self, value);
+    return_value = _asyncio_Future__asyncio_future_blocking_set_impl((FutureObj *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -574,12 +574,12 @@ static PyObject *
 _asyncio_Future__log_traceback_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__log_traceback_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__log_traceback_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__log_traceback_get_impl(self);
+    return_value = _asyncio_Future__log_traceback_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -599,12 +599,12 @@ static int
 _asyncio_Future__log_traceback_set_impl(FutureObj *self, PyObject *value);
 
 static int
-_asyncio_Future__log_traceback_set(FutureObj *self, PyObject *value, void *Py_UNUSED(context))
+_asyncio_Future__log_traceback_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__log_traceback_set_impl(self, value);
+    return_value = _asyncio_Future__log_traceback_set_impl((FutureObj *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -624,12 +624,12 @@ static PyObject *
 _asyncio_Future__loop_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__loop_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__loop_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__loop_get_impl(self);
+    return_value = _asyncio_Future__loop_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -649,12 +649,12 @@ static PyObject *
 _asyncio_Future__callbacks_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__callbacks_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__callbacks_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__callbacks_get_impl(self);
+    return_value = _asyncio_Future__callbacks_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -674,12 +674,12 @@ static PyObject *
 _asyncio_Future__result_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__result_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__result_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__result_get_impl(self);
+    return_value = _asyncio_Future__result_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -699,12 +699,12 @@ static PyObject *
 _asyncio_Future__exception_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__exception_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__exception_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__exception_get_impl(self);
+    return_value = _asyncio_Future__exception_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -724,12 +724,12 @@ static PyObject *
 _asyncio_Future__source_traceback_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__source_traceback_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__source_traceback_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__source_traceback_get_impl(self);
+    return_value = _asyncio_Future__source_traceback_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -749,12 +749,12 @@ static PyObject *
 _asyncio_Future__cancel_message_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__cancel_message_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__cancel_message_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__cancel_message_get_impl(self);
+    return_value = _asyncio_Future__cancel_message_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -774,12 +774,12 @@ static int
 _asyncio_Future__cancel_message_set_impl(FutureObj *self, PyObject *value);
 
 static int
-_asyncio_Future__cancel_message_set(FutureObj *self, PyObject *value, void *Py_UNUSED(context))
+_asyncio_Future__cancel_message_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__cancel_message_set_impl(self, value);
+    return_value = _asyncio_Future__cancel_message_set_impl((FutureObj *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -799,12 +799,12 @@ static PyObject *
 _asyncio_Future__state_get_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__state_get(FutureObj *self, void *Py_UNUSED(context))
+_asyncio_Future__state_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__state_get_impl(self);
+    return_value = _asyncio_Future__state_get_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -826,12 +826,12 @@ static PyObject *
 _asyncio_Future__make_cancelled_error_impl(FutureObj *self);
 
 static PyObject *
-_asyncio_Future__make_cancelled_error(FutureObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Future__make_cancelled_error(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Future__make_cancelled_error_impl(self);
+    return_value = _asyncio_Future__make_cancelled_error_impl((FutureObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -939,12 +939,12 @@ static PyObject *
 _asyncio_Task__log_destroy_pending_get_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task__log_destroy_pending_get(TaskObj *self, void *Py_UNUSED(context))
+_asyncio_Task__log_destroy_pending_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task__log_destroy_pending_get_impl(self);
+    return_value = _asyncio_Task__log_destroy_pending_get_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -964,12 +964,12 @@ static int
 _asyncio_Task__log_destroy_pending_set_impl(TaskObj *self, PyObject *value);
 
 static int
-_asyncio_Task__log_destroy_pending_set(TaskObj *self, PyObject *value, void *Py_UNUSED(context))
+_asyncio_Task__log_destroy_pending_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task__log_destroy_pending_set_impl(self, value);
+    return_value = _asyncio_Task__log_destroy_pending_set_impl((TaskObj *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -989,12 +989,12 @@ static PyObject *
 _asyncio_Task__must_cancel_get_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task__must_cancel_get(TaskObj *self, void *Py_UNUSED(context))
+_asyncio_Task__must_cancel_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task__must_cancel_get_impl(self);
+    return_value = _asyncio_Task__must_cancel_get_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1014,12 +1014,12 @@ static PyObject *
 _asyncio_Task__coro_get_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task__coro_get(TaskObj *self, void *Py_UNUSED(context))
+_asyncio_Task__coro_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task__coro_get_impl(self);
+    return_value = _asyncio_Task__coro_get_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1039,12 +1039,12 @@ static PyObject *
 _asyncio_Task__fut_waiter_get_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task__fut_waiter_get(TaskObj *self, void *Py_UNUSED(context))
+_asyncio_Task__fut_waiter_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task__fut_waiter_get_impl(self);
+    return_value = _asyncio_Task__fut_waiter_get_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1066,12 +1066,12 @@ static PyObject *
 _asyncio_Task__make_cancelled_error_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task__make_cancelled_error(TaskObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Task__make_cancelled_error(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task__make_cancelled_error_impl(self);
+    return_value = _asyncio_Task__make_cancelled_error_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1109,7 +1109,7 @@ static PyObject *
 _asyncio_Task_cancel_impl(TaskObj *self, PyObject *msg);
 
 static PyObject *
-_asyncio_Task_cancel(TaskObj *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Task_cancel(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1152,7 +1152,7 @@ _asyncio_Task_cancel(TaskObj *self, PyObject *const *args, Py_ssize_t nargs, PyO
     msg = args[0];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task_cancel_impl(self, msg);
+    return_value = _asyncio_Task_cancel_impl((TaskObj *)self, msg);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1175,12 +1175,12 @@ static PyObject *
 _asyncio_Task_cancelling_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task_cancelling(TaskObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Task_cancelling(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task_cancelling_impl(self);
+    return_value = _asyncio_Task_cancelling_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1204,12 +1204,12 @@ static PyObject *
 _asyncio_Task_uncancel_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task_uncancel(TaskObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Task_uncancel(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task_uncancel_impl(self);
+    return_value = _asyncio_Task_uncancel_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1247,7 +1247,7 @@ _asyncio_Task_get_stack_impl(TaskObj *self, PyTypeObject *cls,
                              PyObject *limit);
 
 static PyObject *
-_asyncio_Task_get_stack(TaskObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Task_get_stack(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1289,7 +1289,7 @@ _asyncio_Task_get_stack(TaskObj *self, PyTypeObject *cls, PyObject *const *args,
     }
     limit = args[0];
 skip_optional_kwonly:
-    return_value = _asyncio_Task_get_stack_impl(self, cls, limit);
+    return_value = _asyncio_Task_get_stack_impl((TaskObj *)self, cls, limit);
 
 exit:
     return return_value;
@@ -1315,7 +1315,7 @@ _asyncio_Task_print_stack_impl(TaskObj *self, PyTypeObject *cls,
                                PyObject *limit, PyObject *file);
 
 static PyObject *
-_asyncio_Task_print_stack(TaskObj *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_asyncio_Task_print_stack(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1364,7 +1364,7 @@ _asyncio_Task_print_stack(TaskObj *self, PyTypeObject *cls, PyObject *const *arg
     }
     file = args[1];
 skip_optional_kwonly:
-    return_value = _asyncio_Task_print_stack_impl(self, cls, limit, file);
+    return_value = _asyncio_Task_print_stack_impl((TaskObj *)self, cls, limit, file);
 
 exit:
     return return_value;
@@ -1398,12 +1398,12 @@ static PyObject *
 _asyncio_Task_get_coro_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task_get_coro(TaskObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Task_get_coro(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task_get_coro_impl(self);
+    return_value = _asyncio_Task_get_coro_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1421,9 +1421,9 @@ static PyObject *
 _asyncio_Task_get_context_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task_get_context(TaskObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Task_get_context(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _asyncio_Task_get_context_impl(self);
+    return _asyncio_Task_get_context_impl((TaskObj *)self);
 }
 
 PyDoc_STRVAR(_asyncio_Task_get_name__doc__,
@@ -1438,12 +1438,12 @@ static PyObject *
 _asyncio_Task_get_name_impl(TaskObj *self);
 
 static PyObject *
-_asyncio_Task_get_name(TaskObj *self, PyObject *Py_UNUSED(ignored))
+_asyncio_Task_get_name(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task_get_name_impl(self);
+    return_value = _asyncio_Task_get_name_impl((TaskObj *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1466,7 +1466,7 @@ _asyncio_Task_set_name(TaskObj *self, PyObject *value)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _asyncio_Task_set_name_impl(self, value);
+    return_value = _asyncio_Task_set_name_impl((TaskObj *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2088,4 +2088,4 @@ _asyncio_all_tasks(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=408e156476ced07f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ec2fa1d60b094978 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h
index 93988bf48a1b00..a599bd1a8be96a 100644
--- a/Modules/clinic/_bz2module.c.h
+++ b/Modules/clinic/_bz2module.c.h
@@ -27,7 +27,7 @@ static PyObject *
 _bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data);
 
 static PyObject *
-_bz2_BZ2Compressor_compress(BZ2Compressor *self, PyObject *arg)
+_bz2_BZ2Compressor_compress(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer data = {NULL, NULL};
@@ -35,7 +35,7 @@ _bz2_BZ2Compressor_compress(BZ2Compressor *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &data, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _bz2_BZ2Compressor_compress_impl(self, &data);
+    return_value = _bz2_BZ2Compressor_compress_impl((BZ2Compressor *)self, &data);
 
 exit:
     /* Cleanup for data */
@@ -63,9 +63,9 @@ static PyObject *
 _bz2_BZ2Compressor_flush_impl(BZ2Compressor *self);
 
 static PyObject *
-_bz2_BZ2Compressor_flush(BZ2Compressor *self, PyObject *Py_UNUSED(ignored))
+_bz2_BZ2Compressor_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _bz2_BZ2Compressor_flush_impl(self);
+    return _bz2_BZ2Compressor_flush_impl((BZ2Compressor *)self);
 }
 
 PyDoc_STRVAR(_bz2_BZ2Compressor__doc__,
@@ -137,7 +137,7 @@ _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
                                      Py_ssize_t max_length);
 
 static PyObject *
-_bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_bz2_BZ2Decompressor_decompress(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -194,7 +194,7 @@ _bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject *const *args, Py
         max_length = ival;
     }
 skip_optional_pos:
-    return_value = _bz2_BZ2Decompressor_decompress_impl(self, &data, max_length);
+    return_value = _bz2_BZ2Decompressor_decompress_impl((BZ2Decompressor *)self, &data, max_length);
 
 exit:
     /* Cleanup for data */
@@ -235,4 +235,4 @@ _bz2_BZ2Decompressor(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=701a383434374c36 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0fc5a6292c5fd2c5 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_collectionsmodule.c.h b/Modules/clinic/_collectionsmodule.c.h
index b4e3325e89502b..ddf18c2c77a8cd 100644
--- a/Modules/clinic/_collectionsmodule.c.h
+++ b/Modules/clinic/_collectionsmodule.c.h
@@ -23,12 +23,12 @@ static PyObject *
 deque_pop_impl(dequeobject *deque);
 
 static PyObject *
-deque_pop(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque_pop(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_pop_impl(deque);
+    return_value = deque_pop_impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -47,12 +47,12 @@ static PyObject *
 deque_popleft_impl(dequeobject *deque);
 
 static PyObject *
-deque_popleft(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque_popleft(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_popleft_impl(deque);
+    return_value = deque_popleft_impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -76,7 +76,7 @@ deque_append(dequeobject *deque, PyObject *item)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_append_impl(deque, item);
+    return_value = deque_append_impl((dequeobject *)deque, item);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -100,7 +100,7 @@ deque_appendleft(dequeobject *deque, PyObject *item)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_appendleft_impl(deque, item);
+    return_value = deque_appendleft_impl((dequeobject *)deque, item);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -124,7 +124,7 @@ deque_extend(dequeobject *deque, PyObject *iterable)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_extend_impl(deque, iterable);
+    return_value = deque_extend_impl((dequeobject *)deque, iterable);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -148,7 +148,7 @@ deque_extendleft(dequeobject *deque, PyObject *iterable)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_extendleft_impl(deque, iterable);
+    return_value = deque_extendleft_impl((dequeobject *)deque, iterable);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -167,12 +167,12 @@ static PyObject *
 deque_copy_impl(dequeobject *deque);
 
 static PyObject *
-deque_copy(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque_copy(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_copy_impl(deque);
+    return_value = deque_copy_impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -191,12 +191,12 @@ static PyObject *
 deque___copy___impl(dequeobject *deque);
 
 static PyObject *
-deque___copy__(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque___copy__(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque___copy___impl(deque);
+    return_value = deque___copy___impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -215,12 +215,12 @@ static PyObject *
 deque_clearmethod_impl(dequeobject *deque);
 
 static PyObject *
-deque_clearmethod(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque_clearmethod(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_clearmethod_impl(deque);
+    return_value = deque_clearmethod_impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -239,7 +239,7 @@ static PyObject *
 deque_rotate_impl(dequeobject *deque, Py_ssize_t n);
 
 static PyObject *
-deque_rotate(dequeobject *deque, PyObject *const *args, Py_ssize_t nargs)
+deque_rotate(PyObject *deque, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t n = 1;
@@ -264,7 +264,7 @@ deque_rotate(dequeobject *deque, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_rotate_impl(deque, n);
+    return_value = deque_rotate_impl((dequeobject *)deque, n);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -284,12 +284,12 @@ static PyObject *
 deque_reverse_impl(dequeobject *deque);
 
 static PyObject *
-deque_reverse(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque_reverse(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_reverse_impl(deque);
+    return_value = deque_reverse_impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -313,7 +313,7 @@ deque_count(dequeobject *deque, PyObject *v)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_count_impl(deque, v);
+    return_value = deque_count_impl((dequeobject *)deque, v);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -335,7 +335,7 @@ deque_index_impl(dequeobject *deque, PyObject *v, Py_ssize_t start,
                  Py_ssize_t stop);
 
 static PyObject *
-deque_index(dequeobject *deque, PyObject *const *args, Py_ssize_t nargs)
+deque_index(PyObject *deque, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *v;
@@ -360,7 +360,7 @@ deque_index(dequeobject *deque, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_index_impl(deque, v, start, stop);
+    return_value = deque_index_impl((dequeobject *)deque, v, start, stop);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -380,7 +380,7 @@ static PyObject *
 deque_insert_impl(dequeobject *deque, Py_ssize_t index, PyObject *value);
 
 static PyObject *
-deque_insert(dequeobject *deque, PyObject *const *args, Py_ssize_t nargs)
+deque_insert(PyObject *deque, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t index;
@@ -403,7 +403,7 @@ deque_insert(dequeobject *deque, PyObject *const *args, Py_ssize_t nargs)
     }
     value = args[1];
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_insert_impl(deque, index, value);
+    return_value = deque_insert_impl((dequeobject *)deque, index, value);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -428,7 +428,7 @@ deque_remove(dequeobject *deque, PyObject *value)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque_remove_impl(deque, value);
+    return_value = deque_remove_impl((dequeobject *)deque, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -447,9 +447,9 @@ static PyObject *
 deque___reduce___impl(dequeobject *deque);
 
 static PyObject *
-deque___reduce__(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque___reduce__(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
-    return deque___reduce___impl(deque);
+    return deque___reduce___impl((dequeobject *)deque);
 }
 
 PyDoc_STRVAR(deque_init__doc__,
@@ -534,12 +534,12 @@ static PyObject *
 deque___sizeof___impl(dequeobject *deque);
 
 static PyObject *
-deque___sizeof__(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque___sizeof__(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(deque);
-    return_value = deque___sizeof___impl(deque);
+    return_value = deque___sizeof___impl((dequeobject *)deque);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -558,9 +558,9 @@ static PyObject *
 deque___reversed___impl(dequeobject *deque);
 
 static PyObject *
-deque___reversed__(dequeobject *deque, PyObject *Py_UNUSED(ignored))
+deque___reversed__(PyObject *deque, PyObject *Py_UNUSED(ignored))
 {
-    return deque___reversed___impl(deque);
+    return deque___reversed___impl((dequeobject *)deque);
 }
 
 PyDoc_STRVAR(_collections__count_elements__doc__,
@@ -630,4 +630,4 @@ tuplegetter_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=65f896fb13902f6d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2d89c39288fc7389 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_curses_panel.c.h b/Modules/clinic/_curses_panel.c.h
index b6bff5274a3a91..6f4966825ec4bf 100644
--- a/Modules/clinic/_curses_panel.c.h
+++ b/Modules/clinic/_curses_panel.c.h
@@ -20,13 +20,13 @@ static PyObject *
 _curses_panel_panel_bottom_impl(PyCursesPanelObject *self, PyTypeObject *cls);
 
 static PyObject *
-_curses_panel_panel_bottom(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_bottom(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "bottom() takes no arguments");
         return NULL;
     }
-    return _curses_panel_panel_bottom_impl(self, cls);
+    return _curses_panel_panel_bottom_impl((PyCursesPanelObject *)self, cls);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_hide__doc__,
@@ -44,13 +44,13 @@ static PyObject *
 _curses_panel_panel_hide_impl(PyCursesPanelObject *self, PyTypeObject *cls);
 
 static PyObject *
-_curses_panel_panel_hide(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_hide(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "hide() takes no arguments");
         return NULL;
     }
-    return _curses_panel_panel_hide_impl(self, cls);
+    return _curses_panel_panel_hide_impl((PyCursesPanelObject *)self, cls);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_show__doc__,
@@ -66,13 +66,13 @@ static PyObject *
 _curses_panel_panel_show_impl(PyCursesPanelObject *self, PyTypeObject *cls);
 
 static PyObject *
-_curses_panel_panel_show(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_show(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "show() takes no arguments");
         return NULL;
     }
-    return _curses_panel_panel_show_impl(self, cls);
+    return _curses_panel_panel_show_impl((PyCursesPanelObject *)self, cls);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_top__doc__,
@@ -88,13 +88,13 @@ static PyObject *
 _curses_panel_panel_top_impl(PyCursesPanelObject *self, PyTypeObject *cls);
 
 static PyObject *
-_curses_panel_panel_top(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_top(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "top() takes no arguments");
         return NULL;
     }
-    return _curses_panel_panel_top_impl(self, cls);
+    return _curses_panel_panel_top_impl((PyCursesPanelObject *)self, cls);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_above__doc__,
@@ -110,9 +110,9 @@ static PyObject *
 _curses_panel_panel_above_impl(PyCursesPanelObject *self);
 
 static PyObject *
-_curses_panel_panel_above(PyCursesPanelObject *self, PyObject *Py_UNUSED(ignored))
+_curses_panel_panel_above(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _curses_panel_panel_above_impl(self);
+    return _curses_panel_panel_above_impl((PyCursesPanelObject *)self);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_below__doc__,
@@ -128,9 +128,9 @@ static PyObject *
 _curses_panel_panel_below_impl(PyCursesPanelObject *self);
 
 static PyObject *
-_curses_panel_panel_below(PyCursesPanelObject *self, PyObject *Py_UNUSED(ignored))
+_curses_panel_panel_below(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _curses_panel_panel_below_impl(self);
+    return _curses_panel_panel_below_impl((PyCursesPanelObject *)self);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_hidden__doc__,
@@ -146,9 +146,9 @@ static PyObject *
 _curses_panel_panel_hidden_impl(PyCursesPanelObject *self);
 
 static PyObject *
-_curses_panel_panel_hidden(PyCursesPanelObject *self, PyObject *Py_UNUSED(ignored))
+_curses_panel_panel_hidden(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _curses_panel_panel_hidden_impl(self);
+    return _curses_panel_panel_hidden_impl((PyCursesPanelObject *)self);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_move__doc__,
@@ -165,7 +165,7 @@ _curses_panel_panel_move_impl(PyCursesPanelObject *self, PyTypeObject *cls,
                               int y, int x);
 
 static PyObject *
-_curses_panel_panel_move(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_move(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -198,7 +198,7 @@ _curses_panel_panel_move(PyCursesPanelObject *self, PyTypeObject *cls, PyObject
     if (x == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_panel_panel_move_impl(self, cls, y, x);
+    return_value = _curses_panel_panel_move_impl((PyCursesPanelObject *)self, cls, y, x);
 
 exit:
     return return_value;
@@ -217,9 +217,9 @@ static PyObject *
 _curses_panel_panel_window_impl(PyCursesPanelObject *self);
 
 static PyObject *
-_curses_panel_panel_window(PyCursesPanelObject *self, PyObject *Py_UNUSED(ignored))
+_curses_panel_panel_window(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _curses_panel_panel_window_impl(self);
+    return _curses_panel_panel_window_impl((PyCursesPanelObject *)self);
 }
 
 PyDoc_STRVAR(_curses_panel_panel_replace__doc__,
@@ -237,7 +237,7 @@ _curses_panel_panel_replace_impl(PyCursesPanelObject *self,
                                  PyCursesWindowObject *win);
 
 static PyObject *
-_curses_panel_panel_replace(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_replace(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -266,7 +266,7 @@ _curses_panel_panel_replace(PyCursesPanelObject *self, PyTypeObject *cls, PyObje
         goto exit;
     }
     win = (PyCursesWindowObject *)args[0];
-    return_value = _curses_panel_panel_replace_impl(self, cls, win);
+    return_value = _curses_panel_panel_replace_impl((PyCursesPanelObject *)self, cls, win);
 
 exit:
     return return_value;
@@ -286,7 +286,7 @@ _curses_panel_panel_set_userptr_impl(PyCursesPanelObject *self,
                                      PyTypeObject *cls, PyObject *obj);
 
 static PyObject *
-_curses_panel_panel_set_userptr(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_set_userptr(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -311,7 +311,7 @@ _curses_panel_panel_set_userptr(PyCursesPanelObject *self, PyTypeObject *cls, Py
         goto exit;
     }
     obj = args[0];
-    return_value = _curses_panel_panel_set_userptr_impl(self, cls, obj);
+    return_value = _curses_panel_panel_set_userptr_impl((PyCursesPanelObject *)self, cls, obj);
 
 exit:
     return return_value;
@@ -331,13 +331,13 @@ _curses_panel_panel_userptr_impl(PyCursesPanelObject *self,
                                  PyTypeObject *cls);
 
 static PyObject *
-_curses_panel_panel_userptr(PyCursesPanelObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_curses_panel_panel_userptr(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "userptr() takes no arguments");
         return NULL;
     }
-    return _curses_panel_panel_userptr_impl(self, cls);
+    return _curses_panel_panel_userptr_impl((PyCursesPanelObject *)self, cls);
 }
 
 PyDoc_STRVAR(_curses_panel_bottom_panel__doc__,
@@ -424,4 +424,4 @@ _curses_panel_update_panels(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return _curses_panel_update_panels_impl(module);
 }
-/*[clinic end generated code: output=298e49d54c0b14a0 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=36853ecb4a979814 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h
index 524a114aba98bc..8291d5d635c79d 100644
--- a/Modules/clinic/_cursesmodule.c.h
+++ b/Modules/clinic/_cursesmodule.c.h
@@ -35,7 +35,7 @@ _curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1,
                           long attr);
 
 static PyObject *
-_curses_window_addch(PyCursesWindowObject *self, PyObject *args)
+_curses_window_addch(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -74,7 +74,7 @@ _curses_window_addch(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.addch requires 1 to 4 arguments");
             goto exit;
     }
-    return_value = _curses_window_addch_impl(self, group_left_1, y, x, ch, group_right_1, attr);
+    return_value = _curses_window_addch_impl((PyCursesWindowObject *)self, group_left_1, y, x, ch, group_right_1, attr);
 
 exit:
     return return_value;
@@ -107,7 +107,7 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
                            long attr);
 
 static PyObject *
-_curses_window_addstr(PyCursesWindowObject *self, PyObject *args)
+_curses_window_addstr(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -146,7 +146,7 @@ _curses_window_addstr(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.addstr requires 1 to 4 arguments");
             goto exit;
     }
-    return_value = _curses_window_addstr_impl(self, group_left_1, y, x, str, group_right_1, attr);
+    return_value = _curses_window_addstr_impl((PyCursesWindowObject *)self, group_left_1, y, x, str, group_right_1, attr);
 
 exit:
     return return_value;
@@ -181,7 +181,7 @@ _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,
                             int group_right_1, long attr);
 
 static PyObject *
-_curses_window_addnstr(PyCursesWindowObject *self, PyObject *args)
+_curses_window_addnstr(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -221,7 +221,7 @@ _curses_window_addnstr(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.addnstr requires 2 to 5 arguments");
             goto exit;
     }
-    return_value = _curses_window_addnstr_impl(self, group_left_1, y, x, str, n, group_right_1, attr);
+    return_value = _curses_window_addnstr_impl((PyCursesWindowObject *)self, group_left_1, y, x, str, n, group_right_1, attr);
 
 exit:
     return return_value;
@@ -245,7 +245,7 @@ static PyObject *
 _curses_window_bkgd_impl(PyCursesWindowObject *self, PyObject *ch, long attr);
 
 static PyObject *
-_curses_window_bkgd(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_bkgd(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *ch;
@@ -263,7 +263,7 @@ _curses_window_bkgd(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_
         goto exit;
     }
 skip_optional:
-    return_value = _curses_window_bkgd_impl(self, ch, attr);
+    return_value = _curses_window_bkgd_impl((PyCursesWindowObject *)self, ch, attr);
 
 exit:
     return return_value;
@@ -282,7 +282,7 @@ static PyObject *
 _curses_window_attroff_impl(PyCursesWindowObject *self, long attr);
 
 static PyObject *
-_curses_window_attroff(PyCursesWindowObject *self, PyObject *arg)
+_curses_window_attroff(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     long attr;
@@ -291,7 +291,7 @@ _curses_window_attroff(PyCursesWindowObject *self, PyObject *arg)
     if (attr == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_attroff_impl(self, attr);
+    return_value = _curses_window_attroff_impl((PyCursesWindowObject *)self, attr);
 
 exit:
     return return_value;
@@ -310,7 +310,7 @@ static PyObject *
 _curses_window_attron_impl(PyCursesWindowObject *self, long attr);
 
 static PyObject *
-_curses_window_attron(PyCursesWindowObject *self, PyObject *arg)
+_curses_window_attron(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     long attr;
@@ -319,7 +319,7 @@ _curses_window_attron(PyCursesWindowObject *self, PyObject *arg)
     if (attr == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_attron_impl(self, attr);
+    return_value = _curses_window_attron_impl((PyCursesWindowObject *)self, attr);
 
 exit:
     return return_value;
@@ -338,7 +338,7 @@ static PyObject *
 _curses_window_attrset_impl(PyCursesWindowObject *self, long attr);
 
 static PyObject *
-_curses_window_attrset(PyCursesWindowObject *self, PyObject *arg)
+_curses_window_attrset(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     long attr;
@@ -347,7 +347,7 @@ _curses_window_attrset(PyCursesWindowObject *self, PyObject *arg)
     if (attr == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_attrset_impl(self, attr);
+    return_value = _curses_window_attrset_impl((PyCursesWindowObject *)self, attr);
 
 exit:
     return return_value;
@@ -372,7 +372,7 @@ _curses_window_bkgdset_impl(PyCursesWindowObject *self, PyObject *ch,
                             long attr);
 
 static PyObject *
-_curses_window_bkgdset(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_bkgdset(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *ch;
@@ -390,7 +390,7 @@ _curses_window_bkgdset(PyCursesWindowObject *self, PyObject *const *args, Py_ssi
         goto exit;
     }
 skip_optional:
-    return_value = _curses_window_bkgdset_impl(self, ch, attr);
+    return_value = _curses_window_bkgdset_impl((PyCursesWindowObject *)self, ch, attr);
 
 exit:
     return return_value;
@@ -437,7 +437,7 @@ _curses_window_border_impl(PyCursesWindowObject *self, PyObject *ls,
                            PyObject *br);
 
 static PyObject *
-_curses_window_border(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_border(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *ls = NULL;
@@ -485,7 +485,7 @@ _curses_window_border(PyCursesWindowObject *self, PyObject *const *args, Py_ssiz
     }
     br = args[7];
 skip_optional:
-    return_value = _curses_window_border_impl(self, ls, rs, ts, bs, tl, tr, bl, br);
+    return_value = _curses_window_border_impl((PyCursesWindowObject *)self, ls, rs, ts, bs, tl, tr, bl, br);
 
 exit:
     return return_value;
@@ -511,7 +511,7 @@ _curses_window_box_impl(PyCursesWindowObject *self, int group_right_1,
                         PyObject *verch, PyObject *horch);
 
 static PyObject *
-_curses_window_box(PyCursesWindowObject *self, PyObject *args)
+_curses_window_box(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -531,7 +531,7 @@ _curses_window_box(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.box requires 0 to 2 arguments");
             goto exit;
     }
-    return_value = _curses_window_box_impl(self, group_right_1, verch, horch);
+    return_value = _curses_window_box_impl((PyCursesWindowObject *)self, group_right_1, verch, horch);
 
 exit:
     return return_value;
@@ -554,7 +554,7 @@ _curses_window_delch_impl(PyCursesWindowObject *self, int group_right_1,
                           int y, int x);
 
 static PyObject *
-_curses_window_delch(PyCursesWindowObject *self, PyObject *args)
+_curses_window_delch(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -574,7 +574,7 @@ _curses_window_delch(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.delch requires 0 to 2 arguments");
             goto exit;
     }
-    return_value = _curses_window_delch_impl(self, group_right_1, y, x);
+    return_value = _curses_window_delch_impl((PyCursesWindowObject *)self, group_right_1, y, x);
 
 exit:
     return return_value;
@@ -605,7 +605,7 @@ _curses_window_derwin_impl(PyCursesWindowObject *self, int group_left_1,
                            int nlines, int ncols, int begin_y, int begin_x);
 
 static PyObject *
-_curses_window_derwin(PyCursesWindowObject *self, PyObject *args)
+_curses_window_derwin(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -630,7 +630,7 @@ _curses_window_derwin(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.derwin requires 2 to 4 arguments");
             goto exit;
     }
-    return_value = _curses_window_derwin_impl(self, group_left_1, nlines, ncols, begin_y, begin_x);
+    return_value = _curses_window_derwin_impl((PyCursesWindowObject *)self, group_left_1, nlines, ncols, begin_y, begin_x);
 
 exit:
     return return_value;
@@ -655,7 +655,7 @@ _curses_window_echochar_impl(PyCursesWindowObject *self, PyObject *ch,
                              long attr);
 
 static PyObject *
-_curses_window_echochar(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_echochar(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *ch;
@@ -673,7 +673,7 @@ _curses_window_echochar(PyCursesWindowObject *self, PyObject *const *args, Py_ss
         goto exit;
     }
 skip_optional:
-    return_value = _curses_window_echochar_impl(self, ch, attr);
+    return_value = _curses_window_echochar_impl((PyCursesWindowObject *)self, ch, attr);
 
 exit:
     return return_value;
@@ -699,7 +699,7 @@ static PyObject *
 _curses_window_enclose_impl(PyCursesWindowObject *self, int y, int x);
 
 static PyObject *
-_curses_window_enclose(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_enclose(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int y;
@@ -716,7 +716,7 @@ _curses_window_enclose(PyCursesWindowObject *self, PyObject *const *args, Py_ssi
     if (x == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_enclose_impl(self, y, x);
+    return_value = _curses_window_enclose_impl((PyCursesWindowObject *)self, y, x);
 
 exit:
     return return_value;
@@ -737,12 +737,12 @@ static long
 _curses_window_getbkgd_impl(PyCursesWindowObject *self);
 
 static PyObject *
-_curses_window_getbkgd(PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored))
+_curses_window_getbkgd(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     long _return_value;
 
-    _return_value = _curses_window_getbkgd_impl(self);
+    _return_value = _curses_window_getbkgd_impl((PyCursesWindowObject *)self);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -773,7 +773,7 @@ _curses_window_getch_impl(PyCursesWindowObject *self, int group_right_1,
                           int y, int x);
 
 static PyObject *
-_curses_window_getch(PyCursesWindowObject *self, PyObject *args)
+_curses_window_getch(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -794,7 +794,7 @@ _curses_window_getch(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.getch requires 0 to 2 arguments");
             goto exit;
     }
-    _return_value = _curses_window_getch_impl(self, group_right_1, y, x);
+    _return_value = _curses_window_getch_impl((PyCursesWindowObject *)self, group_right_1, y, x);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -825,7 +825,7 @@ _curses_window_getkey_impl(PyCursesWindowObject *self, int group_right_1,
                            int y, int x);
 
 static PyObject *
-_curses_window_getkey(PyCursesWindowObject *self, PyObject *args)
+_curses_window_getkey(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -845,7 +845,7 @@ _curses_window_getkey(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.getkey requires 0 to 2 arguments");
             goto exit;
     }
-    return_value = _curses_window_getkey_impl(self, group_right_1, y, x);
+    return_value = _curses_window_getkey_impl((PyCursesWindowObject *)self, group_right_1, y, x);
 
 exit:
     return return_value;
@@ -873,7 +873,7 @@ _curses_window_get_wch_impl(PyCursesWindowObject *self, int group_right_1,
                             int y, int x);
 
 static PyObject *
-_curses_window_get_wch(PyCursesWindowObject *self, PyObject *args)
+_curses_window_get_wch(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -893,7 +893,7 @@ _curses_window_get_wch(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.get_wch requires 0 to 2 arguments");
             goto exit;
     }
-    return_value = _curses_window_get_wch_impl(self, group_right_1, y, x);
+    return_value = _curses_window_get_wch_impl((PyCursesWindowObject *)self, group_right_1, y, x);
 
 exit:
     return return_value;
@@ -925,7 +925,7 @@ _curses_window_hline_impl(PyCursesWindowObject *self, int group_left_1,
                           int group_right_1, long attr);
 
 static PyObject *
-_curses_window_hline(PyCursesWindowObject *self, PyObject *args)
+_curses_window_hline(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -965,7 +965,7 @@ _curses_window_hline(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.hline requires 2 to 5 arguments");
             goto exit;
     }
-    return_value = _curses_window_hline_impl(self, group_left_1, y, x, ch, n, group_right_1, attr);
+    return_value = _curses_window_hline_impl((PyCursesWindowObject *)self, group_left_1, y, x, ch, n, group_right_1, attr);
 
 exit:
     return return_value;
@@ -996,7 +996,7 @@ _curses_window_insch_impl(PyCursesWindowObject *self, int group_left_1,
                           long attr);
 
 static PyObject *
-_curses_window_insch(PyCursesWindowObject *self, PyObject *args)
+_curses_window_insch(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -1035,7 +1035,7 @@ _curses_window_insch(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.insch requires 1 to 4 arguments");
             goto exit;
     }
-    return_value = _curses_window_insch_impl(self, group_left_1, y, x, ch, group_right_1, attr);
+    return_value = _curses_window_insch_impl((PyCursesWindowObject *)self, group_left_1, y, x, ch, group_right_1, attr);
 
 exit:
     return return_value;
@@ -1060,7 +1060,7 @@ _curses_window_inch_impl(PyCursesWindowObject *self, int group_right_1,
                          int y, int x);
 
 static PyObject *
-_curses_window_inch(PyCursesWindowObject *self, PyObject *args)
+_curses_window_inch(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -1081,7 +1081,7 @@ _curses_window_inch(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.inch requires 0 to 2 arguments");
             goto exit;
     }
-    _return_value = _curses_window_inch_impl(self, group_right_1, y, x);
+    _return_value = _curses_window_inch_impl((PyCursesWindowObject *)self, group_right_1, y, x);
     if ((_return_value == (unsigned long)-1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -1119,7 +1119,7 @@ _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,
                            long attr);
 
 static PyObject *
-_curses_window_insstr(PyCursesWindowObject *self, PyObject *args)
+_curses_window_insstr(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -1158,7 +1158,7 @@ _curses_window_insstr(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.insstr requires 1 to 4 arguments");
             goto exit;
     }
-    return_value = _curses_window_insstr_impl(self, group_left_1, y, x, str, group_right_1, attr);
+    return_value = _curses_window_insstr_impl((PyCursesWindowObject *)self, group_left_1, y, x, str, group_right_1, attr);
 
 exit:
     return return_value;
@@ -1195,7 +1195,7 @@ _curses_window_insnstr_impl(PyCursesWindowObject *self, int group_left_1,
                             int group_right_1, long attr);
 
 static PyObject *
-_curses_window_insnstr(PyCursesWindowObject *self, PyObject *args)
+_curses_window_insnstr(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -1235,7 +1235,7 @@ _curses_window_insnstr(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.insnstr requires 2 to 5 arguments");
             goto exit;
     }
-    return_value = _curses_window_insnstr_impl(self, group_left_1, y, x, str, n, group_right_1, attr);
+    return_value = _curses_window_insnstr_impl((PyCursesWindowObject *)self, group_left_1, y, x, str, n, group_right_1, attr);
 
 exit:
     return return_value;
@@ -1259,7 +1259,7 @@ static PyObject *
 _curses_window_is_linetouched_impl(PyCursesWindowObject *self, int line);
 
 static PyObject *
-_curses_window_is_linetouched(PyCursesWindowObject *self, PyObject *arg)
+_curses_window_is_linetouched(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int line;
@@ -1268,7 +1268,7 @@ _curses_window_is_linetouched(PyCursesWindowObject *self, PyObject *arg)
     if (line == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_is_linetouched_impl(self, line);
+    return_value = _curses_window_is_linetouched_impl((PyCursesWindowObject *)self, line);
 
 exit:
     return return_value;
@@ -1294,7 +1294,7 @@ _curses_window_noutrefresh_impl(PyCursesWindowObject *self,
                                 int smaxcol);
 
 static PyObject *
-_curses_window_noutrefresh(PyCursesWindowObject *self, PyObject *args)
+_curses_window_noutrefresh(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -1318,7 +1318,7 @@ _curses_window_noutrefresh(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.noutrefresh requires 0 to 6 arguments");
             goto exit;
     }
-    return_value = _curses_window_noutrefresh_impl(self, group_right_1, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol);
+    return_value = _curses_window_noutrefresh_impl((PyCursesWindowObject *)self, group_right_1, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol);
 
 exit:
     return return_value;
@@ -1345,9 +1345,9 @@ static PyObject *
 _curses_window_noutrefresh_impl(PyCursesWindowObject *self);
 
 static PyObject *
-_curses_window_noutrefresh(PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored))
+_curses_window_noutrefresh(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _curses_window_noutrefresh_impl(self);
+    return _curses_window_noutrefresh_impl((PyCursesWindowObject *)self);
 }
 
 #endif /* !defined(py_is_pad) */
@@ -1375,7 +1375,7 @@ _curses_window_overlay_impl(PyCursesWindowObject *self,
                             int dmincol, int dmaxrow, int dmaxcol);
 
 static PyObject *
-_curses_window_overlay(PyCursesWindowObject *self, PyObject *args)
+_curses_window_overlay(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     PyCursesWindowObject *destwin;
@@ -1403,7 +1403,7 @@ _curses_window_overlay(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.overlay requires 1 to 7 arguments");
             goto exit;
     }
-    return_value = _curses_window_overlay_impl(self, destwin, group_right_1, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol);
+    return_value = _curses_window_overlay_impl((PyCursesWindowObject *)self, destwin, group_right_1, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol);
 
 exit:
     return return_value;
@@ -1434,7 +1434,7 @@ _curses_window_overwrite_impl(PyCursesWindowObject *self,
                               int dmaxcol);
 
 static PyObject *
-_curses_window_overwrite(PyCursesWindowObject *self, PyObject *args)
+_curses_window_overwrite(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     PyCursesWindowObject *destwin;
@@ -1462,7 +1462,7 @@ _curses_window_overwrite(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.overwrite requires 1 to 7 arguments");
             goto exit;
     }
-    return_value = _curses_window_overwrite_impl(self, destwin, group_right_1, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol);
+    return_value = _curses_window_overwrite_impl((PyCursesWindowObject *)self, destwin, group_right_1, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol);
 
 exit:
     return return_value;
@@ -1499,7 +1499,7 @@ static PyObject *
 _curses_window_redrawln_impl(PyCursesWindowObject *self, int beg, int num);
 
 static PyObject *
-_curses_window_redrawln(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_redrawln(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int beg;
@@ -1516,7 +1516,7 @@ _curses_window_redrawln(PyCursesWindowObject *self, PyObject *const *args, Py_ss
     if (num == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_redrawln_impl(self, beg, num);
+    return_value = _curses_window_redrawln_impl((PyCursesWindowObject *)self, beg, num);
 
 exit:
     return return_value;
@@ -1547,7 +1547,7 @@ _curses_window_refresh_impl(PyCursesWindowObject *self, int group_right_1,
                             int smincol, int smaxrow, int smaxcol);
 
 static PyObject *
-_curses_window_refresh(PyCursesWindowObject *self, PyObject *args)
+_curses_window_refresh(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -1571,7 +1571,7 @@ _curses_window_refresh(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.refresh requires 0 to 6 arguments");
             goto exit;
     }
-    return_value = _curses_window_refresh_impl(self, group_right_1, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol);
+    return_value = _curses_window_refresh_impl((PyCursesWindowObject *)self, group_right_1, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol);
 
 exit:
     return return_value;
@@ -1598,7 +1598,7 @@ _curses_window_setscrreg_impl(PyCursesWindowObject *self, int top,
                               int bottom);
 
 static PyObject *
-_curses_window_setscrreg(PyCursesWindowObject *self, PyObject *const *args, Py_ssize_t nargs)
+_curses_window_setscrreg(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int top;
@@ -1615,7 +1615,7 @@ _curses_window_setscrreg(PyCursesWindowObject *self, PyObject *const *args, Py_s
     if (bottom == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _curses_window_setscrreg_impl(self, top, bottom);
+    return_value = _curses_window_setscrreg_impl((PyCursesWindowObject *)self, top, bottom);
 
 exit:
     return return_value;
@@ -1645,7 +1645,7 @@ _curses_window_subwin_impl(PyCursesWindowObject *self, int group_left_1,
                            int nlines, int ncols, int begin_y, int begin_x);
 
 static PyObject *
-_curses_window_subwin(PyCursesWindowObject *self, PyObject *args)
+_curses_window_subwin(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -1670,7 +1670,7 @@ _curses_window_subwin(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.subwin requires 2 to 4 arguments");
             goto exit;
     }
-    return_value = _curses_window_subwin_impl(self, group_left_1, nlines, ncols, begin_y, begin_x);
+    return_value = _curses_window_subwin_impl((PyCursesWindowObject *)self, group_left_1, nlines, ncols, begin_y, begin_x);
 
 exit:
     return return_value;
@@ -1693,7 +1693,7 @@ _curses_window_scroll_impl(PyCursesWindowObject *self, int group_right_1,
                            int lines);
 
 static PyObject *
-_curses_window_scroll(PyCursesWindowObject *self, PyObject *args)
+_curses_window_scroll(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_right_1 = 0;
@@ -1712,7 +1712,7 @@ _curses_window_scroll(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.scroll requires 0 to 1 arguments");
             goto exit;
     }
-    return_value = _curses_window_scroll_impl(self, group_right_1, lines);
+    return_value = _curses_window_scroll_impl((PyCursesWindowObject *)self, group_right_1, lines);
 
 exit:
     return return_value;
@@ -1733,7 +1733,7 @@ _curses_window_touchline_impl(PyCursesWindowObject *self, int start,
                               int count, int group_right_1, int changed);
 
 static PyObject *
-_curses_window_touchline(PyCursesWindowObject *self, PyObject *args)
+_curses_window_touchline(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int start;
@@ -1757,7 +1757,7 @@ _curses_window_touchline(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.touchline requires 2 to 3 arguments");
             goto exit;
     }
-    return_value = _curses_window_touchline_impl(self, start, count, group_right_1, changed);
+    return_value = _curses_window_touchline_impl((PyCursesWindowObject *)self, start, count, group_right_1, changed);
 
 exit:
     return return_value;
@@ -1787,7 +1787,7 @@ _curses_window_vline_impl(PyCursesWindowObject *self, int group_left_1,
                           int group_right_1, long attr);
 
 static PyObject *
-_curses_window_vline(PyCursesWindowObject *self, PyObject *args)
+_curses_window_vline(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     int group_left_1 = 0;
@@ -1827,7 +1827,7 @@ _curses_window_vline(PyCursesWindowObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "_curses.window.vline requires 2 to 5 arguments");
             goto exit;
     }
-    return_value = _curses_window_vline_impl(self, group_left_1, y, x, ch, n, group_right_1, attr);
+    return_value = _curses_window_vline_impl((PyCursesWindowObject *)self, group_left_1, y, x, ch, n, group_right_1, attr);
 
 exit:
     return return_value;
@@ -4379,4 +4379,4 @@ _curses_has_extended_color_support(PyObject *module, PyObject *Py_UNUSED(ignored
 #ifndef _CURSES_USE_DEFAULT_COLORS_METHODDEF
     #define _CURSES_USE_DEFAULT_COLORS_METHODDEF
 #endif /* !defined(_CURSES_USE_DEFAULT_COLORS_METHODDEF) */
-/*[clinic end generated code: output=26fe38c09ff8ca44 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c4211865ed96c2af input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_datetimemodule.c.h b/Modules/clinic/_datetimemodule.c.h
index 72c230fc8aee68..8f33c9e7d4eae5 100644
--- a/Modules/clinic/_datetimemodule.c.h
+++ b/Modules/clinic/_datetimemodule.c.h
@@ -97,7 +97,7 @@ datetime_date_replace_impl(PyDateTime_Date *self, int year, int month,
                            int day);
 
 static PyObject *
-datetime_date_replace(PyDateTime_Date *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+datetime_date_replace(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -162,7 +162,7 @@ datetime_date_replace(PyDateTime_Date *self, PyObject *const *args, Py_ssize_t n
         goto exit;
     }
 skip_optional_pos:
-    return_value = datetime_date_replace_impl(self, year, month, day);
+    return_value = datetime_date_replace_impl((PyDateTime_Date *)self, year, month, day);
 
 exit:
     return return_value;
@@ -184,7 +184,7 @@ datetime_time_replace_impl(PyDateTime_Time *self, int hour, int minute,
                            int fold);
 
 static PyObject *
-datetime_time_replace(PyDateTime_Time *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+datetime_time_replace(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -218,7 +218,7 @@ datetime_time_replace(PyDateTime_Time *self, PyObject *const *args, Py_ssize_t n
     int minute = TIME_GET_MINUTE(self);
     int second = TIME_GET_SECOND(self);
     int microsecond = TIME_GET_MICROSECOND(self);
-    PyObject *tzinfo = HASTZINFO(self) ? self->tzinfo : Py_None;
+    PyObject *tzinfo = HASTZINFO(self) ? ((PyDateTime_Time *)self)->tzinfo : Py_None;
     int fold = TIME_GET_FOLD(self);
 
     args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser,
@@ -280,7 +280,7 @@ datetime_time_replace(PyDateTime_Time *self, PyObject *const *args, Py_ssize_t n
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = datetime_time_replace_impl(self, hour, minute, second, microsecond, tzinfo, fold);
+    return_value = datetime_time_replace_impl((PyDateTime_Time *)self, hour, minute, second, microsecond, tzinfo, fold);
 
 exit:
     return return_value;
@@ -370,7 +370,7 @@ datetime_datetime_replace_impl(PyDateTime_DateTime *self, int year,
                                int fold);
 
 static PyObject *
-datetime_datetime_replace(PyDateTime_DateTime *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+datetime_datetime_replace(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -407,7 +407,7 @@ datetime_datetime_replace(PyDateTime_DateTime *self, PyObject *const *args, Py_s
     int minute = DATE_GET_MINUTE(self);
     int second = DATE_GET_SECOND(self);
     int microsecond = DATE_GET_MICROSECOND(self);
-    PyObject *tzinfo = HASTZINFO(self) ? self->tzinfo : Py_None;
+    PyObject *tzinfo = HASTZINFO(self) ? ((PyDateTime_DateTime *)self)->tzinfo : Py_None;
     int fold = DATE_GET_FOLD(self);
 
     args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser,
@@ -496,9 +496,9 @@ datetime_datetime_replace(PyDateTime_DateTime *self, PyObject *const *args, Py_s
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = datetime_datetime_replace_impl(self, year, month, day, hour, minute, second, microsecond, tzinfo, fold);
+    return_value = datetime_datetime_replace_impl((PyDateTime_DateTime *)self, year, month, day, hour, minute, second, microsecond, tzinfo, fold);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=203217a61ea14171 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8acf62fbc7328f79 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h
index 4379b433db3738..5e503194408776 100644
--- a/Modules/clinic/_dbmmodule.c.h
+++ b/Modules/clinic/_dbmmodule.c.h
@@ -20,9 +20,9 @@ static PyObject *
 _dbm_dbm_close_impl(dbmobject *self);
 
 static PyObject *
-_dbm_dbm_close(dbmobject *self, PyObject *Py_UNUSED(ignored))
+_dbm_dbm_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _dbm_dbm_close_impl(self);
+    return _dbm_dbm_close_impl((dbmobject *)self);
 }
 
 PyDoc_STRVAR(_dbm_dbm_keys__doc__,
@@ -38,13 +38,13 @@ static PyObject *
 _dbm_dbm_keys_impl(dbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_dbm_dbm_keys(dbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_dbm_dbm_keys(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "keys() takes no arguments");
         return NULL;
     }
-    return _dbm_dbm_keys_impl(self, cls);
+    return _dbm_dbm_keys_impl((dbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(_dbm_dbm_get__doc__,
@@ -61,7 +61,7 @@ _dbm_dbm_get_impl(dbmobject *self, PyTypeObject *cls, const char *key,
                   Py_ssize_t key_length, PyObject *default_value);
 
 static PyObject *
-_dbm_dbm_get(dbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_dbm_dbm_get(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -85,7 +85,7 @@ _dbm_dbm_get(dbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize
         &key, &key_length, &default_value)) {
         goto exit;
     }
-    return_value = _dbm_dbm_get_impl(self, cls, key, key_length, default_value);
+    return_value = _dbm_dbm_get_impl((dbmobject *)self, cls, key, key_length, default_value);
 
 exit:
     return return_value;
@@ -107,7 +107,7 @@ _dbm_dbm_setdefault_impl(dbmobject *self, PyTypeObject *cls, const char *key,
                          Py_ssize_t key_length, PyObject *default_value);
 
 static PyObject *
-_dbm_dbm_setdefault(dbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_dbm_dbm_setdefault(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -131,7 +131,7 @@ _dbm_dbm_setdefault(dbmobject *self, PyTypeObject *cls, PyObject *const *args, P
         &key, &key_length, &default_value)) {
         goto exit;
     }
-    return_value = _dbm_dbm_setdefault_impl(self, cls, key, key_length, default_value);
+    return_value = _dbm_dbm_setdefault_impl((dbmobject *)self, cls, key, key_length, default_value);
 
 exit:
     return return_value;
@@ -150,13 +150,13 @@ static PyObject *
 _dbm_dbm_clear_impl(dbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_dbm_dbm_clear(dbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_dbm_dbm_clear(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "clear() takes no arguments");
         return NULL;
     }
-    return _dbm_dbm_clear_impl(self, cls);
+    return _dbm_dbm_clear_impl((dbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(dbmopen__doc__,
@@ -221,4 +221,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=f7d9a87d80a64278 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3b456118f231b160 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h
index 07045e72040664..78391887b615cf 100644
--- a/Modules/clinic/_elementtree.c.h
+++ b/Modules/clinic/_elementtree.c.h
@@ -22,7 +22,7 @@ _elementtree_Element_append_impl(ElementObject *self, PyTypeObject *cls,
                                  PyObject *subelement);
 
 static PyObject *
-_elementtree_Element_append(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_append(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -51,7 +51,7 @@ _elementtree_Element_append(ElementObject *self, PyTypeObject *cls, PyObject *co
         goto exit;
     }
     subelement = args[0];
-    return_value = _elementtree_Element_append_impl(self, cls, subelement);
+    return_value = _elementtree_Element_append_impl((ElementObject *)self, cls, subelement);
 
 exit:
     return return_value;
@@ -69,9 +69,9 @@ static PyObject *
 _elementtree_Element_clear_impl(ElementObject *self);
 
 static PyObject *
-_elementtree_Element_clear(ElementObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_Element_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_Element_clear_impl(self);
+    return _elementtree_Element_clear_impl((ElementObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_Element___copy____doc__,
@@ -86,13 +86,13 @@ static PyObject *
 _elementtree_Element___copy___impl(ElementObject *self, PyTypeObject *cls);
 
 static PyObject *
-_elementtree_Element___copy__(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element___copy__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "__copy__() takes no arguments");
         return NULL;
     }
-    return _elementtree_Element___copy___impl(self, cls);
+    return _elementtree_Element___copy___impl((ElementObject *)self, cls);
 }
 
 PyDoc_STRVAR(_elementtree_Element___deepcopy____doc__,
@@ -107,7 +107,7 @@ static PyObject *
 _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo);
 
 static PyObject *
-_elementtree_Element___deepcopy__(ElementObject *self, PyObject *arg)
+_elementtree_Element___deepcopy__(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *memo;
@@ -117,7 +117,7 @@ _elementtree_Element___deepcopy__(ElementObject *self, PyObject *arg)
         goto exit;
     }
     memo = arg;
-    return_value = _elementtree_Element___deepcopy___impl(self, memo);
+    return_value = _elementtree_Element___deepcopy___impl((ElementObject *)self, memo);
 
 exit:
     return return_value;
@@ -135,12 +135,12 @@ static size_t
 _elementtree_Element___sizeof___impl(ElementObject *self);
 
 static PyObject *
-_elementtree_Element___sizeof__(ElementObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_Element___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     size_t _return_value;
 
-    _return_value = _elementtree_Element___sizeof___impl(self);
+    _return_value = _elementtree_Element___sizeof___impl((ElementObject *)self);
     if ((_return_value == (size_t)-1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -162,9 +162,9 @@ static PyObject *
 _elementtree_Element___getstate___impl(ElementObject *self);
 
 static PyObject *
-_elementtree_Element___getstate__(ElementObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_Element___getstate__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_Element___getstate___impl(self);
+    return _elementtree_Element___getstate___impl((ElementObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_Element___setstate____doc__,
@@ -180,7 +180,7 @@ _elementtree_Element___setstate___impl(ElementObject *self,
                                        PyTypeObject *cls, PyObject *state);
 
 static PyObject *
-_elementtree_Element___setstate__(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element___setstate__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -205,7 +205,7 @@ _elementtree_Element___setstate__(ElementObject *self, PyTypeObject *cls, PyObje
         goto exit;
     }
     state = args[0];
-    return_value = _elementtree_Element___setstate___impl(self, cls, state);
+    return_value = _elementtree_Element___setstate___impl((ElementObject *)self, cls, state);
 
 exit:
     return return_value;
@@ -224,7 +224,7 @@ _elementtree_Element_extend_impl(ElementObject *self, PyTypeObject *cls,
                                  PyObject *elements);
 
 static PyObject *
-_elementtree_Element_extend(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_extend(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -249,7 +249,7 @@ _elementtree_Element_extend(ElementObject *self, PyTypeObject *cls, PyObject *co
         goto exit;
     }
     elements = args[0];
-    return_value = _elementtree_Element_extend_impl(self, cls, elements);
+    return_value = _elementtree_Element_extend_impl((ElementObject *)self, cls, elements);
 
 exit:
     return return_value;
@@ -268,7 +268,7 @@ _elementtree_Element_find_impl(ElementObject *self, PyTypeObject *cls,
                                PyObject *path, PyObject *namespaces);
 
 static PyObject *
-_elementtree_Element_find(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_find(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -312,7 +312,7 @@ _elementtree_Element_find(ElementObject *self, PyTypeObject *cls, PyObject *cons
     }
     namespaces = args[1];
 skip_optional_pos:
-    return_value = _elementtree_Element_find_impl(self, cls, path, namespaces);
+    return_value = _elementtree_Element_find_impl((ElementObject *)self, cls, path, namespaces);
 
 exit:
     return return_value;
@@ -332,7 +332,7 @@ _elementtree_Element_findtext_impl(ElementObject *self, PyTypeObject *cls,
                                    PyObject *namespaces);
 
 static PyObject *
-_elementtree_Element_findtext(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_findtext(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -383,7 +383,7 @@ _elementtree_Element_findtext(ElementObject *self, PyTypeObject *cls, PyObject *
     }
     namespaces = args[2];
 skip_optional_pos:
-    return_value = _elementtree_Element_findtext_impl(self, cls, path, default_value, namespaces);
+    return_value = _elementtree_Element_findtext_impl((ElementObject *)self, cls, path, default_value, namespaces);
 
 exit:
     return return_value;
@@ -402,7 +402,7 @@ _elementtree_Element_findall_impl(ElementObject *self, PyTypeObject *cls,
                                   PyObject *path, PyObject *namespaces);
 
 static PyObject *
-_elementtree_Element_findall(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_findall(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -446,7 +446,7 @@ _elementtree_Element_findall(ElementObject *self, PyTypeObject *cls, PyObject *c
     }
     namespaces = args[1];
 skip_optional_pos:
-    return_value = _elementtree_Element_findall_impl(self, cls, path, namespaces);
+    return_value = _elementtree_Element_findall_impl((ElementObject *)self, cls, path, namespaces);
 
 exit:
     return return_value;
@@ -465,7 +465,7 @@ _elementtree_Element_iterfind_impl(ElementObject *self, PyTypeObject *cls,
                                    PyObject *path, PyObject *namespaces);
 
 static PyObject *
-_elementtree_Element_iterfind(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_iterfind(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -509,7 +509,7 @@ _elementtree_Element_iterfind(ElementObject *self, PyTypeObject *cls, PyObject *
     }
     namespaces = args[1];
 skip_optional_pos:
-    return_value = _elementtree_Element_iterfind_impl(self, cls, path, namespaces);
+    return_value = _elementtree_Element_iterfind_impl((ElementObject *)self, cls, path, namespaces);
 
 exit:
     return return_value;
@@ -528,7 +528,7 @@ _elementtree_Element_get_impl(ElementObject *self, PyObject *key,
                               PyObject *default_value);
 
 static PyObject *
-_elementtree_Element_get(ElementObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_get(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -572,7 +572,7 @@ _elementtree_Element_get(ElementObject *self, PyObject *const *args, Py_ssize_t
     }
     default_value = args[1];
 skip_optional_pos:
-    return_value = _elementtree_Element_get_impl(self, key, default_value);
+    return_value = _elementtree_Element_get_impl((ElementObject *)self, key, default_value);
 
 exit:
     return return_value;
@@ -591,7 +591,7 @@ _elementtree_Element_iter_impl(ElementObject *self, PyTypeObject *cls,
                                PyObject *tag);
 
 static PyObject *
-_elementtree_Element_iter(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_iter(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -633,7 +633,7 @@ _elementtree_Element_iter(ElementObject *self, PyTypeObject *cls, PyObject *cons
     }
     tag = args[0];
 skip_optional_pos:
-    return_value = _elementtree_Element_iter_impl(self, cls, tag);
+    return_value = _elementtree_Element_iter_impl((ElementObject *)self, cls, tag);
 
 exit:
     return return_value;
@@ -651,13 +651,13 @@ static PyObject *
 _elementtree_Element_itertext_impl(ElementObject *self, PyTypeObject *cls);
 
 static PyObject *
-_elementtree_Element_itertext(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_itertext(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "itertext() takes no arguments");
         return NULL;
     }
-    return _elementtree_Element_itertext_impl(self, cls);
+    return _elementtree_Element_itertext_impl((ElementObject *)self, cls);
 }
 
 PyDoc_STRVAR(_elementtree_Element_insert__doc__,
@@ -673,7 +673,7 @@ _elementtree_Element_insert_impl(ElementObject *self, Py_ssize_t index,
                                  PyObject *subelement);
 
 static PyObject *
-_elementtree_Element_insert(ElementObject *self, PyObject *const *args, Py_ssize_t nargs)
+_elementtree_Element_insert(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t index;
@@ -699,7 +699,7 @@ _elementtree_Element_insert(ElementObject *self, PyObject *const *args, Py_ssize
         goto exit;
     }
     subelement = args[1];
-    return_value = _elementtree_Element_insert_impl(self, index, subelement);
+    return_value = _elementtree_Element_insert_impl((ElementObject *)self, index, subelement);
 
 exit:
     return return_value;
@@ -717,9 +717,9 @@ static PyObject *
 _elementtree_Element_items_impl(ElementObject *self);
 
 static PyObject *
-_elementtree_Element_items(ElementObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_Element_items(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_Element_items_impl(self);
+    return _elementtree_Element_items_impl((ElementObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_Element_keys__doc__,
@@ -734,9 +734,9 @@ static PyObject *
 _elementtree_Element_keys_impl(ElementObject *self);
 
 static PyObject *
-_elementtree_Element_keys(ElementObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_Element_keys(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_Element_keys_impl(self);
+    return _elementtree_Element_keys_impl((ElementObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_Element_makeelement__doc__,
@@ -752,7 +752,7 @@ _elementtree_Element_makeelement_impl(ElementObject *self, PyTypeObject *cls,
                                       PyObject *tag, PyObject *attrib);
 
 static PyObject *
-_elementtree_Element_makeelement(ElementObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_elementtree_Element_makeelement(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -783,7 +783,7 @@ _elementtree_Element_makeelement(ElementObject *self, PyTypeObject *cls, PyObjec
         goto exit;
     }
     attrib = args[1];
-    return_value = _elementtree_Element_makeelement_impl(self, cls, tag, attrib);
+    return_value = _elementtree_Element_makeelement_impl((ElementObject *)self, cls, tag, attrib);
 
 exit:
     return return_value;
@@ -801,7 +801,7 @@ static PyObject *
 _elementtree_Element_remove_impl(ElementObject *self, PyObject *subelement);
 
 static PyObject *
-_elementtree_Element_remove(ElementObject *self, PyObject *arg)
+_elementtree_Element_remove(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *subelement;
@@ -811,7 +811,7 @@ _elementtree_Element_remove(ElementObject *self, PyObject *arg)
         goto exit;
     }
     subelement = arg;
-    return_value = _elementtree_Element_remove_impl(self, subelement);
+    return_value = _elementtree_Element_remove_impl((ElementObject *)self, subelement);
 
 exit:
     return return_value;
@@ -830,7 +830,7 @@ _elementtree_Element_set_impl(ElementObject *self, PyObject *key,
                               PyObject *value);
 
 static PyObject *
-_elementtree_Element_set(ElementObject *self, PyObject *const *args, Py_ssize_t nargs)
+_elementtree_Element_set(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -841,7 +841,7 @@ _elementtree_Element_set(ElementObject *self, PyObject *const *args, Py_ssize_t
     }
     key = args[0];
     value = args[1];
-    return_value = _elementtree_Element_set_impl(self, key, value);
+    return_value = _elementtree_Element_set_impl((ElementObject *)self, key, value);
 
 exit:
     return return_value;
@@ -1013,7 +1013,7 @@ _elementtree_TreeBuilder_pi_impl(TreeBuilderObject *self, PyObject *target,
                                  PyObject *text);
 
 static PyObject *
-_elementtree_TreeBuilder_pi(TreeBuilderObject *self, PyObject *const *args, Py_ssize_t nargs)
+_elementtree_TreeBuilder_pi(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *target;
@@ -1028,7 +1028,7 @@ _elementtree_TreeBuilder_pi(TreeBuilderObject *self, PyObject *const *args, Py_s
     }
     text = args[1];
 skip_optional:
-    return_value = _elementtree_TreeBuilder_pi_impl(self, target, text);
+    return_value = _elementtree_TreeBuilder_pi_impl((TreeBuilderObject *)self, target, text);
 
 exit:
     return return_value;
@@ -1046,9 +1046,9 @@ static PyObject *
 _elementtree_TreeBuilder_close_impl(TreeBuilderObject *self);
 
 static PyObject *
-_elementtree_TreeBuilder_close(TreeBuilderObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_TreeBuilder_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_TreeBuilder_close_impl(self);
+    return _elementtree_TreeBuilder_close_impl((TreeBuilderObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_TreeBuilder_start__doc__,
@@ -1064,7 +1064,7 @@ _elementtree_TreeBuilder_start_impl(TreeBuilderObject *self, PyObject *tag,
                                     PyObject *attrs);
 
 static PyObject *
-_elementtree_TreeBuilder_start(TreeBuilderObject *self, PyObject *const *args, Py_ssize_t nargs)
+_elementtree_TreeBuilder_start(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *tag;
@@ -1079,7 +1079,7 @@ _elementtree_TreeBuilder_start(TreeBuilderObject *self, PyObject *const *args, P
         goto exit;
     }
     attrs = args[1];
-    return_value = _elementtree_TreeBuilder_start_impl(self, tag, attrs);
+    return_value = _elementtree_TreeBuilder_start_impl((TreeBuilderObject *)self, tag, attrs);
 
 exit:
     return return_value;
@@ -1176,9 +1176,9 @@ static PyObject *
 _elementtree_XMLParser_close_impl(XMLParserObject *self);
 
 static PyObject *
-_elementtree_XMLParser_close(XMLParserObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_XMLParser_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_XMLParser_close_impl(self);
+    return _elementtree_XMLParser_close_impl((XMLParserObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_XMLParser_flush__doc__,
@@ -1193,9 +1193,9 @@ static PyObject *
 _elementtree_XMLParser_flush_impl(XMLParserObject *self);
 
 static PyObject *
-_elementtree_XMLParser_flush(XMLParserObject *self, PyObject *Py_UNUSED(ignored))
+_elementtree_XMLParser_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _elementtree_XMLParser_flush_impl(self);
+    return _elementtree_XMLParser_flush_impl((XMLParserObject *)self);
 }
 
 PyDoc_STRVAR(_elementtree_XMLParser_feed__doc__,
@@ -1228,7 +1228,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self,
                                        PyObject *events_to_report);
 
 static PyObject *
-_elementtree_XMLParser__setevents(XMLParserObject *self, PyObject *const *args, Py_ssize_t nargs)
+_elementtree_XMLParser__setevents(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *events_queue;
@@ -1243,9 +1243,9 @@ _elementtree_XMLParser__setevents(XMLParserObject *self, PyObject *const *args,
     }
     events_to_report = args[1];
 skip_optional:
-    return_value = _elementtree_XMLParser__setevents_impl(self, events_queue, events_to_report);
+    return_value = _elementtree_XMLParser__setevents_impl((XMLParserObject *)self, events_queue, events_to_report);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b713bf59fd0fef9b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e5c758958f14f102 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h
index bbf4365114c0aa..00950f18e53541 100644
--- a/Modules/clinic/_gdbmmodule.c.h
+++ b/Modules/clinic/_gdbmmodule.c.h
@@ -20,7 +20,7 @@ static PyObject *
 _gdbm_gdbm_get_impl(gdbmobject *self, PyObject *key, PyObject *default_value);
 
 static PyObject *
-_gdbm_gdbm_get(gdbmobject *self, PyObject *const *args, Py_ssize_t nargs)
+_gdbm_gdbm_get(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -35,7 +35,7 @@ _gdbm_gdbm_get(gdbmobject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     default_value = args[1];
 skip_optional:
-    return_value = _gdbm_gdbm_get_impl(self, key, default_value);
+    return_value = _gdbm_gdbm_get_impl((gdbmobject *)self, key, default_value);
 
 exit:
     return return_value;
@@ -55,7 +55,7 @@ _gdbm_gdbm_setdefault_impl(gdbmobject *self, PyObject *key,
                            PyObject *default_value);
 
 static PyObject *
-_gdbm_gdbm_setdefault(gdbmobject *self, PyObject *const *args, Py_ssize_t nargs)
+_gdbm_gdbm_setdefault(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -70,7 +70,7 @@ _gdbm_gdbm_setdefault(gdbmobject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     default_value = args[1];
 skip_optional:
-    return_value = _gdbm_gdbm_setdefault_impl(self, key, default_value);
+    return_value = _gdbm_gdbm_setdefault_impl((gdbmobject *)self, key, default_value);
 
 exit:
     return return_value;
@@ -89,9 +89,9 @@ static PyObject *
 _gdbm_gdbm_close_impl(gdbmobject *self);
 
 static PyObject *
-_gdbm_gdbm_close(gdbmobject *self, PyObject *Py_UNUSED(ignored))
+_gdbm_gdbm_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _gdbm_gdbm_close_impl(self);
+    return _gdbm_gdbm_close_impl((gdbmobject *)self);
 }
 
 PyDoc_STRVAR(_gdbm_gdbm_keys__doc__,
@@ -107,13 +107,13 @@ static PyObject *
 _gdbm_gdbm_keys_impl(gdbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_gdbm_gdbm_keys(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_gdbm_gdbm_keys(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "keys() takes no arguments");
         return NULL;
     }
-    return _gdbm_gdbm_keys_impl(self, cls);
+    return _gdbm_gdbm_keys_impl((gdbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(_gdbm_gdbm_firstkey__doc__,
@@ -133,13 +133,13 @@ static PyObject *
 _gdbm_gdbm_firstkey_impl(gdbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_gdbm_gdbm_firstkey(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_gdbm_gdbm_firstkey(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "firstkey() takes no arguments");
         return NULL;
     }
-    return _gdbm_gdbm_firstkey_impl(self, cls);
+    return _gdbm_gdbm_firstkey_impl((gdbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(_gdbm_gdbm_nextkey__doc__,
@@ -164,7 +164,7 @@ _gdbm_gdbm_nextkey_impl(gdbmobject *self, PyTypeObject *cls, const char *key,
                         Py_ssize_t key_length);
 
 static PyObject *
-_gdbm_gdbm_nextkey(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_gdbm_gdbm_nextkey(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -187,7 +187,7 @@ _gdbm_gdbm_nextkey(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, P
         &key, &key_length)) {
         goto exit;
     }
-    return_value = _gdbm_gdbm_nextkey_impl(self, cls, key, key_length);
+    return_value = _gdbm_gdbm_nextkey_impl((gdbmobject *)self, cls, key, key_length);
 
 exit:
     return return_value;
@@ -212,13 +212,13 @@ static PyObject *
 _gdbm_gdbm_reorganize_impl(gdbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_gdbm_gdbm_reorganize(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_gdbm_gdbm_reorganize(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "reorganize() takes no arguments");
         return NULL;
     }
-    return _gdbm_gdbm_reorganize_impl(self, cls);
+    return _gdbm_gdbm_reorganize_impl((gdbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(_gdbm_gdbm_sync__doc__,
@@ -237,13 +237,13 @@ static PyObject *
 _gdbm_gdbm_sync_impl(gdbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_gdbm_gdbm_sync(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_gdbm_gdbm_sync(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "sync() takes no arguments");
         return NULL;
     }
-    return _gdbm_gdbm_sync_impl(self, cls);
+    return _gdbm_gdbm_sync_impl((gdbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(_gdbm_gdbm_clear__doc__,
@@ -259,13 +259,13 @@ static PyObject *
 _gdbm_gdbm_clear_impl(gdbmobject *self, PyTypeObject *cls);
 
 static PyObject *
-_gdbm_gdbm_clear(gdbmobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_gdbm_gdbm_clear(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "clear() takes no arguments");
         return NULL;
     }
-    return _gdbm_gdbm_clear_impl(self, cls);
+    return _gdbm_gdbm_clear_impl((gdbmobject *)self, cls);
 }
 
 PyDoc_STRVAR(dbmopen__doc__,
@@ -343,4 +343,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=07bdeb4a8ecb328e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d974cb39e4ee5d67 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h
index f54f065f7d2b71..d219b80b791a66 100644
--- a/Modules/clinic/_hashopenssl.c.h
+++ b/Modules/clinic/_hashopenssl.c.h
@@ -22,9 +22,9 @@ static PyObject *
 EVP_copy_impl(EVPobject *self);
 
 static PyObject *
-EVP_copy(EVPobject *self, PyObject *Py_UNUSED(ignored))
+EVP_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return EVP_copy_impl(self);
+    return EVP_copy_impl((EVPobject *)self);
 }
 
 PyDoc_STRVAR(EVP_digest__doc__,
@@ -40,9 +40,9 @@ static PyObject *
 EVP_digest_impl(EVPobject *self);
 
 static PyObject *
-EVP_digest(EVPobject *self, PyObject *Py_UNUSED(ignored))
+EVP_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return EVP_digest_impl(self);
+    return EVP_digest_impl((EVPobject *)self);
 }
 
 PyDoc_STRVAR(EVP_hexdigest__doc__,
@@ -58,9 +58,9 @@ static PyObject *
 EVP_hexdigest_impl(EVPobject *self);
 
 static PyObject *
-EVP_hexdigest(EVPobject *self, PyObject *Py_UNUSED(ignored))
+EVP_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return EVP_hexdigest_impl(self);
+    return EVP_hexdigest_impl((EVPobject *)self);
 }
 
 PyDoc_STRVAR(EVP_update__doc__,
@@ -87,7 +87,7 @@ static PyObject *
 EVPXOF_digest_impl(EVPobject *self, Py_ssize_t length);
 
 static PyObject *
-EVPXOF_digest(EVPobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+EVPXOF_digest(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -135,7 +135,7 @@ EVPXOF_digest(EVPobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject
         }
         length = ival;
     }
-    return_value = EVPXOF_digest_impl(self, length);
+    return_value = EVPXOF_digest_impl((EVPobject *)self, length);
 
 exit:
     return return_value;
@@ -158,7 +158,7 @@ static PyObject *
 EVPXOF_hexdigest_impl(EVPobject *self, Py_ssize_t length);
 
 static PyObject *
-EVPXOF_hexdigest(EVPobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+EVPXOF_hexdigest(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -206,7 +206,7 @@ EVPXOF_hexdigest(EVPobject *self, PyObject *const *args, Py_ssize_t nargs, PyObj
         }
         length = ival;
     }
-    return_value = EVPXOF_hexdigest_impl(self, length);
+    return_value = EVPXOF_hexdigest_impl((EVPobject *)self, length);
 
 exit:
     return return_value;
@@ -1634,9 +1634,9 @@ static PyObject *
 _hashlib_HMAC_copy_impl(HMACobject *self);
 
 static PyObject *
-_hashlib_HMAC_copy(HMACobject *self, PyObject *Py_UNUSED(ignored))
+_hashlib_HMAC_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _hashlib_HMAC_copy_impl(self);
+    return _hashlib_HMAC_copy_impl((HMACobject *)self);
 }
 
 PyDoc_STRVAR(_hashlib_HMAC_update__doc__,
@@ -1652,7 +1652,7 @@ static PyObject *
 _hashlib_HMAC_update_impl(HMACobject *self, PyObject *msg);
 
 static PyObject *
-_hashlib_HMAC_update(HMACobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_hashlib_HMAC_update(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1689,7 +1689,7 @@ _hashlib_HMAC_update(HMACobject *self, PyObject *const *args, Py_ssize_t nargs,
         goto exit;
     }
     msg = args[0];
-    return_value = _hashlib_HMAC_update_impl(self, msg);
+    return_value = _hashlib_HMAC_update_impl((HMACobject *)self, msg);
 
 exit:
     return return_value;
@@ -1708,9 +1708,9 @@ static PyObject *
 _hashlib_HMAC_digest_impl(HMACobject *self);
 
 static PyObject *
-_hashlib_HMAC_digest(HMACobject *self, PyObject *Py_UNUSED(ignored))
+_hashlib_HMAC_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _hashlib_HMAC_digest_impl(self);
+    return _hashlib_HMAC_digest_impl((HMACobject *)self);
 }
 
 PyDoc_STRVAR(_hashlib_HMAC_hexdigest__doc__,
@@ -1729,9 +1729,9 @@ static PyObject *
 _hashlib_HMAC_hexdigest_impl(HMACobject *self);
 
 static PyObject *
-_hashlib_HMAC_hexdigest(HMACobject *self, PyObject *Py_UNUSED(ignored))
+_hashlib_HMAC_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _hashlib_HMAC_hexdigest_impl(self);
+    return _hashlib_HMAC_hexdigest_impl((HMACobject *)self);
 }
 
 PyDoc_STRVAR(_hashlib_get_fips_mode__doc__,
@@ -1844,4 +1844,4 @@ _hashlib_compare_digest(PyObject *module, PyObject *const *args, Py_ssize_t narg
 #ifndef _HASHLIB_SCRYPT_METHODDEF
     #define _HASHLIB_SCRYPT_METHODDEF
 #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */
-/*[clinic end generated code: output=c3ef67e4a573cc7a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=811a8b50beae1018 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_lsprof.c.h b/Modules/clinic/_lsprof.c.h
index e19840f97e5c69..6a75a8f9833d1e 100644
--- a/Modules/clinic/_lsprof.c.h
+++ b/Modules/clinic/_lsprof.c.h
@@ -43,13 +43,13 @@ static PyObject *
 _lsprof_Profiler_getstats_impl(ProfilerObject *self, PyTypeObject *cls);
 
 static PyObject *
-_lsprof_Profiler_getstats(ProfilerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_lsprof_Profiler_getstats(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "getstats() takes no arguments");
         return NULL;
     }
-    return _lsprof_Profiler_getstats_impl(self, cls);
+    return _lsprof_Profiler_getstats_impl((ProfilerObject *)self, cls);
 }
 
 PyDoc_STRVAR(_lsprof_Profiler__pystart_callback__doc__,
@@ -65,7 +65,7 @@ _lsprof_Profiler__pystart_callback_impl(ProfilerObject *self, PyObject *code,
                                         PyObject *instruction_offset);
 
 static PyObject *
-_lsprof_Profiler__pystart_callback(ProfilerObject *self, PyObject *const *args, Py_ssize_t nargs)
+_lsprof_Profiler__pystart_callback(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *code;
@@ -76,7 +76,7 @@ _lsprof_Profiler__pystart_callback(ProfilerObject *self, PyObject *const *args,
     }
     code = args[0];
     instruction_offset = args[1];
-    return_value = _lsprof_Profiler__pystart_callback_impl(self, code, instruction_offset);
+    return_value = _lsprof_Profiler__pystart_callback_impl((ProfilerObject *)self, code, instruction_offset);
 
 exit:
     return return_value;
@@ -97,7 +97,7 @@ _lsprof_Profiler__pyreturn_callback_impl(ProfilerObject *self,
                                          PyObject *retval);
 
 static PyObject *
-_lsprof_Profiler__pyreturn_callback(ProfilerObject *self, PyObject *const *args, Py_ssize_t nargs)
+_lsprof_Profiler__pyreturn_callback(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *code;
@@ -110,7 +110,7 @@ _lsprof_Profiler__pyreturn_callback(ProfilerObject *self, PyObject *const *args,
     code = args[0];
     instruction_offset = args[1];
     retval = args[2];
-    return_value = _lsprof_Profiler__pyreturn_callback_impl(self, code, instruction_offset, retval);
+    return_value = _lsprof_Profiler__pyreturn_callback_impl((ProfilerObject *)self, code, instruction_offset, retval);
 
 exit:
     return return_value;
@@ -130,7 +130,7 @@ _lsprof_Profiler__ccall_callback_impl(ProfilerObject *self, PyObject *code,
                                       PyObject *callable, PyObject *self_arg);
 
 static PyObject *
-_lsprof_Profiler__ccall_callback(ProfilerObject *self, PyObject *const *args, Py_ssize_t nargs)
+_lsprof_Profiler__ccall_callback(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *code;
@@ -145,7 +145,7 @@ _lsprof_Profiler__ccall_callback(ProfilerObject *self, PyObject *const *args, Py
     instruction_offset = args[1];
     callable = args[2];
     self_arg = args[3];
-    return_value = _lsprof_Profiler__ccall_callback_impl(self, code, instruction_offset, callable, self_arg);
+    return_value = _lsprof_Profiler__ccall_callback_impl((ProfilerObject *)self, code, instruction_offset, callable, self_arg);
 
 exit:
     return return_value;
@@ -167,7 +167,7 @@ _lsprof_Profiler__creturn_callback_impl(ProfilerObject *self, PyObject *code,
                                         PyObject *self_arg);
 
 static PyObject *
-_lsprof_Profiler__creturn_callback(ProfilerObject *self, PyObject *const *args, Py_ssize_t nargs)
+_lsprof_Profiler__creturn_callback(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *code;
@@ -182,7 +182,7 @@ _lsprof_Profiler__creturn_callback(ProfilerObject *self, PyObject *const *args,
     instruction_offset = args[1];
     callable = args[2];
     self_arg = args[3];
-    return_value = _lsprof_Profiler__creturn_callback_impl(self, code, instruction_offset, callable, self_arg);
+    return_value = _lsprof_Profiler__creturn_callback_impl((ProfilerObject *)self, code, instruction_offset, callable, self_arg);
 
 exit:
     return return_value;
@@ -209,7 +209,7 @@ _lsprof_Profiler_enable_impl(ProfilerObject *self, int subcalls,
                              int builtins);
 
 static PyObject *
-_lsprof_Profiler_enable(ProfilerObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_lsprof_Profiler_enable(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -264,7 +264,7 @@ _lsprof_Profiler_enable(ProfilerObject *self, PyObject *const *args, Py_ssize_t
         goto exit;
     }
 skip_optional_pos:
-    return_value = _lsprof_Profiler_enable_impl(self, subcalls, builtins);
+    return_value = _lsprof_Profiler_enable_impl((ProfilerObject *)self, subcalls, builtins);
 
 exit:
     return return_value;
@@ -283,9 +283,9 @@ static PyObject *
 _lsprof_Profiler_disable_impl(ProfilerObject *self);
 
 static PyObject *
-_lsprof_Profiler_disable(ProfilerObject *self, PyObject *Py_UNUSED(ignored))
+_lsprof_Profiler_disable(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _lsprof_Profiler_disable_impl(self);
+    return _lsprof_Profiler_disable_impl((ProfilerObject *)self);
 }
 
 PyDoc_STRVAR(_lsprof_Profiler_clear__doc__,
@@ -301,9 +301,9 @@ static PyObject *
 _lsprof_Profiler_clear_impl(ProfilerObject *self);
 
 static PyObject *
-_lsprof_Profiler_clear(ProfilerObject *self, PyObject *Py_UNUSED(ignored))
+_lsprof_Profiler_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _lsprof_Profiler_clear_impl(self);
+    return _lsprof_Profiler_clear_impl((ProfilerObject *)self);
 }
 
 PyDoc_STRVAR(profiler_init__doc__,
@@ -407,4 +407,4 @@ profiler_init(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=e56d849e35d005a5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d983dbf23fd8ac3b input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_lzmamodule.c.h b/Modules/clinic/_lzmamodule.c.h
index 187f7b183dca84..c7c81d8d1f1b9d 100644
--- a/Modules/clinic/_lzmamodule.c.h
+++ b/Modules/clinic/_lzmamodule.c.h
@@ -27,7 +27,7 @@ static PyObject *
 _lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data);
 
 static PyObject *
-_lzma_LZMACompressor_compress(Compressor *self, PyObject *arg)
+_lzma_LZMACompressor_compress(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer data = {NULL, NULL};
@@ -35,7 +35,7 @@ _lzma_LZMACompressor_compress(Compressor *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &data, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _lzma_LZMACompressor_compress_impl(self, &data);
+    return_value = _lzma_LZMACompressor_compress_impl((Compressor *)self, &data);
 
 exit:
     /* Cleanup for data */
@@ -63,9 +63,9 @@ static PyObject *
 _lzma_LZMACompressor_flush_impl(Compressor *self);
 
 static PyObject *
-_lzma_LZMACompressor_flush(Compressor *self, PyObject *Py_UNUSED(ignored))
+_lzma_LZMACompressor_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _lzma_LZMACompressor_flush_impl(self);
+    return _lzma_LZMACompressor_flush_impl((Compressor *)self);
 }
 
 PyDoc_STRVAR(_lzma_LZMADecompressor_decompress__doc__,
@@ -95,7 +95,7 @@ _lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data,
                                        Py_ssize_t max_length);
 
 static PyObject *
-_lzma_LZMADecompressor_decompress(Decompressor *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_lzma_LZMADecompressor_decompress(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -152,7 +152,7 @@ _lzma_LZMADecompressor_decompress(Decompressor *self, PyObject *const *args, Py_
         max_length = ival;
     }
 skip_optional_pos:
-    return_value = _lzma_LZMADecompressor_decompress_impl(self, &data, max_length);
+    return_value = _lzma_LZMADecompressor_decompress_impl((Decompressor *)self, &data, max_length);
 
 exit:
     /* Cleanup for data */
@@ -329,4 +329,4 @@ _lzma__decode_filter_properties(PyObject *module, PyObject *const *args, Py_ssiz
 
     return return_value;
 }
-/*[clinic end generated code: output=52e1b68d0886cebb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=19ed9b1182f5ddf9 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h
index 2e84bb83e21ca6..91d355c5afb353 100644
--- a/Modules/clinic/_pickle.c.h
+++ b/Modules/clinic/_pickle.c.h
@@ -26,9 +26,9 @@ static PyObject *
 _pickle_Pickler_clear_memo_impl(PicklerObject *self);
 
 static PyObject *
-_pickle_Pickler_clear_memo(PicklerObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_Pickler_clear_memo(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_Pickler_clear_memo_impl(self);
+    return _pickle_Pickler_clear_memo_impl((PicklerObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_Pickler_dump__doc__,
@@ -45,7 +45,7 @@ _pickle_Pickler_dump_impl(PicklerObject *self, PyTypeObject *cls,
                           PyObject *obj);
 
 static PyObject *
-_pickle_Pickler_dump(PicklerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_pickle_Pickler_dump(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -70,7 +70,7 @@ _pickle_Pickler_dump(PicklerObject *self, PyTypeObject *cls, PyObject *const *ar
         goto exit;
     }
     obj = args[0];
-    return_value = _pickle_Pickler_dump_impl(self, cls, obj);
+    return_value = _pickle_Pickler_dump_impl((PicklerObject *)self, cls, obj);
 
 exit:
     return return_value;
@@ -89,12 +89,12 @@ static size_t
 _pickle_Pickler___sizeof___impl(PicklerObject *self);
 
 static PyObject *
-_pickle_Pickler___sizeof__(PicklerObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_Pickler___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     size_t _return_value;
 
-    _return_value = _pickle_Pickler___sizeof___impl(self);
+    _return_value = _pickle_Pickler___sizeof___impl((PicklerObject *)self);
     if ((_return_value == (size_t)-1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -227,9 +227,9 @@ static PyObject *
 _pickle_PicklerMemoProxy_clear_impl(PicklerMemoProxyObject *self);
 
 static PyObject *
-_pickle_PicklerMemoProxy_clear(PicklerMemoProxyObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_PicklerMemoProxy_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_PicklerMemoProxy_clear_impl(self);
+    return _pickle_PicklerMemoProxy_clear_impl((PicklerMemoProxyObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_PicklerMemoProxy_copy__doc__,
@@ -245,9 +245,9 @@ static PyObject *
 _pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self);
 
 static PyObject *
-_pickle_PicklerMemoProxy_copy(PicklerMemoProxyObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_PicklerMemoProxy_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_PicklerMemoProxy_copy_impl(self);
+    return _pickle_PicklerMemoProxy_copy_impl((PicklerMemoProxyObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_PicklerMemoProxy___reduce____doc__,
@@ -263,9 +263,9 @@ static PyObject *
 _pickle_PicklerMemoProxy___reduce___impl(PicklerMemoProxyObject *self);
 
 static PyObject *
-_pickle_PicklerMemoProxy___reduce__(PicklerMemoProxyObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_PicklerMemoProxy___reduce__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_PicklerMemoProxy___reduce___impl(self);
+    return _pickle_PicklerMemoProxy___reduce___impl((PicklerMemoProxyObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_Unpickler_persistent_load__doc__,
@@ -281,7 +281,7 @@ _pickle_Unpickler_persistent_load_impl(UnpicklerObject *self,
                                        PyTypeObject *cls, PyObject *pid);
 
 static PyObject *
-_pickle_Unpickler_persistent_load(UnpicklerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_pickle_Unpickler_persistent_load(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -306,7 +306,7 @@ _pickle_Unpickler_persistent_load(UnpicklerObject *self, PyTypeObject *cls, PyOb
         goto exit;
     }
     pid = args[0];
-    return_value = _pickle_Unpickler_persistent_load_impl(self, cls, pid);
+    return_value = _pickle_Unpickler_persistent_load_impl((UnpicklerObject *)self, cls, pid);
 
 exit:
     return return_value;
@@ -329,13 +329,13 @@ static PyObject *
 _pickle_Unpickler_load_impl(UnpicklerObject *self, PyTypeObject *cls);
 
 static PyObject *
-_pickle_Unpickler_load(UnpicklerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_pickle_Unpickler_load(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "load() takes no arguments");
         return NULL;
     }
-    return _pickle_Unpickler_load_impl(self, cls);
+    return _pickle_Unpickler_load_impl((UnpicklerObject *)self, cls);
 }
 
 PyDoc_STRVAR(_pickle_Unpickler_find_class__doc__,
@@ -360,7 +360,7 @@ _pickle_Unpickler_find_class_impl(UnpicklerObject *self, PyTypeObject *cls,
                                   PyObject *global_name);
 
 static PyObject *
-_pickle_Unpickler_find_class(UnpicklerObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_pickle_Unpickler_find_class(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -387,7 +387,7 @@ _pickle_Unpickler_find_class(UnpicklerObject *self, PyTypeObject *cls, PyObject
     }
     module_name = args[0];
     global_name = args[1];
-    return_value = _pickle_Unpickler_find_class_impl(self, cls, module_name, global_name);
+    return_value = _pickle_Unpickler_find_class_impl((UnpicklerObject *)self, cls, module_name, global_name);
 
 exit:
     return return_value;
@@ -406,12 +406,12 @@ static size_t
 _pickle_Unpickler___sizeof___impl(UnpicklerObject *self);
 
 static PyObject *
-_pickle_Unpickler___sizeof__(UnpicklerObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_Unpickler___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     size_t _return_value;
 
-    _return_value = _pickle_Unpickler___sizeof___impl(self);
+    _return_value = _pickle_Unpickler___sizeof___impl((UnpicklerObject *)self);
     if ((_return_value == (size_t)-1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -566,9 +566,9 @@ static PyObject *
 _pickle_UnpicklerMemoProxy_clear_impl(UnpicklerMemoProxyObject *self);
 
 static PyObject *
-_pickle_UnpicklerMemoProxy_clear(UnpicklerMemoProxyObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_UnpicklerMemoProxy_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_UnpicklerMemoProxy_clear_impl(self);
+    return _pickle_UnpicklerMemoProxy_clear_impl((UnpicklerMemoProxyObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_UnpicklerMemoProxy_copy__doc__,
@@ -584,9 +584,9 @@ static PyObject *
 _pickle_UnpicklerMemoProxy_copy_impl(UnpicklerMemoProxyObject *self);
 
 static PyObject *
-_pickle_UnpicklerMemoProxy_copy(UnpicklerMemoProxyObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_UnpicklerMemoProxy_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_UnpicklerMemoProxy_copy_impl(self);
+    return _pickle_UnpicklerMemoProxy_copy_impl((UnpicklerMemoProxyObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_UnpicklerMemoProxy___reduce____doc__,
@@ -602,9 +602,9 @@ static PyObject *
 _pickle_UnpicklerMemoProxy___reduce___impl(UnpicklerMemoProxyObject *self);
 
 static PyObject *
-_pickle_UnpicklerMemoProxy___reduce__(UnpicklerMemoProxyObject *self, PyObject *Py_UNUSED(ignored))
+_pickle_UnpicklerMemoProxy___reduce__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _pickle_UnpicklerMemoProxy___reduce___impl(self);
+    return _pickle_UnpicklerMemoProxy___reduce___impl((UnpicklerMemoProxyObject *)self);
 }
 
 PyDoc_STRVAR(_pickle_dump__doc__,
@@ -1086,4 +1086,4 @@ _pickle_loads(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=48ceb6687a8e716c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d71dc73af298ebe8 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_queuemodule.c.h b/Modules/clinic/_queuemodule.c.h
index f0d4a3a164cd5f..2dfc3e6be1984e 100644
--- a/Modules/clinic/_queuemodule.c.h
+++ b/Modules/clinic/_queuemodule.c.h
@@ -55,7 +55,7 @@ _queue_SimpleQueue_put_impl(simplequeueobject *self, PyObject *item,
                             int block, PyObject *timeout);
 
 static PyObject *
-_queue_SimpleQueue_put(simplequeueobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_queue_SimpleQueue_put(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -110,7 +110,7 @@ _queue_SimpleQueue_put(simplequeueobject *self, PyObject *const *args, Py_ssize_
     timeout = args[2];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _queue_SimpleQueue_put_impl(self, item, block, timeout);
+    return_value = _queue_SimpleQueue_put_impl((simplequeueobject *)self, item, block, timeout);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -133,7 +133,7 @@ static PyObject *
 _queue_SimpleQueue_put_nowait_impl(simplequeueobject *self, PyObject *item);
 
 static PyObject *
-_queue_SimpleQueue_put_nowait(simplequeueobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_queue_SimpleQueue_put_nowait(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -171,7 +171,7 @@ _queue_SimpleQueue_put_nowait(simplequeueobject *self, PyObject *const *args, Py
     }
     item = args[0];
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _queue_SimpleQueue_put_nowait_impl(self, item);
+    return_value = _queue_SimpleQueue_put_nowait_impl((simplequeueobject *)self, item);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -200,7 +200,7 @@ _queue_SimpleQueue_get_impl(simplequeueobject *self, PyTypeObject *cls,
                             int block, PyObject *timeout_obj);
 
 static PyObject *
-_queue_SimpleQueue_get(simplequeueobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_queue_SimpleQueue_get(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -253,7 +253,7 @@ _queue_SimpleQueue_get(simplequeueobject *self, PyTypeObject *cls, PyObject *con
     timeout_obj = args[1];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _queue_SimpleQueue_get_impl(self, cls, block, timeout_obj);
+    return_value = _queue_SimpleQueue_get_impl((simplequeueobject *)self, cls, block, timeout_obj);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -277,7 +277,7 @@ _queue_SimpleQueue_get_nowait_impl(simplequeueobject *self,
                                    PyTypeObject *cls);
 
 static PyObject *
-_queue_SimpleQueue_get_nowait(simplequeueobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_queue_SimpleQueue_get_nowait(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
 
@@ -286,7 +286,7 @@ _queue_SimpleQueue_get_nowait(simplequeueobject *self, PyTypeObject *cls, PyObje
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _queue_SimpleQueue_get_nowait_impl(self, cls);
+    return_value = _queue_SimpleQueue_get_nowait_impl((simplequeueobject *)self, cls);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -306,13 +306,13 @@ static int
 _queue_SimpleQueue_empty_impl(simplequeueobject *self);
 
 static PyObject *
-_queue_SimpleQueue_empty(simplequeueobject *self, PyObject *Py_UNUSED(ignored))
+_queue_SimpleQueue_empty(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     int _return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    _return_value = _queue_SimpleQueue_empty_impl(self);
+    _return_value = _queue_SimpleQueue_empty_impl((simplequeueobject *)self);
     Py_END_CRITICAL_SECTION();
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -336,13 +336,13 @@ static Py_ssize_t
 _queue_SimpleQueue_qsize_impl(simplequeueobject *self);
 
 static PyObject *
-_queue_SimpleQueue_qsize(simplequeueobject *self, PyObject *Py_UNUSED(ignored))
+_queue_SimpleQueue_qsize(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     Py_ssize_t _return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    _return_value = _queue_SimpleQueue_qsize_impl(self);
+    _return_value = _queue_SimpleQueue_qsize_impl((simplequeueobject *)self);
     Py_END_CRITICAL_SECTION();
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -352,4 +352,4 @@ _queue_SimpleQueue_qsize(simplequeueobject *self, PyObject *Py_UNUSED(ignored))
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=07b5742dca7692d9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e04e15a1b959c700 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_randommodule.c.h b/Modules/clinic/_randommodule.c.h
index 6193acac67e7ac..b2d67e11c63595 100644
--- a/Modules/clinic/_randommodule.c.h
+++ b/Modules/clinic/_randommodule.c.h
@@ -18,12 +18,12 @@ static PyObject *
 _random_Random_random_impl(RandomObject *self);
 
 static PyObject *
-_random_Random_random(RandomObject *self, PyObject *Py_UNUSED(ignored))
+_random_Random_random(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _random_Random_random_impl(self);
+    return_value = _random_Random_random_impl((RandomObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -45,7 +45,7 @@ static PyObject *
 _random_Random_seed_impl(RandomObject *self, PyObject *n);
 
 static PyObject *
-_random_Random_seed(RandomObject *self, PyObject *const *args, Py_ssize_t nargs)
+_random_Random_seed(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *n = Py_None;
@@ -59,7 +59,7 @@ _random_Random_seed(RandomObject *self, PyObject *const *args, Py_ssize_t nargs)
     n = args[0];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _random_Random_seed_impl(self, n);
+    return_value = _random_Random_seed_impl((RandomObject *)self, n);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -79,12 +79,12 @@ static PyObject *
 _random_Random_getstate_impl(RandomObject *self);
 
 static PyObject *
-_random_Random_getstate(RandomObject *self, PyObject *Py_UNUSED(ignored))
+_random_Random_getstate(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _random_Random_getstate_impl(self);
+    return_value = _random_Random_getstate_impl((RandomObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -108,7 +108,7 @@ _random_Random_setstate(RandomObject *self, PyObject *state)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _random_Random_setstate_impl(self, state);
+    return_value = _random_Random_setstate_impl((RandomObject *)self, state);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -127,7 +127,7 @@ static PyObject *
 _random_Random_getrandbits_impl(RandomObject *self, int k);
 
 static PyObject *
-_random_Random_getrandbits(RandomObject *self, PyObject *arg)
+_random_Random_getrandbits(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int k;
@@ -137,10 +137,10 @@ _random_Random_getrandbits(RandomObject *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _random_Random_getrandbits_impl(self, k);
+    return_value = _random_Random_getrandbits_impl((RandomObject *)self, k);
     Py_END_CRITICAL_SECTION();
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=bf49ece1d341b1b6 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=859cfbf59c133a4e input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h
index becdb9cc1831fa..73c5d304f1a141 100644
--- a/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@ -21,12 +21,12 @@ static PyObject *
 _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_do_handshake(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_do_handshake(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_do_handshake_impl(self);
+    return_value = _ssl__SSLSocket_do_handshake_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -79,7 +79,7 @@ static PyObject *
 _ssl__SSLSocket_getpeercert_impl(PySSLSocket *self, int binary_mode);
 
 static PyObject *
-_ssl__SSLSocket_getpeercert(PySSLSocket *self, PyObject *const *args, Py_ssize_t nargs)
+_ssl__SSLSocket_getpeercert(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int binary_mode = 0;
@@ -96,7 +96,7 @@ _ssl__SSLSocket_getpeercert(PySSLSocket *self, PyObject *const *args, Py_ssize_t
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_getpeercert_impl(self, binary_mode);
+    return_value = _ssl__SSLSocket_getpeercert_impl((PySSLSocket *)self, binary_mode);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -115,12 +115,12 @@ static PyObject *
 _ssl__SSLSocket_get_verified_chain_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_get_verified_chain(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_get_verified_chain(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_get_verified_chain_impl(self);
+    return_value = _ssl__SSLSocket_get_verified_chain_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -138,12 +138,12 @@ static PyObject *
 _ssl__SSLSocket_get_unverified_chain_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_get_unverified_chain(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_get_unverified_chain(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_get_unverified_chain_impl(self);
+    return_value = _ssl__SSLSocket_get_unverified_chain_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -161,12 +161,12 @@ static PyObject *
 _ssl__SSLSocket_shared_ciphers_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_shared_ciphers(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_shared_ciphers(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_shared_ciphers_impl(self);
+    return_value = _ssl__SSLSocket_shared_ciphers_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -184,12 +184,12 @@ static PyObject *
 _ssl__SSLSocket_cipher_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_cipher(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_cipher(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_cipher_impl(self);
+    return_value = _ssl__SSLSocket_cipher_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -207,12 +207,12 @@ static PyObject *
 _ssl__SSLSocket_version_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_version(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_version(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_version_impl(self);
+    return_value = _ssl__SSLSocket_version_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -230,12 +230,12 @@ static PyObject *
 _ssl__SSLSocket_selected_alpn_protocol_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_selected_alpn_protocol(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_selected_alpn_protocol(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_selected_alpn_protocol_impl(self);
+    return_value = _ssl__SSLSocket_selected_alpn_protocol_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -253,9 +253,9 @@ static PyObject *
 _ssl__SSLSocket_compression_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_compression(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_compression(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _ssl__SSLSocket_compression_impl(self);
+    return _ssl__SSLSocket_compression_impl((PySSLSocket *)self);
 }
 
 PyDoc_STRVAR(_ssl__SSLSocket_context__doc__,
@@ -283,12 +283,12 @@ static PyObject *
 _ssl__SSLSocket_context_get_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_context_get(PySSLSocket *self, void *Py_UNUSED(context))
+_ssl__SSLSocket_context_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_context_get_impl(self);
+    return_value = _ssl__SSLSocket_context_get_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -308,12 +308,12 @@ static int
 _ssl__SSLSocket_context_set_impl(PySSLSocket *self, PyObject *value);
 
 static int
-_ssl__SSLSocket_context_set(PySSLSocket *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLSocket_context_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_context_set_impl(self, value);
+    return_value = _ssl__SSLSocket_context_set_impl((PySSLSocket *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -340,12 +340,12 @@ static PyObject *
 _ssl__SSLSocket_server_side_get_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_server_side_get(PySSLSocket *self, void *Py_UNUSED(context))
+_ssl__SSLSocket_server_side_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_server_side_get_impl(self);
+    return_value = _ssl__SSLSocket_server_side_get_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -372,12 +372,12 @@ static PyObject *
 _ssl__SSLSocket_server_hostname_get_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_server_hostname_get(PySSLSocket *self, void *Py_UNUSED(context))
+_ssl__SSLSocket_server_hostname_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_server_hostname_get_impl(self);
+    return_value = _ssl__SSLSocket_server_hostname_get_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -406,12 +406,12 @@ static PyObject *
 _ssl__SSLSocket_owner_get_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_owner_get(PySSLSocket *self, void *Py_UNUSED(context))
+_ssl__SSLSocket_owner_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_owner_get_impl(self);
+    return_value = _ssl__SSLSocket_owner_get_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -431,12 +431,12 @@ static int
 _ssl__SSLSocket_owner_set_impl(PySSLSocket *self, PyObject *value);
 
 static int
-_ssl__SSLSocket_owner_set(PySSLSocket *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLSocket_owner_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_owner_set_impl(self, value);
+    return_value = _ssl__SSLSocket_owner_set_impl((PySSLSocket *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -457,7 +457,7 @@ static PyObject *
 _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b);
 
 static PyObject *
-_ssl__SSLSocket_write(PySSLSocket *self, PyObject *arg)
+_ssl__SSLSocket_write(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer b = {NULL, NULL};
@@ -466,7 +466,7 @@ _ssl__SSLSocket_write(PySSLSocket *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_write_impl(self, &b);
+    return_value = _ssl__SSLSocket_write_impl((PySSLSocket *)self, &b);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -491,12 +491,12 @@ static PyObject *
 _ssl__SSLSocket_pending_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_pending(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_pending(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_pending_impl(self);
+    return_value = _ssl__SSLSocket_pending_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -514,7 +514,7 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
                           int group_right_1, Py_buffer *buffer);
 
 static PyObject *
-_ssl__SSLSocket_read(PySSLSocket *self, PyObject *args)
+_ssl__SSLSocket_read(PyObject *self, PyObject *args)
 {
     PyObject *return_value = NULL;
     Py_ssize_t len;
@@ -538,7 +538,7 @@ _ssl__SSLSocket_read(PySSLSocket *self, PyObject *args)
             goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_read_impl(self, len, group_right_1, &buffer);
+    return_value = _ssl__SSLSocket_read_impl((PySSLSocket *)self, len, group_right_1, &buffer);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -563,12 +563,12 @@ static PyObject *
 _ssl__SSLSocket_shutdown_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_shutdown(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_shutdown(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_shutdown_impl(self);
+    return_value = _ssl__SSLSocket_shutdown_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -592,7 +592,7 @@ _ssl__SSLSocket_get_channel_binding_impl(PySSLSocket *self,
                                          const char *cb_type);
 
 static PyObject *
-_ssl__SSLSocket_get_channel_binding(PySSLSocket *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLSocket_get_channel_binding(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -647,7 +647,7 @@ _ssl__SSLSocket_get_channel_binding(PySSLSocket *self, PyObject *const *args, Py
     }
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_get_channel_binding_impl(self, cb_type);
+    return_value = _ssl__SSLSocket_get_channel_binding_impl((PySSLSocket *)self, cb_type);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -667,12 +667,12 @@ static PyObject *
 _ssl__SSLSocket_verify_client_post_handshake_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_verify_client_post_handshake(PySSLSocket *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLSocket_verify_client_post_handshake(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_verify_client_post_handshake_impl(self);
+    return_value = _ssl__SSLSocket_verify_client_post_handshake_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -699,12 +699,12 @@ static PyObject *
 _ssl__SSLSocket_session_get_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_session_get(PySSLSocket *self, void *Py_UNUSED(context))
+_ssl__SSLSocket_session_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_session_get_impl(self);
+    return_value = _ssl__SSLSocket_session_get_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -724,12 +724,12 @@ static int
 _ssl__SSLSocket_session_set_impl(PySSLSocket *self, PyObject *value);
 
 static int
-_ssl__SSLSocket_session_set(PySSLSocket *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLSocket_session_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_session_set_impl(self, value);
+    return_value = _ssl__SSLSocket_session_set_impl((PySSLSocket *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -756,12 +756,12 @@ static PyObject *
 _ssl__SSLSocket_session_reused_get_impl(PySSLSocket *self);
 
 static PyObject *
-_ssl__SSLSocket_session_reused_get(PySSLSocket *self, void *Py_UNUSED(context))
+_ssl__SSLSocket_session_reused_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLSocket_session_reused_get_impl(self);
+    return_value = _ssl__SSLSocket_session_reused_get_impl((PySSLSocket *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -808,7 +808,7 @@ static PyObject *
 _ssl__SSLContext_set_ciphers_impl(PySSLContext *self, const char *cipherlist);
 
 static PyObject *
-_ssl__SSLContext_set_ciphers(PySSLContext *self, PyObject *arg)
+_ssl__SSLContext_set_ciphers(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *cipherlist;
@@ -827,7 +827,7 @@ _ssl__SSLContext_set_ciphers(PySSLContext *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_set_ciphers_impl(self, cipherlist);
+    return_value = _ssl__SSLContext_set_ciphers_impl((PySSLContext *)self, cipherlist);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -846,12 +846,12 @@ static PyObject *
 _ssl__SSLContext_get_ciphers_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_get_ciphers(PySSLContext *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLContext_get_ciphers(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_get_ciphers_impl(self);
+    return_value = _ssl__SSLContext_get_ciphers_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -870,7 +870,7 @@ _ssl__SSLContext__set_alpn_protocols_impl(PySSLContext *self,
                                           Py_buffer *protos);
 
 static PyObject *
-_ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg)
+_ssl__SSLContext__set_alpn_protocols(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer protos = {NULL, NULL};
@@ -879,7 +879,7 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext__set_alpn_protocols_impl(self, &protos);
+    return_value = _ssl__SSLContext__set_alpn_protocols_impl((PySSLContext *)self, &protos);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -905,12 +905,12 @@ static PyObject *
 _ssl__SSLContext_verify_mode_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_verify_mode_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_verify_mode_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_verify_mode_get_impl(self);
+    return_value = _ssl__SSLContext_verify_mode_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -930,12 +930,12 @@ static int
 _ssl__SSLContext_verify_mode_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext_verify_mode_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_verify_mode_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_verify_mode_set_impl(self, value);
+    return_value = _ssl__SSLContext_verify_mode_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -955,12 +955,12 @@ static PyObject *
 _ssl__SSLContext_verify_flags_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_verify_flags_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_verify_flags_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_verify_flags_get_impl(self);
+    return_value = _ssl__SSLContext_verify_flags_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -980,12 +980,12 @@ static int
 _ssl__SSLContext_verify_flags_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext_verify_flags_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_verify_flags_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_verify_flags_set_impl(self, value);
+    return_value = _ssl__SSLContext_verify_flags_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1005,12 +1005,12 @@ static PyObject *
 _ssl__SSLContext_minimum_version_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_minimum_version_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_minimum_version_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_minimum_version_get_impl(self);
+    return_value = _ssl__SSLContext_minimum_version_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1031,12 +1031,12 @@ _ssl__SSLContext_minimum_version_set_impl(PySSLContext *self,
                                           PyObject *value);
 
 static int
-_ssl__SSLContext_minimum_version_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_minimum_version_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_minimum_version_set_impl(self, value);
+    return_value = _ssl__SSLContext_minimum_version_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1056,12 +1056,12 @@ static PyObject *
 _ssl__SSLContext_maximum_version_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_maximum_version_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_maximum_version_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_maximum_version_get_impl(self);
+    return_value = _ssl__SSLContext_maximum_version_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1082,12 +1082,12 @@ _ssl__SSLContext_maximum_version_set_impl(PySSLContext *self,
                                           PyObject *value);
 
 static int
-_ssl__SSLContext_maximum_version_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_maximum_version_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_maximum_version_set_impl(self, value);
+    return_value = _ssl__SSLContext_maximum_version_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1114,12 +1114,12 @@ static PyObject *
 _ssl__SSLContext_num_tickets_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_num_tickets_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_num_tickets_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_num_tickets_get_impl(self);
+    return_value = _ssl__SSLContext_num_tickets_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1139,12 +1139,12 @@ static int
 _ssl__SSLContext_num_tickets_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext_num_tickets_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_num_tickets_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_num_tickets_set_impl(self, value);
+    return_value = _ssl__SSLContext_num_tickets_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1171,12 +1171,12 @@ static PyObject *
 _ssl__SSLContext_security_level_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_security_level_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_security_level_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_security_level_get_impl(self);
+    return_value = _ssl__SSLContext_security_level_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1196,12 +1196,12 @@ static PyObject *
 _ssl__SSLContext_options_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_options_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_options_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_options_get_impl(self);
+    return_value = _ssl__SSLContext_options_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1221,12 +1221,12 @@ static int
 _ssl__SSLContext_options_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext_options_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_options_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_options_set_impl(self, value);
+    return_value = _ssl__SSLContext_options_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1246,12 +1246,12 @@ static PyObject *
 _ssl__SSLContext__host_flags_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext__host_flags_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext__host_flags_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext__host_flags_get_impl(self);
+    return_value = _ssl__SSLContext__host_flags_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1271,12 +1271,12 @@ static int
 _ssl__SSLContext__host_flags_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext__host_flags_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext__host_flags_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext__host_flags_set_impl(self, value);
+    return_value = _ssl__SSLContext__host_flags_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1296,12 +1296,12 @@ static PyObject *
 _ssl__SSLContext_check_hostname_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_check_hostname_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_check_hostname_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_check_hostname_get_impl(self);
+    return_value = _ssl__SSLContext_check_hostname_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1321,12 +1321,12 @@ static int
 _ssl__SSLContext_check_hostname_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext_check_hostname_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_check_hostname_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_check_hostname_set_impl(self, value);
+    return_value = _ssl__SSLContext_check_hostname_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1346,12 +1346,12 @@ static PyObject *
 _ssl__SSLContext_protocol_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_protocol_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_protocol_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_protocol_get_impl(self);
+    return_value = _ssl__SSLContext_protocol_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1370,7 +1370,7 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
                                       PyObject *keyfile, PyObject *password);
 
 static PyObject *
-_ssl__SSLContext_load_cert_chain(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext_load_cert_chain(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1422,7 +1422,7 @@ _ssl__SSLContext_load_cert_chain(PySSLContext *self, PyObject *const *args, Py_s
     password = args[2];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_load_cert_chain_impl(self, certfile, keyfile, password);
+    return_value = _ssl__SSLContext_load_cert_chain_impl((PySSLContext *)self, certfile, keyfile, password);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1444,7 +1444,7 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
                                             PyObject *cadata);
 
 static PyObject *
-_ssl__SSLContext_load_verify_locations(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext_load_verify_locations(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1501,7 +1501,7 @@ _ssl__SSLContext_load_verify_locations(PySSLContext *self, PyObject *const *args
     cadata = args[2];
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_load_verify_locations_impl(self, cafile, capath, cadata);
+    return_value = _ssl__SSLContext_load_verify_locations_impl((PySSLContext *)self, cafile, capath, cadata);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1525,7 +1525,7 @@ _ssl__SSLContext_load_dh_params(PySSLContext *self, PyObject *filepath)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_load_dh_params_impl(self, filepath);
+    return_value = _ssl__SSLContext_load_dh_params_impl((PySSLContext *)self, filepath);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1546,7 +1546,7 @@ _ssl__SSLContext__wrap_socket_impl(PySSLContext *self, PyObject *sock,
                                    PyObject *owner, PyObject *session);
 
 static PyObject *
-_ssl__SSLContext__wrap_socket(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext__wrap_socket(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1618,7 +1618,7 @@ _ssl__SSLContext__wrap_socket(PySSLContext *self, PyObject *const *args, Py_ssiz
     session = args[4];
 skip_optional_kwonly:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext__wrap_socket_impl(self, sock, server_side, hostname_obj, owner, session);
+    return_value = _ssl__SSLContext__wrap_socket_impl((PySSLContext *)self, sock, server_side, hostname_obj, owner, session);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1641,7 +1641,7 @@ _ssl__SSLContext__wrap_bio_impl(PySSLContext *self, PySSLMemoryBIO *incoming,
                                 PyObject *session);
 
 static PyObject *
-_ssl__SSLContext__wrap_bio(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext__wrap_bio(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1719,7 +1719,7 @@ _ssl__SSLContext__wrap_bio(PySSLContext *self, PyObject *const *args, Py_ssize_t
     session = args[5];
 skip_optional_kwonly:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext__wrap_bio_impl(self, incoming, outgoing, server_side, hostname_obj, owner, session);
+    return_value = _ssl__SSLContext__wrap_bio_impl((PySSLContext *)self, incoming, outgoing, server_side, hostname_obj, owner, session);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1738,12 +1738,12 @@ static PyObject *
 _ssl__SSLContext_session_stats_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_session_stats(PySSLContext *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLContext_session_stats(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_session_stats_impl(self);
+    return_value = _ssl__SSLContext_session_stats_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1761,12 +1761,12 @@ static PyObject *
 _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_set_default_verify_paths(PySSLContext *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLContext_set_default_verify_paths(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_set_default_verify_paths_impl(self);
+    return_value = _ssl__SSLContext_set_default_verify_paths_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1789,7 +1789,7 @@ _ssl__SSLContext_set_ecdh_curve(PySSLContext *self, PyObject *name)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_set_ecdh_curve_impl(self, name);
+    return_value = _ssl__SSLContext_set_ecdh_curve_impl((PySSLContext *)self, name);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1821,12 +1821,12 @@ static PyObject *
 _ssl__SSLContext_sni_callback_get_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_sni_callback_get(PySSLContext *self, void *Py_UNUSED(context))
+_ssl__SSLContext_sni_callback_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_sni_callback_get_impl(self);
+    return_value = _ssl__SSLContext_sni_callback_get_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1846,12 +1846,12 @@ static int
 _ssl__SSLContext_sni_callback_set_impl(PySSLContext *self, PyObject *value);
 
 static int
-_ssl__SSLContext_sni_callback_set(PySSLContext *self, PyObject *value, void *Py_UNUSED(context))
+_ssl__SSLContext_sni_callback_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 {
     int return_value;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_sni_callback_set_impl(self, value);
+    return_value = _ssl__SSLContext_sni_callback_set_impl((PySSLContext *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1876,12 +1876,12 @@ static PyObject *
 _ssl__SSLContext_cert_store_stats_impl(PySSLContext *self);
 
 static PyObject *
-_ssl__SSLContext_cert_store_stats(PySSLContext *self, PyObject *Py_UNUSED(ignored))
+_ssl__SSLContext_cert_store_stats(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_cert_store_stats_impl(self);
+    return_value = _ssl__SSLContext_cert_store_stats_impl((PySSLContext *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1906,7 +1906,7 @@ static PyObject *
 _ssl__SSLContext_get_ca_certs_impl(PySSLContext *self, int binary_form);
 
 static PyObject *
-_ssl__SSLContext_get_ca_certs(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext_get_ca_certs(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1952,7 +1952,7 @@ _ssl__SSLContext_get_ca_certs(PySSLContext *self, PyObject *const *args, Py_ssiz
     }
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_get_ca_certs_impl(self, binary_form);
+    return_value = _ssl__SSLContext_get_ca_certs_impl((PySSLContext *)self, binary_form);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -1972,7 +1972,7 @@ _ssl__SSLContext_set_psk_client_callback_impl(PySSLContext *self,
                                               PyObject *callback);
 
 static PyObject *
-_ssl__SSLContext_set_psk_client_callback(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext_set_psk_client_callback(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -2010,7 +2010,7 @@ _ssl__SSLContext_set_psk_client_callback(PySSLContext *self, PyObject *const *ar
     }
     callback = args[0];
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_set_psk_client_callback_impl(self, callback);
+    return_value = _ssl__SSLContext_set_psk_client_callback_impl((PySSLContext *)self, callback);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -2031,7 +2031,7 @@ _ssl__SSLContext_set_psk_server_callback_impl(PySSLContext *self,
                                               const char *identity_hint);
 
 static PyObject *
-_ssl__SSLContext_set_psk_server_callback(PySSLContext *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_ssl__SSLContext_set_psk_server_callback(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -2093,7 +2093,7 @@ _ssl__SSLContext_set_psk_server_callback(PySSLContext *self, PyObject *const *ar
     }
 skip_optional_pos:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl__SSLContext_set_psk_server_callback_impl(self, callback, identity_hint);
+    return_value = _ssl__SSLContext_set_psk_server_callback_impl((PySSLContext *)self, callback, identity_hint);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -2146,12 +2146,12 @@ static PyObject *
 _ssl_MemoryBIO_pending_get_impl(PySSLMemoryBIO *self);
 
 static PyObject *
-_ssl_MemoryBIO_pending_get(PySSLMemoryBIO *self, void *Py_UNUSED(context))
+_ssl_MemoryBIO_pending_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_MemoryBIO_pending_get_impl(self);
+    return_value = _ssl_MemoryBIO_pending_get_impl((PySSLMemoryBIO *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2178,12 +2178,12 @@ static PyObject *
 _ssl_MemoryBIO_eof_get_impl(PySSLMemoryBIO *self);
 
 static PyObject *
-_ssl_MemoryBIO_eof_get(PySSLMemoryBIO *self, void *Py_UNUSED(context))
+_ssl_MemoryBIO_eof_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_MemoryBIO_eof_get_impl(self);
+    return_value = _ssl_MemoryBIO_eof_get_impl((PySSLMemoryBIO *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2207,7 +2207,7 @@ static PyObject *
 _ssl_MemoryBIO_read_impl(PySSLMemoryBIO *self, int len);
 
 static PyObject *
-_ssl_MemoryBIO_read(PySSLMemoryBIO *self, PyObject *const *args, Py_ssize_t nargs)
+_ssl_MemoryBIO_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int len = -1;
@@ -2224,7 +2224,7 @@ _ssl_MemoryBIO_read(PySSLMemoryBIO *self, PyObject *const *args, Py_ssize_t narg
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_MemoryBIO_read_impl(self, len);
+    return_value = _ssl_MemoryBIO_read_impl((PySSLMemoryBIO *)self, len);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -2246,7 +2246,7 @@ static PyObject *
 _ssl_MemoryBIO_write_impl(PySSLMemoryBIO *self, Py_buffer *b);
 
 static PyObject *
-_ssl_MemoryBIO_write(PySSLMemoryBIO *self, PyObject *arg)
+_ssl_MemoryBIO_write(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer b = {NULL, NULL};
@@ -2255,7 +2255,7 @@ _ssl_MemoryBIO_write(PySSLMemoryBIO *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_MemoryBIO_write_impl(self, &b);
+    return_value = _ssl_MemoryBIO_write_impl((PySSLMemoryBIO *)self, &b);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -2282,12 +2282,12 @@ static PyObject *
 _ssl_MemoryBIO_write_eof_impl(PySSLMemoryBIO *self);
 
 static PyObject *
-_ssl_MemoryBIO_write_eof(PySSLMemoryBIO *self, PyObject *Py_UNUSED(ignored))
+_ssl_MemoryBIO_write_eof(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_MemoryBIO_write_eof_impl(self);
+    return_value = _ssl_MemoryBIO_write_eof_impl((PySSLMemoryBIO *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2314,12 +2314,12 @@ static PyObject *
 _ssl_SSLSession_time_get_impl(PySSLSession *self);
 
 static PyObject *
-_ssl_SSLSession_time_get(PySSLSession *self, void *Py_UNUSED(context))
+_ssl_SSLSession_time_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_SSLSession_time_get_impl(self);
+    return_value = _ssl_SSLSession_time_get_impl((PySSLSession *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2346,12 +2346,12 @@ static PyObject *
 _ssl_SSLSession_timeout_get_impl(PySSLSession *self);
 
 static PyObject *
-_ssl_SSLSession_timeout_get(PySSLSession *self, void *Py_UNUSED(context))
+_ssl_SSLSession_timeout_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_SSLSession_timeout_get_impl(self);
+    return_value = _ssl_SSLSession_timeout_get_impl((PySSLSession *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2378,12 +2378,12 @@ static PyObject *
 _ssl_SSLSession_ticket_lifetime_hint_get_impl(PySSLSession *self);
 
 static PyObject *
-_ssl_SSLSession_ticket_lifetime_hint_get(PySSLSession *self, void *Py_UNUSED(context))
+_ssl_SSLSession_ticket_lifetime_hint_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_SSLSession_ticket_lifetime_hint_get_impl(self);
+    return_value = _ssl_SSLSession_ticket_lifetime_hint_get_impl((PySSLSession *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2410,12 +2410,12 @@ static PyObject *
 _ssl_SSLSession_id_get_impl(PySSLSession *self);
 
 static PyObject *
-_ssl_SSLSession_id_get(PySSLSession *self, void *Py_UNUSED(context))
+_ssl_SSLSession_id_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_SSLSession_id_get_impl(self);
+    return_value = _ssl_SSLSession_id_get_impl((PySSLSession *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2442,12 +2442,12 @@ static PyObject *
 _ssl_SSLSession_has_ticket_get_impl(PySSLSession *self);
 
 static PyObject *
-_ssl_SSLSession_has_ticket_get(PySSLSession *self, void *Py_UNUSED(context))
+_ssl_SSLSession_has_ticket_get(PyObject *self, void *Py_UNUSED(context))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = _ssl_SSLSession_has_ticket_get_impl(self);
+    return_value = _ssl_SSLSession_has_ticket_get_impl((PySSLSession *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -2878,4 +2878,4 @@ _ssl_enum_crls(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje
 #ifndef _SSL_ENUM_CRLS_METHODDEF
     #define _SSL_ENUM_CRLS_METHODDEF
 #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
-/*[clinic end generated code: output=e71f1ef621aead08 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bededfb2b927bd41 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h
index cfc2fe7fc1dd58..7cf179f7a69d55 100644
--- a/Modules/clinic/_struct.c.h
+++ b/Modules/clinic/_struct.c.h
@@ -87,7 +87,7 @@ static PyObject *
 Struct_unpack_impl(PyStructObject *self, Py_buffer *buffer);
 
 static PyObject *
-Struct_unpack(PyStructObject *self, PyObject *arg)
+Struct_unpack(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer buffer = {NULL, NULL};
@@ -95,7 +95,7 @@ Struct_unpack(PyStructObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = Struct_unpack_impl(self, &buffer);
+    return_value = Struct_unpack_impl((PyStructObject *)self, &buffer);
 
 exit:
     /* Cleanup for buffer */
@@ -127,7 +127,7 @@ Struct_unpack_from_impl(PyStructObject *self, Py_buffer *buffer,
                         Py_ssize_t offset);
 
 static PyObject *
-Struct_unpack_from(PyStructObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+Struct_unpack_from(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -184,7 +184,7 @@ Struct_unpack_from(PyStructObject *self, PyObject *const *args, Py_ssize_t nargs
         offset = ival;
     }
 skip_optional_pos:
-    return_value = Struct_unpack_from_impl(self, &buffer, offset);
+    return_value = Struct_unpack_from_impl((PyStructObject *)self, &buffer, offset);
 
 exit:
     /* Cleanup for buffer */
@@ -439,4 +439,4 @@ iter_unpack(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 
     return return_value;
 }
-/*[clinic end generated code: output=faff90f99c6bd09f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ec540c21be08e1d0 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_testmultiphase.c.h b/Modules/clinic/_testmultiphase.c.h
index 5a432a6f70386d..01c29c0753ae13 100644
--- a/Modules/clinic/_testmultiphase.c.h
+++ b/Modules/clinic/_testmultiphase.c.h
@@ -25,13 +25,13 @@ _testmultiphase_StateAccessType_get_defining_module_impl(StateAccessTypeObject *
                                                          PyTypeObject *cls);
 
 static PyObject *
-_testmultiphase_StateAccessType_get_defining_module(StateAccessTypeObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_testmultiphase_StateAccessType_get_defining_module(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "get_defining_module() takes no arguments");
         return NULL;
     }
-    return _testmultiphase_StateAccessType_get_defining_module_impl(self, cls);
+    return _testmultiphase_StateAccessType_get_defining_module_impl((StateAccessTypeObject *)self, cls);
 }
 
 PyDoc_STRVAR(_testmultiphase_StateAccessType_getmodulebydef_bad_def__doc__,
@@ -48,13 +48,13 @@ _testmultiphase_StateAccessType_getmodulebydef_bad_def_impl(StateAccessTypeObjec
                                                             PyTypeObject *cls);
 
 static PyObject *
-_testmultiphase_StateAccessType_getmodulebydef_bad_def(StateAccessTypeObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_testmultiphase_StateAccessType_getmodulebydef_bad_def(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "getmodulebydef_bad_def() takes no arguments");
         return NULL;
     }
-    return _testmultiphase_StateAccessType_getmodulebydef_bad_def_impl(self, cls);
+    return _testmultiphase_StateAccessType_getmodulebydef_bad_def_impl((StateAccessTypeObject *)self, cls);
 }
 
 PyDoc_STRVAR(_testmultiphase_StateAccessType_increment_count_clinic__doc__,
@@ -76,7 +76,7 @@ _testmultiphase_StateAccessType_increment_count_clinic_impl(StateAccessTypeObjec
                                                             int n, int twice);
 
 static PyObject *
-_testmultiphase_StateAccessType_increment_count_clinic(StateAccessTypeObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_testmultiphase_StateAccessType_increment_count_clinic(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -135,7 +135,7 @@ _testmultiphase_StateAccessType_increment_count_clinic(StateAccessTypeObject *se
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = _testmultiphase_StateAccessType_increment_count_clinic_impl(self, cls, n, twice);
+    return_value = _testmultiphase_StateAccessType_increment_count_clinic_impl((StateAccessTypeObject *)self, cls, n, twice);
 
 exit:
     return return_value;
@@ -155,12 +155,12 @@ _testmultiphase_StateAccessType_get_count_impl(StateAccessTypeObject *self,
                                                PyTypeObject *cls);
 
 static PyObject *
-_testmultiphase_StateAccessType_get_count(StateAccessTypeObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_testmultiphase_StateAccessType_get_count(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "get_count() takes no arguments");
         return NULL;
     }
-    return _testmultiphase_StateAccessType_get_count_impl(self, cls);
+    return _testmultiphase_StateAccessType_get_count_impl((StateAccessTypeObject *)self, cls);
 }
-/*[clinic end generated code: output=c1aa0af3572bf059 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ea0ca98e467e53c2 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_tkinter.c.h b/Modules/clinic/_tkinter.c.h
index 2b1ac954b4d570..d6e783b04fe968 100644
--- a/Modules/clinic/_tkinter.c.h
+++ b/Modules/clinic/_tkinter.c.h
@@ -16,7 +16,7 @@ static PyObject *
 _tkinter_tkapp_eval_impl(TkappObject *self, const char *script);
 
 static PyObject *
-_tkinter_tkapp_eval(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_eval(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *script;
@@ -34,7 +34,7 @@ _tkinter_tkapp_eval(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_eval_impl(self, script);
+    return_value = _tkinter_tkapp_eval_impl((TkappObject *)self, script);
 
 exit:
     return return_value;
@@ -52,7 +52,7 @@ static PyObject *
 _tkinter_tkapp_evalfile_impl(TkappObject *self, const char *fileName);
 
 static PyObject *
-_tkinter_tkapp_evalfile(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_evalfile(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *fileName;
@@ -70,7 +70,7 @@ _tkinter_tkapp_evalfile(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_evalfile_impl(self, fileName);
+    return_value = _tkinter_tkapp_evalfile_impl((TkappObject *)self, fileName);
 
 exit:
     return return_value;
@@ -88,7 +88,7 @@ static PyObject *
 _tkinter_tkapp_record_impl(TkappObject *self, const char *script);
 
 static PyObject *
-_tkinter_tkapp_record(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_record(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *script;
@@ -106,7 +106,7 @@ _tkinter_tkapp_record(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_record_impl(self, script);
+    return_value = _tkinter_tkapp_record_impl((TkappObject *)self, script);
 
 exit:
     return return_value;
@@ -124,7 +124,7 @@ static PyObject *
 _tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg);
 
 static PyObject *
-_tkinter_tkapp_adderrorinfo(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_adderrorinfo(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *msg;
@@ -142,7 +142,7 @@ _tkinter_tkapp_adderrorinfo(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_adderrorinfo_impl(self, msg);
+    return_value = _tkinter_tkapp_adderrorinfo_impl((TkappObject *)self, msg);
 
 exit:
     return return_value;
@@ -184,7 +184,7 @@ static PyObject *
 _tkinter_tkapp_exprstring_impl(TkappObject *self, const char *s);
 
 static PyObject *
-_tkinter_tkapp_exprstring(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_exprstring(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *s;
@@ -202,7 +202,7 @@ _tkinter_tkapp_exprstring(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_exprstring_impl(self, s);
+    return_value = _tkinter_tkapp_exprstring_impl((TkappObject *)self, s);
 
 exit:
     return return_value;
@@ -220,7 +220,7 @@ static PyObject *
 _tkinter_tkapp_exprlong_impl(TkappObject *self, const char *s);
 
 static PyObject *
-_tkinter_tkapp_exprlong(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_exprlong(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *s;
@@ -238,7 +238,7 @@ _tkinter_tkapp_exprlong(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_exprlong_impl(self, s);
+    return_value = _tkinter_tkapp_exprlong_impl((TkappObject *)self, s);
 
 exit:
     return return_value;
@@ -256,7 +256,7 @@ static PyObject *
 _tkinter_tkapp_exprdouble_impl(TkappObject *self, const char *s);
 
 static PyObject *
-_tkinter_tkapp_exprdouble(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_exprdouble(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *s;
@@ -274,7 +274,7 @@ _tkinter_tkapp_exprdouble(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_exprdouble_impl(self, s);
+    return_value = _tkinter_tkapp_exprdouble_impl((TkappObject *)self, s);
 
 exit:
     return return_value;
@@ -292,7 +292,7 @@ static PyObject *
 _tkinter_tkapp_exprboolean_impl(TkappObject *self, const char *s);
 
 static PyObject *
-_tkinter_tkapp_exprboolean(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_exprboolean(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *s;
@@ -310,7 +310,7 @@ _tkinter_tkapp_exprboolean(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_exprboolean_impl(self, s);
+    return_value = _tkinter_tkapp_exprboolean_impl((TkappObject *)self, s);
 
 exit:
     return return_value;
@@ -337,7 +337,7 @@ _tkinter_tkapp_createcommand_impl(TkappObject *self, const char *name,
                                   PyObject *func);
 
 static PyObject *
-_tkinter_tkapp_createcommand(TkappObject *self, PyObject *const *args, Py_ssize_t nargs)
+_tkinter_tkapp_createcommand(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     const char *name;
@@ -360,7 +360,7 @@ _tkinter_tkapp_createcommand(TkappObject *self, PyObject *const *args, Py_ssize_
         goto exit;
     }
     func = args[1];
-    return_value = _tkinter_tkapp_createcommand_impl(self, name, func);
+    return_value = _tkinter_tkapp_createcommand_impl((TkappObject *)self, name, func);
 
 exit:
     return return_value;
@@ -378,7 +378,7 @@ static PyObject *
 _tkinter_tkapp_deletecommand_impl(TkappObject *self, const char *name);
 
 static PyObject *
-_tkinter_tkapp_deletecommand(TkappObject *self, PyObject *arg)
+_tkinter_tkapp_deletecommand(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *name;
@@ -396,7 +396,7 @@ _tkinter_tkapp_deletecommand(TkappObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _tkinter_tkapp_deletecommand_impl(self, name);
+    return_value = _tkinter_tkapp_deletecommand_impl((TkappObject *)self, name);
 
 exit:
     return return_value;
@@ -417,7 +417,7 @@ _tkinter_tkapp_createfilehandler_impl(TkappObject *self, PyObject *file,
                                       int mask, PyObject *func);
 
 static PyObject *
-_tkinter_tkapp_createfilehandler(TkappObject *self, PyObject *const *args, Py_ssize_t nargs)
+_tkinter_tkapp_createfilehandler(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *file;
@@ -433,7 +433,7 @@ _tkinter_tkapp_createfilehandler(TkappObject *self, PyObject *const *args, Py_ss
         goto exit;
     }
     func = args[2];
-    return_value = _tkinter_tkapp_createfilehandler_impl(self, file, mask, func);
+    return_value = _tkinter_tkapp_createfilehandler_impl((TkappObject *)self, file, mask, func);
 
 exit:
     return return_value;
@@ -465,9 +465,9 @@ static PyObject *
 _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self);
 
 static PyObject *
-_tkinter_tktimertoken_deletetimerhandler(TkttObject *self, PyObject *Py_UNUSED(ignored))
+_tkinter_tktimertoken_deletetimerhandler(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _tkinter_tktimertoken_deletetimerhandler_impl(self);
+    return _tkinter_tktimertoken_deletetimerhandler_impl((TkttObject *)self);
 }
 
 PyDoc_STRVAR(_tkinter_tkapp_createtimerhandler__doc__,
@@ -483,7 +483,7 @@ _tkinter_tkapp_createtimerhandler_impl(TkappObject *self, int milliseconds,
                                        PyObject *func);
 
 static PyObject *
-_tkinter_tkapp_createtimerhandler(TkappObject *self, PyObject *const *args, Py_ssize_t nargs)
+_tkinter_tkapp_createtimerhandler(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int milliseconds;
@@ -497,7 +497,7 @@ _tkinter_tkapp_createtimerhandler(TkappObject *self, PyObject *const *args, Py_s
         goto exit;
     }
     func = args[1];
-    return_value = _tkinter_tkapp_createtimerhandler_impl(self, milliseconds, func);
+    return_value = _tkinter_tkapp_createtimerhandler_impl((TkappObject *)self, milliseconds, func);
 
 exit:
     return return_value;
@@ -515,7 +515,7 @@ static PyObject *
 _tkinter_tkapp_mainloop_impl(TkappObject *self, int threshold);
 
 static PyObject *
-_tkinter_tkapp_mainloop(TkappObject *self, PyObject *const *args, Py_ssize_t nargs)
+_tkinter_tkapp_mainloop(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int threshold = 0;
@@ -531,7 +531,7 @@ _tkinter_tkapp_mainloop(TkappObject *self, PyObject *const *args, Py_ssize_t nar
         goto exit;
     }
 skip_optional:
-    return_value = _tkinter_tkapp_mainloop_impl(self, threshold);
+    return_value = _tkinter_tkapp_mainloop_impl((TkappObject *)self, threshold);
 
 exit:
     return return_value;
@@ -549,7 +549,7 @@ static PyObject *
 _tkinter_tkapp_dooneevent_impl(TkappObject *self, int flags);
 
 static PyObject *
-_tkinter_tkapp_dooneevent(TkappObject *self, PyObject *const *args, Py_ssize_t nargs)
+_tkinter_tkapp_dooneevent(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int flags = 0;
@@ -565,7 +565,7 @@ _tkinter_tkapp_dooneevent(TkappObject *self, PyObject *const *args, Py_ssize_t n
         goto exit;
     }
 skip_optional:
-    return_value = _tkinter_tkapp_dooneevent_impl(self, flags);
+    return_value = _tkinter_tkapp_dooneevent_impl((TkappObject *)self, flags);
 
 exit:
     return return_value;
@@ -583,9 +583,9 @@ static PyObject *
 _tkinter_tkapp_quit_impl(TkappObject *self);
 
 static PyObject *
-_tkinter_tkapp_quit(TkappObject *self, PyObject *Py_UNUSED(ignored))
+_tkinter_tkapp_quit(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _tkinter_tkapp_quit_impl(self);
+    return _tkinter_tkapp_quit_impl((TkappObject *)self);
 }
 
 PyDoc_STRVAR(_tkinter_tkapp_interpaddr__doc__,
@@ -600,9 +600,9 @@ static PyObject *
 _tkinter_tkapp_interpaddr_impl(TkappObject *self);
 
 static PyObject *
-_tkinter_tkapp_interpaddr(TkappObject *self, PyObject *Py_UNUSED(ignored))
+_tkinter_tkapp_interpaddr(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _tkinter_tkapp_interpaddr_impl(self);
+    return _tkinter_tkapp_interpaddr_impl((TkappObject *)self);
 }
 
 PyDoc_STRVAR(_tkinter_tkapp_loadtk__doc__,
@@ -617,9 +617,9 @@ static PyObject *
 _tkinter_tkapp_loadtk_impl(TkappObject *self);
 
 static PyObject *
-_tkinter_tkapp_loadtk(TkappObject *self, PyObject *Py_UNUSED(ignored))
+_tkinter_tkapp_loadtk(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _tkinter_tkapp_loadtk_impl(self);
+    return _tkinter_tkapp_loadtk_impl((TkappObject *)self);
 }
 
 PyDoc_STRVAR(_tkinter_tkapp_settrace__doc__,
@@ -644,9 +644,9 @@ static PyObject *
 _tkinter_tkapp_gettrace_impl(TkappObject *self);
 
 static PyObject *
-_tkinter_tkapp_gettrace(TkappObject *self, PyObject *Py_UNUSED(ignored))
+_tkinter_tkapp_gettrace(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _tkinter_tkapp_gettrace_impl(self);
+    return _tkinter_tkapp_gettrace_impl((TkappObject *)self);
 }
 
 PyDoc_STRVAR(_tkinter_tkapp_willdispatch__doc__,
@@ -661,9 +661,9 @@ static PyObject *
 _tkinter_tkapp_willdispatch_impl(TkappObject *self);
 
 static PyObject *
-_tkinter_tkapp_willdispatch(TkappObject *self, PyObject *Py_UNUSED(ignored))
+_tkinter_tkapp_willdispatch(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _tkinter_tkapp_willdispatch_impl(self);
+    return _tkinter_tkapp_willdispatch_impl((TkappObject *)self);
 }
 
 PyDoc_STRVAR(_tkinter__flatten__doc__,
@@ -888,4 +888,4 @@ _tkinter_getbusywaitinterval(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
     #define _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
 #endif /* !defined(_TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF) */
-/*[clinic end generated code: output=d90c1a9850c63249 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=172a98df5f209a84 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h
index 8bbecc44dc9c11..6a2f8d45cd4e0c 100644
--- a/Modules/clinic/_winapi.c.h
+++ b/Modules/clinic/_winapi.c.h
@@ -21,7 +21,7 @@ static PyObject *
 _winapi_Overlapped_GetOverlappedResult_impl(OverlappedObject *self, int wait);
 
 static PyObject *
-_winapi_Overlapped_GetOverlappedResult(OverlappedObject *self, PyObject *arg)
+_winapi_Overlapped_GetOverlappedResult(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int wait;
@@ -30,7 +30,7 @@ _winapi_Overlapped_GetOverlappedResult(OverlappedObject *self, PyObject *arg)
     if (wait < 0) {
         goto exit;
     }
-    return_value = _winapi_Overlapped_GetOverlappedResult_impl(self, wait);
+    return_value = _winapi_Overlapped_GetOverlappedResult_impl((OverlappedObject *)self, wait);
 
 exit:
     return return_value;
@@ -48,9 +48,9 @@ static PyObject *
 _winapi_Overlapped_getbuffer_impl(OverlappedObject *self);
 
 static PyObject *
-_winapi_Overlapped_getbuffer(OverlappedObject *self, PyObject *Py_UNUSED(ignored))
+_winapi_Overlapped_getbuffer(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _winapi_Overlapped_getbuffer_impl(self);
+    return _winapi_Overlapped_getbuffer_impl((OverlappedObject *)self);
 }
 
 PyDoc_STRVAR(_winapi_Overlapped_cancel__doc__,
@@ -65,9 +65,9 @@ static PyObject *
 _winapi_Overlapped_cancel_impl(OverlappedObject *self);
 
 static PyObject *
-_winapi_Overlapped_cancel(OverlappedObject *self, PyObject *Py_UNUSED(ignored))
+_winapi_Overlapped_cancel(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _winapi_Overlapped_cancel_impl(self);
+    return _winapi_Overlapped_cancel_impl((OverlappedObject *)self);
 }
 
 PyDoc_STRVAR(_winapi_CloseHandle__doc__,
@@ -2127,4 +2127,4 @@ _winapi_CopyFile2(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO
 
     return return_value;
 }
-/*[clinic end generated code: output=b2a178bde6868e88 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=06b56212b2186250 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/arraymodule.c.h b/Modules/clinic/arraymodule.c.h
index 4a7266ecb8b84f..c5b62b16699d06 100644
--- a/Modules/clinic/arraymodule.c.h
+++ b/Modules/clinic/arraymodule.c.h
@@ -21,9 +21,9 @@ static PyObject *
 array_array_clear_impl(arrayobject *self);
 
 static PyObject *
-array_array_clear(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_clear_impl(self);
+    return array_array_clear_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array___copy____doc__,
@@ -39,9 +39,9 @@ static PyObject *
 array_array___copy___impl(arrayobject *self);
 
 static PyObject *
-array_array___copy__(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array___copy__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array___copy___impl(self);
+    return array_array___copy___impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array___deepcopy____doc__,
@@ -78,7 +78,7 @@ array_array_index_impl(arrayobject *self, PyObject *v, Py_ssize_t start,
                        Py_ssize_t stop);
 
 static PyObject *
-array_array_index(arrayobject *self, PyObject *const *args, Py_ssize_t nargs)
+array_array_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *v;
@@ -102,7 +102,7 @@ array_array_index(arrayobject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = array_array_index_impl(self, v, start, stop);
+    return_value = array_array_index_impl((arrayobject *)self, v, start, stop);
 
 exit:
     return return_value;
@@ -132,7 +132,7 @@ static PyObject *
 array_array_pop_impl(arrayobject *self, Py_ssize_t i);
 
 static PyObject *
-array_array_pop(arrayobject *self, PyObject *const *args, Py_ssize_t nargs)
+array_array_pop(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t i = -1;
@@ -156,7 +156,7 @@ array_array_pop(arrayobject *self, PyObject *const *args, Py_ssize_t nargs)
         i = ival;
     }
 skip_optional:
-    return_value = array_array_pop_impl(self, i);
+    return_value = array_array_pop_impl((arrayobject *)self, i);
 
 exit:
     return return_value;
@@ -175,7 +175,7 @@ static PyObject *
 array_array_extend_impl(arrayobject *self, PyTypeObject *cls, PyObject *bb);
 
 static PyObject *
-array_array_extend(arrayobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+array_array_extend(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -200,7 +200,7 @@ array_array_extend(arrayobject *self, PyTypeObject *cls, PyObject *const *args,
         goto exit;
     }
     bb = args[0];
-    return_value = array_array_extend_impl(self, cls, bb);
+    return_value = array_array_extend_impl((arrayobject *)self, cls, bb);
 
 exit:
     return return_value;
@@ -219,7 +219,7 @@ static PyObject *
 array_array_insert_impl(arrayobject *self, Py_ssize_t i, PyObject *v);
 
 static PyObject *
-array_array_insert(arrayobject *self, PyObject *const *args, Py_ssize_t nargs)
+array_array_insert(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t i;
@@ -241,7 +241,7 @@ array_array_insert(arrayobject *self, PyObject *const *args, Py_ssize_t nargs)
         i = ival;
     }
     v = args[1];
-    return_value = array_array_insert_impl(self, i, v);
+    return_value = array_array_insert_impl((arrayobject *)self, i, v);
 
 exit:
     return return_value;
@@ -263,9 +263,9 @@ static PyObject *
 array_array_buffer_info_impl(arrayobject *self);
 
 static PyObject *
-array_array_buffer_info(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_buffer_info(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_buffer_info_impl(self);
+    return array_array_buffer_info_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array_append__doc__,
@@ -293,9 +293,9 @@ static PyObject *
 array_array_byteswap_impl(arrayobject *self);
 
 static PyObject *
-array_array_byteswap(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_byteswap(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_byteswap_impl(self);
+    return array_array_byteswap_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array_reverse__doc__,
@@ -311,9 +311,9 @@ static PyObject *
 array_array_reverse_impl(arrayobject *self);
 
 static PyObject *
-array_array_reverse(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_reverse(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_reverse_impl(self);
+    return array_array_reverse_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array_fromfile__doc__,
@@ -330,7 +330,7 @@ array_array_fromfile_impl(arrayobject *self, PyTypeObject *cls, PyObject *f,
                           Py_ssize_t n);
 
 static PyObject *
-array_array_fromfile(arrayobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+array_array_fromfile(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -368,7 +368,7 @@ array_array_fromfile(arrayobject *self, PyTypeObject *cls, PyObject *const *args
         }
         n = ival;
     }
-    return_value = array_array_fromfile_impl(self, cls, f, n);
+    return_value = array_array_fromfile_impl((arrayobject *)self, cls, f, n);
 
 exit:
     return return_value;
@@ -387,7 +387,7 @@ static PyObject *
 array_array_tofile_impl(arrayobject *self, PyTypeObject *cls, PyObject *f);
 
 static PyObject *
-array_array_tofile(arrayobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+array_array_tofile(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -412,7 +412,7 @@ array_array_tofile(arrayobject *self, PyTypeObject *cls, PyObject *const *args,
         goto exit;
     }
     f = args[0];
-    return_value = array_array_tofile_impl(self, cls, f);
+    return_value = array_array_tofile_impl((arrayobject *)self, cls, f);
 
 exit:
     return return_value;
@@ -440,9 +440,9 @@ static PyObject *
 array_array_tolist_impl(arrayobject *self);
 
 static PyObject *
-array_array_tolist(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_tolist(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_tolist_impl(self);
+    return array_array_tolist_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array_frombytes__doc__,
@@ -458,7 +458,7 @@ static PyObject *
 array_array_frombytes_impl(arrayobject *self, Py_buffer *buffer);
 
 static PyObject *
-array_array_frombytes(arrayobject *self, PyObject *arg)
+array_array_frombytes(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer buffer = {NULL, NULL};
@@ -466,7 +466,7 @@ array_array_frombytes(arrayobject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = array_array_frombytes_impl(self, &buffer);
+    return_value = array_array_frombytes_impl((arrayobject *)self, &buffer);
 
 exit:
     /* Cleanup for buffer */
@@ -490,9 +490,9 @@ static PyObject *
 array_array_tobytes_impl(arrayobject *self);
 
 static PyObject *
-array_array_tobytes(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_tobytes(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_tobytes_impl(self);
+    return array_array_tobytes_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array_fromunicode__doc__,
@@ -512,7 +512,7 @@ static PyObject *
 array_array_fromunicode_impl(arrayobject *self, PyObject *ustr);
 
 static PyObject *
-array_array_fromunicode(arrayobject *self, PyObject *arg)
+array_array_fromunicode(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *ustr;
@@ -522,7 +522,7 @@ array_array_fromunicode(arrayobject *self, PyObject *arg)
         goto exit;
     }
     ustr = arg;
-    return_value = array_array_fromunicode_impl(self, ustr);
+    return_value = array_array_fromunicode_impl((arrayobject *)self, ustr);
 
 exit:
     return return_value;
@@ -545,9 +545,9 @@ static PyObject *
 array_array_tounicode_impl(arrayobject *self);
 
 static PyObject *
-array_array_tounicode(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array_tounicode(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array_tounicode_impl(self);
+    return array_array_tounicode_impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array_array___sizeof____doc__,
@@ -563,9 +563,9 @@ static PyObject *
 array_array___sizeof___impl(arrayobject *self);
 
 static PyObject *
-array_array___sizeof__(arrayobject *self, PyObject *Py_UNUSED(ignored))
+array_array___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return array_array___sizeof___impl(self);
+    return array_array___sizeof___impl((arrayobject *)self);
 }
 
 PyDoc_STRVAR(array__array_reconstructor__doc__,
@@ -634,7 +634,7 @@ array_array___reduce_ex___impl(arrayobject *self, PyTypeObject *cls,
                                PyObject *value);
 
 static PyObject *
-array_array___reduce_ex__(arrayobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+array_array___reduce_ex__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -659,7 +659,7 @@ array_array___reduce_ex__(arrayobject *self, PyTypeObject *cls, PyObject *const
         goto exit;
     }
     value = args[0];
-    return_value = array_array___reduce_ex___impl(self, cls, value);
+    return_value = array_array___reduce_ex___impl((arrayobject *)self, cls, value);
 
 exit:
     return return_value;
@@ -678,13 +678,13 @@ static PyObject *
 array_arrayiterator___reduce___impl(arrayiterobject *self, PyTypeObject *cls);
 
 static PyObject *
-array_arrayiterator___reduce__(arrayiterobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+array_arrayiterator___reduce__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "__reduce__() takes no arguments");
         return NULL;
     }
-    return array_arrayiterator___reduce___impl(self, cls);
+    return array_arrayiterator___reduce___impl((arrayiterobject *)self, cls);
 }
 
 PyDoc_STRVAR(array_arrayiterator___setstate____doc__,
@@ -695,4 +695,4 @@ PyDoc_STRVAR(array_arrayiterator___setstate____doc__,
 
 #define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF    \
     {"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__},
-/*[clinic end generated code: output=22dbe12826bfa86f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8120dc5c4fa414b9 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/blake2module.c.h b/Modules/clinic/blake2module.c.h
index f695f27e9e6c42..b5ac90143a1740 100644
--- a/Modules/clinic/blake2module.c.h
+++ b/Modules/clinic/blake2module.c.h
@@ -412,9 +412,9 @@ static PyObject *
 _blake2_blake2b_copy_impl(Blake2Object *self);
 
 static PyObject *
-_blake2_blake2b_copy(Blake2Object *self, PyObject *Py_UNUSED(ignored))
+_blake2_blake2b_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _blake2_blake2b_copy_impl(self);
+    return _blake2_blake2b_copy_impl((Blake2Object *)self);
 }
 
 PyDoc_STRVAR(_blake2_blake2b_update__doc__,
@@ -439,9 +439,9 @@ static PyObject *
 _blake2_blake2b_digest_impl(Blake2Object *self);
 
 static PyObject *
-_blake2_blake2b_digest(Blake2Object *self, PyObject *Py_UNUSED(ignored))
+_blake2_blake2b_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _blake2_blake2b_digest_impl(self);
+    return _blake2_blake2b_digest_impl((Blake2Object *)self);
 }
 
 PyDoc_STRVAR(_blake2_blake2b_hexdigest__doc__,
@@ -457,8 +457,8 @@ static PyObject *
 _blake2_blake2b_hexdigest_impl(Blake2Object *self);
 
 static PyObject *
-_blake2_blake2b_hexdigest(Blake2Object *self, PyObject *Py_UNUSED(ignored))
+_blake2_blake2b_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _blake2_blake2b_hexdigest_impl(self);
+    return _blake2_blake2b_hexdigest_impl((Blake2Object *)self);
 }
-/*[clinic end generated code: output=e0aaaf112d023b79 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6e03c947b7e0d973 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h
index 7721616862ed0d..1f0acebf47b6ff 100644
--- a/Modules/clinic/md5module.c.h
+++ b/Modules/clinic/md5module.c.h
@@ -21,13 +21,13 @@ static PyObject *
 MD5Type_copy_impl(MD5object *self, PyTypeObject *cls);
 
 static PyObject *
-MD5Type_copy(MD5object *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+MD5Type_copy(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "copy() takes no arguments");
         return NULL;
     }
-    return MD5Type_copy_impl(self, cls);
+    return MD5Type_copy_impl((MD5object *)self, cls);
 }
 
 PyDoc_STRVAR(MD5Type_digest__doc__,
@@ -43,9 +43,9 @@ static PyObject *
 MD5Type_digest_impl(MD5object *self);
 
 static PyObject *
-MD5Type_digest(MD5object *self, PyObject *Py_UNUSED(ignored))
+MD5Type_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return MD5Type_digest_impl(self);
+    return MD5Type_digest_impl((MD5object *)self);
 }
 
 PyDoc_STRVAR(MD5Type_hexdigest__doc__,
@@ -61,9 +61,9 @@ static PyObject *
 MD5Type_hexdigest_impl(MD5object *self);
 
 static PyObject *
-MD5Type_hexdigest(MD5object *self, PyObject *Py_UNUSED(ignored))
+MD5Type_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return MD5Type_hexdigest_impl(self);
+    return MD5Type_hexdigest_impl((MD5object *)self);
 }
 
 PyDoc_STRVAR(MD5Type_update__doc__,
@@ -149,4 +149,4 @@ _md5_md5(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=62ebf28802ae8b5f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a4292eab710dcb60 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/overlapped.c.h b/Modules/clinic/overlapped.c.h
index 9d5adb5193f297..7e5715660022c1 100644
--- a/Modules/clinic/overlapped.c.h
+++ b/Modules/clinic/overlapped.c.h
@@ -516,9 +516,9 @@ static PyObject *
 _overlapped_Overlapped_cancel_impl(OverlappedObject *self);
 
 static PyObject *
-_overlapped_Overlapped_cancel(OverlappedObject *self, PyObject *Py_UNUSED(ignored))
+_overlapped_Overlapped_cancel(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _overlapped_Overlapped_cancel_impl(self);
+    return _overlapped_Overlapped_cancel_impl((OverlappedObject *)self);
 }
 
 PyDoc_STRVAR(_overlapped_Overlapped_getresult__doc__,
@@ -537,7 +537,7 @@ static PyObject *
 _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait);
 
 static PyObject *
-_overlapped_Overlapped_getresult(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_getresult(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     BOOL wait = FALSE;
@@ -553,7 +553,7 @@ _overlapped_Overlapped_getresult(OverlappedObject *self, PyObject *const *args,
         goto exit;
     }
 skip_optional:
-    return_value = _overlapped_Overlapped_getresult_impl(self, wait);
+    return_value = _overlapped_Overlapped_getresult_impl((OverlappedObject *)self, wait);
 
 exit:
     return return_value;
@@ -573,7 +573,7 @@ _overlapped_Overlapped_ReadFile_impl(OverlappedObject *self, HANDLE handle,
                                      DWORD size);
 
 static PyObject *
-_overlapped_Overlapped_ReadFile(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_ReadFile(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -589,7 +589,7 @@ _overlapped_Overlapped_ReadFile(OverlappedObject *self, PyObject *const *args, P
     if (!_PyLong_UnsignedLong_Converter(args[1], &size)) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_ReadFile_impl(self, handle, size);
+    return_value = _overlapped_Overlapped_ReadFile_impl((OverlappedObject *)self, handle, size);
 
 exit:
     return return_value;
@@ -609,7 +609,7 @@ _overlapped_Overlapped_ReadFileInto_impl(OverlappedObject *self,
                                          HANDLE handle, Py_buffer *bufobj);
 
 static PyObject *
-_overlapped_Overlapped_ReadFileInto(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_ReadFileInto(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -625,7 +625,7 @@ _overlapped_Overlapped_ReadFileInto(OverlappedObject *self, PyObject *const *arg
     if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_ReadFileInto_impl(self, handle, &bufobj);
+    return_value = _overlapped_Overlapped_ReadFileInto_impl((OverlappedObject *)self, handle, &bufobj);
 
 exit:
     /* Cleanup for bufobj */
@@ -650,7 +650,7 @@ _overlapped_Overlapped_WSARecv_impl(OverlappedObject *self, HANDLE handle,
                                     DWORD size, DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_WSARecv(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WSARecv(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -674,7 +674,7 @@ _overlapped_Overlapped_WSARecv(OverlappedObject *self, PyObject *const *args, Py
         goto exit;
     }
 skip_optional:
-    return_value = _overlapped_Overlapped_WSARecv_impl(self, handle, size, flags);
+    return_value = _overlapped_Overlapped_WSARecv_impl((OverlappedObject *)self, handle, size, flags);
 
 exit:
     return return_value;
@@ -695,7 +695,7 @@ _overlapped_Overlapped_WSARecvInto_impl(OverlappedObject *self,
                                         DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_WSARecvInto(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WSARecvInto(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -715,7 +715,7 @@ _overlapped_Overlapped_WSARecvInto(OverlappedObject *self, PyObject *const *args
     if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_WSARecvInto_impl(self, handle, &bufobj, flags);
+    return_value = _overlapped_Overlapped_WSARecvInto_impl((OverlappedObject *)self, handle, &bufobj, flags);
 
 exit:
     /* Cleanup for bufobj */
@@ -740,7 +740,7 @@ _overlapped_Overlapped_WriteFile_impl(OverlappedObject *self, HANDLE handle,
                                       Py_buffer *bufobj);
 
 static PyObject *
-_overlapped_Overlapped_WriteFile(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WriteFile(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -756,7 +756,7 @@ _overlapped_Overlapped_WriteFile(OverlappedObject *self, PyObject *const *args,
     if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_WriteFile_impl(self, handle, &bufobj);
+    return_value = _overlapped_Overlapped_WriteFile_impl((OverlappedObject *)self, handle, &bufobj);
 
 exit:
     /* Cleanup for bufobj */
@@ -781,7 +781,7 @@ _overlapped_Overlapped_WSASend_impl(OverlappedObject *self, HANDLE handle,
                                     Py_buffer *bufobj, DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_WSASend(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WSASend(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -801,7 +801,7 @@ _overlapped_Overlapped_WSASend(OverlappedObject *self, PyObject *const *args, Py
     if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_WSASend_impl(self, handle, &bufobj, flags);
+    return_value = _overlapped_Overlapped_WSASend_impl((OverlappedObject *)self, handle, &bufobj, flags);
 
 exit:
     /* Cleanup for bufobj */
@@ -827,7 +827,7 @@ _overlapped_Overlapped_AcceptEx_impl(OverlappedObject *self,
                                      HANDLE AcceptSocket);
 
 static PyObject *
-_overlapped_Overlapped_AcceptEx(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_AcceptEx(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE ListenSocket;
@@ -844,7 +844,7 @@ _overlapped_Overlapped_AcceptEx(OverlappedObject *self, PyObject *const *args, P
     if (!AcceptSocket && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_AcceptEx_impl(self, ListenSocket, AcceptSocket);
+    return_value = _overlapped_Overlapped_AcceptEx_impl((OverlappedObject *)self, ListenSocket, AcceptSocket);
 
 exit:
     return return_value;
@@ -867,7 +867,7 @@ _overlapped_Overlapped_ConnectEx_impl(OverlappedObject *self,
                                       PyObject *AddressObj);
 
 static PyObject *
-_overlapped_Overlapped_ConnectEx(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_ConnectEx(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE ConnectSocket;
@@ -885,7 +885,7 @@ _overlapped_Overlapped_ConnectEx(OverlappedObject *self, PyObject *const *args,
         goto exit;
     }
     AddressObj = args[1];
-    return_value = _overlapped_Overlapped_ConnectEx_impl(self, ConnectSocket, AddressObj);
+    return_value = _overlapped_Overlapped_ConnectEx_impl((OverlappedObject *)self, ConnectSocket, AddressObj);
 
 exit:
     return return_value;
@@ -904,7 +904,7 @@ _overlapped_Overlapped_DisconnectEx_impl(OverlappedObject *self,
                                          HANDLE Socket, DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_DisconnectEx(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_DisconnectEx(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE Socket;
@@ -920,7 +920,7 @@ _overlapped_Overlapped_DisconnectEx(OverlappedObject *self, PyObject *const *arg
     if (!_PyLong_UnsignedLong_Converter(args[1], &flags)) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_DisconnectEx_impl(self, Socket, flags);
+    return_value = _overlapped_Overlapped_DisconnectEx_impl((OverlappedObject *)self, Socket, flags);
 
 exit:
     return return_value;
@@ -944,7 +944,7 @@ _overlapped_Overlapped_TransmitFile_impl(OverlappedObject *self,
                                          DWORD count_per_send, DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_TransmitFile(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_TransmitFile(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE Socket;
@@ -981,7 +981,7 @@ _overlapped_Overlapped_TransmitFile(OverlappedObject *self, PyObject *const *arg
     if (!_PyLong_UnsignedLong_Converter(args[6], &flags)) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_TransmitFile_impl(self, Socket, File, offset, offset_high, count_to_write, count_per_send, flags);
+    return_value = _overlapped_Overlapped_TransmitFile_impl((OverlappedObject *)self, Socket, File, offset, offset_high, count_to_write, count_per_send, flags);
 
 exit:
     return return_value;
@@ -1001,7 +1001,7 @@ _overlapped_Overlapped_ConnectNamedPipe_impl(OverlappedObject *self,
                                              HANDLE Pipe);
 
 static PyObject *
-_overlapped_Overlapped_ConnectNamedPipe(OverlappedObject *self, PyObject *arg)
+_overlapped_Overlapped_ConnectNamedPipe(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     HANDLE Pipe;
@@ -1010,7 +1010,7 @@ _overlapped_Overlapped_ConnectNamedPipe(OverlappedObject *self, PyObject *arg)
     if (!Pipe && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_ConnectNamedPipe_impl(self, Pipe);
+    return_value = _overlapped_Overlapped_ConnectNamedPipe_impl((OverlappedObject *)self, Pipe);
 
 exit:
     return return_value;
@@ -1030,7 +1030,7 @@ _overlapped_Overlapped_ConnectPipe_impl(OverlappedObject *self,
                                         const wchar_t *Address);
 
 static PyObject *
-_overlapped_Overlapped_ConnectPipe(OverlappedObject *self, PyObject *arg)
+_overlapped_Overlapped_ConnectPipe(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const wchar_t *Address = NULL;
@@ -1043,7 +1043,7 @@ _overlapped_Overlapped_ConnectPipe(OverlappedObject *self, PyObject *arg)
     if (Address == NULL) {
         goto exit;
     }
-    return_value = _overlapped_Overlapped_ConnectPipe_impl(self, Address);
+    return_value = _overlapped_Overlapped_ConnectPipe_impl((OverlappedObject *)self, Address);
 
 exit:
     /* Cleanup for Address */
@@ -1105,7 +1105,7 @@ _overlapped_Overlapped_WSASendTo_impl(OverlappedObject *self, HANDLE handle,
                                       PyObject *AddressObj);
 
 static PyObject *
-_overlapped_Overlapped_WSASendTo(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WSASendTo(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -1131,7 +1131,7 @@ _overlapped_Overlapped_WSASendTo(OverlappedObject *self, PyObject *const *args,
         goto exit;
     }
     AddressObj = args[3];
-    return_value = _overlapped_Overlapped_WSASendTo_impl(self, handle, &bufobj, flags, AddressObj);
+    return_value = _overlapped_Overlapped_WSASendTo_impl((OverlappedObject *)self, handle, &bufobj, flags, AddressObj);
 
 exit:
     /* Cleanup for bufobj */
@@ -1157,7 +1157,7 @@ _overlapped_Overlapped_WSARecvFrom_impl(OverlappedObject *self,
                                         DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_WSARecvFrom(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WSARecvFrom(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -1181,7 +1181,7 @@ _overlapped_Overlapped_WSARecvFrom(OverlappedObject *self, PyObject *const *args
         goto exit;
     }
 skip_optional:
-    return_value = _overlapped_Overlapped_WSARecvFrom_impl(self, handle, size, flags);
+    return_value = _overlapped_Overlapped_WSARecvFrom_impl((OverlappedObject *)self, handle, size, flags);
 
 exit:
     return return_value;
@@ -1202,7 +1202,7 @@ _overlapped_Overlapped_WSARecvFromInto_impl(OverlappedObject *self,
                                             DWORD size, DWORD flags);
 
 static PyObject *
-_overlapped_Overlapped_WSARecvFromInto(OverlappedObject *self, PyObject *const *args, Py_ssize_t nargs)
+_overlapped_Overlapped_WSARecvFromInto(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -1230,7 +1230,7 @@ _overlapped_Overlapped_WSARecvFromInto(OverlappedObject *self, PyObject *const *
         goto exit;
     }
 skip_optional:
-    return_value = _overlapped_Overlapped_WSARecvFromInto_impl(self, handle, &bufobj, size, flags);
+    return_value = _overlapped_Overlapped_WSARecvFromInto_impl((OverlappedObject *)self, handle, &bufobj, size, flags);
 
 exit:
     /* Cleanup for bufobj */
@@ -1240,4 +1240,4 @@ _overlapped_Overlapped_WSARecvFromInto(OverlappedObject *self, PyObject *const *
 
     return return_value;
 }
-/*[clinic end generated code: output=14c4f87906f28dc5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d009cc9e53d9732a input=a9049054013a1b77]*/
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 4e6c5b068c42b7..96bf21dced92f0 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -11662,7 +11662,7 @@ static int
 os_DirEntry_is_symlink_impl(DirEntry *self, PyTypeObject *defining_class);
 
 static PyObject *
-os_DirEntry_is_symlink(DirEntry *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+os_DirEntry_is_symlink(PyObject *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     int _return_value;
@@ -11671,7 +11671,7 @@ os_DirEntry_is_symlink(DirEntry *self, PyTypeObject *defining_class, PyObject *c
         PyErr_SetString(PyExc_TypeError, "is_symlink() takes no arguments");
         goto exit;
     }
-    _return_value = os_DirEntry_is_symlink_impl(self, defining_class);
+    _return_value = os_DirEntry_is_symlink_impl((DirEntry *)self, defining_class);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -11694,12 +11694,12 @@ static int
 os_DirEntry_is_junction_impl(DirEntry *self);
 
 static PyObject *
-os_DirEntry_is_junction(DirEntry *self, PyObject *Py_UNUSED(ignored))
+os_DirEntry_is_junction(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     int _return_value;
 
-    _return_value = os_DirEntry_is_junction_impl(self);
+    _return_value = os_DirEntry_is_junction_impl((DirEntry *)self);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -11723,7 +11723,7 @@ os_DirEntry_stat_impl(DirEntry *self, PyTypeObject *defining_class,
                       int follow_symlinks);
 
 static PyObject *
-os_DirEntry_stat(DirEntry *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+os_DirEntry_stat(PyObject *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -11768,7 +11768,7 @@ os_DirEntry_stat(DirEntry *self, PyTypeObject *defining_class, PyObject *const *
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = os_DirEntry_stat_impl(self, defining_class, follow_symlinks);
+    return_value = os_DirEntry_stat_impl((DirEntry *)self, defining_class, follow_symlinks);
 
 exit:
     return return_value;
@@ -11788,7 +11788,7 @@ os_DirEntry_is_dir_impl(DirEntry *self, PyTypeObject *defining_class,
                         int follow_symlinks);
 
 static PyObject *
-os_DirEntry_is_dir(DirEntry *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+os_DirEntry_is_dir(PyObject *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -11834,7 +11834,7 @@ os_DirEntry_is_dir(DirEntry *self, PyTypeObject *defining_class, PyObject *const
         goto exit;
     }
 skip_optional_kwonly:
-    _return_value = os_DirEntry_is_dir_impl(self, defining_class, follow_symlinks);
+    _return_value = os_DirEntry_is_dir_impl((DirEntry *)self, defining_class, follow_symlinks);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -11858,7 +11858,7 @@ os_DirEntry_is_file_impl(DirEntry *self, PyTypeObject *defining_class,
                          int follow_symlinks);
 
 static PyObject *
-os_DirEntry_is_file(DirEntry *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+os_DirEntry_is_file(PyObject *self, PyTypeObject *defining_class, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -11904,7 +11904,7 @@ os_DirEntry_is_file(DirEntry *self, PyTypeObject *defining_class, PyObject *cons
         goto exit;
     }
 skip_optional_kwonly:
-    _return_value = os_DirEntry_is_file_impl(self, defining_class, follow_symlinks);
+    _return_value = os_DirEntry_is_file_impl((DirEntry *)self, defining_class, follow_symlinks);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -11927,9 +11927,9 @@ static PyObject *
 os_DirEntry_inode_impl(DirEntry *self);
 
 static PyObject *
-os_DirEntry_inode(DirEntry *self, PyObject *Py_UNUSED(ignored))
+os_DirEntry_inode(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return os_DirEntry_inode_impl(self);
+    return os_DirEntry_inode_impl((DirEntry *)self);
 }
 
 PyDoc_STRVAR(os_DirEntry___fspath____doc__,
@@ -11945,9 +11945,9 @@ static PyObject *
 os_DirEntry___fspath___impl(DirEntry *self);
 
 static PyObject *
-os_DirEntry___fspath__(DirEntry *self, PyObject *Py_UNUSED(ignored))
+os_DirEntry___fspath__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return os_DirEntry___fspath___impl(self);
+    return os_DirEntry___fspath___impl((DirEntry *)self);
 }
 
 PyDoc_STRVAR(os_scandir__doc__,
@@ -13140,4 +13140,4 @@ os__emscripten_debugger(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef OS__EMSCRIPTEN_DEBUGGER_METHODDEF
     #define OS__EMSCRIPTEN_DEBUGGER_METHODDEF
 #endif /* !defined(OS__EMSCRIPTEN_DEBUGGER_METHODDEF) */
-/*[clinic end generated code: output=39b69b279fd637f7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=34cb96bd07bcef90 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h
index e57aa8a07d78c7..9eba59731c3fba 100644
--- a/Modules/clinic/pyexpat.c.h
+++ b/Modules/clinic/pyexpat.c.h
@@ -22,7 +22,7 @@ pyexpat_xmlparser_SetReparseDeferralEnabled_impl(xmlparseobject *self,
                                                  int enabled);
 
 static PyObject *
-pyexpat_xmlparser_SetReparseDeferralEnabled(xmlparseobject *self, PyObject *arg)
+pyexpat_xmlparser_SetReparseDeferralEnabled(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int enabled;
@@ -31,7 +31,7 @@ pyexpat_xmlparser_SetReparseDeferralEnabled(xmlparseobject *self, PyObject *arg)
     if (enabled < 0) {
         goto exit;
     }
-    return_value = pyexpat_xmlparser_SetReparseDeferralEnabled_impl(self, enabled);
+    return_value = pyexpat_xmlparser_SetReparseDeferralEnabled_impl((xmlparseobject *)self, enabled);
 
 exit:
     return return_value;
@@ -50,9 +50,9 @@ static PyObject *
 pyexpat_xmlparser_GetReparseDeferralEnabled_impl(xmlparseobject *self);
 
 static PyObject *
-pyexpat_xmlparser_GetReparseDeferralEnabled(xmlparseobject *self, PyObject *Py_UNUSED(ignored))
+pyexpat_xmlparser_GetReparseDeferralEnabled(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pyexpat_xmlparser_GetReparseDeferralEnabled_impl(self);
+    return pyexpat_xmlparser_GetReparseDeferralEnabled_impl((xmlparseobject *)self);
 }
 
 PyDoc_STRVAR(pyexpat_xmlparser_Parse__doc__,
@@ -71,7 +71,7 @@ pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyTypeObject *cls,
                              PyObject *data, int isfinal);
 
 static PyObject *
-pyexpat_xmlparser_Parse(xmlparseobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pyexpat_xmlparser_Parse(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -105,7 +105,7 @@ pyexpat_xmlparser_Parse(xmlparseobject *self, PyTypeObject *cls, PyObject *const
         goto exit;
     }
 skip_optional_posonly:
-    return_value = pyexpat_xmlparser_Parse_impl(self, cls, data, isfinal);
+    return_value = pyexpat_xmlparser_Parse_impl((xmlparseobject *)self, cls, data, isfinal);
 
 exit:
     return return_value;
@@ -125,7 +125,7 @@ pyexpat_xmlparser_ParseFile_impl(xmlparseobject *self, PyTypeObject *cls,
                                  PyObject *file);
 
 static PyObject *
-pyexpat_xmlparser_ParseFile(xmlparseobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pyexpat_xmlparser_ParseFile(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -150,7 +150,7 @@ pyexpat_xmlparser_ParseFile(xmlparseobject *self, PyTypeObject *cls, PyObject *c
         goto exit;
     }
     file = args[0];
-    return_value = pyexpat_xmlparser_ParseFile_impl(self, cls, file);
+    return_value = pyexpat_xmlparser_ParseFile_impl((xmlparseobject *)self, cls, file);
 
 exit:
     return return_value;
@@ -169,7 +169,7 @@ static PyObject *
 pyexpat_xmlparser_SetBase_impl(xmlparseobject *self, const char *base);
 
 static PyObject *
-pyexpat_xmlparser_SetBase(xmlparseobject *self, PyObject *arg)
+pyexpat_xmlparser_SetBase(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *base;
@@ -187,7 +187,7 @@ pyexpat_xmlparser_SetBase(xmlparseobject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = pyexpat_xmlparser_SetBase_impl(self, base);
+    return_value = pyexpat_xmlparser_SetBase_impl((xmlparseobject *)self, base);
 
 exit:
     return return_value;
@@ -206,9 +206,9 @@ static PyObject *
 pyexpat_xmlparser_GetBase_impl(xmlparseobject *self);
 
 static PyObject *
-pyexpat_xmlparser_GetBase(xmlparseobject *self, PyObject *Py_UNUSED(ignored))
+pyexpat_xmlparser_GetBase(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pyexpat_xmlparser_GetBase_impl(self);
+    return pyexpat_xmlparser_GetBase_impl((xmlparseobject *)self);
 }
 
 PyDoc_STRVAR(pyexpat_xmlparser_GetInputContext__doc__,
@@ -227,9 +227,9 @@ static PyObject *
 pyexpat_xmlparser_GetInputContext_impl(xmlparseobject *self);
 
 static PyObject *
-pyexpat_xmlparser_GetInputContext(xmlparseobject *self, PyObject *Py_UNUSED(ignored))
+pyexpat_xmlparser_GetInputContext(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pyexpat_xmlparser_GetInputContext_impl(self);
+    return pyexpat_xmlparser_GetInputContext_impl((xmlparseobject *)self);
 }
 
 PyDoc_STRVAR(pyexpat_xmlparser_ExternalEntityParserCreate__doc__,
@@ -249,7 +249,7 @@ pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self,
                                                   const char *encoding);
 
 static PyObject *
-pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pyexpat_xmlparser_ExternalEntityParserCreate(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -309,7 +309,7 @@ pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyTypeObject
         goto exit;
     }
 skip_optional_posonly:
-    return_value = pyexpat_xmlparser_ExternalEntityParserCreate_impl(self, cls, context, encoding);
+    return_value = pyexpat_xmlparser_ExternalEntityParserCreate_impl((xmlparseobject *)self, cls, context, encoding);
 
 exit:
     return return_value;
@@ -333,7 +333,7 @@ static PyObject *
 pyexpat_xmlparser_SetParamEntityParsing_impl(xmlparseobject *self, int flag);
 
 static PyObject *
-pyexpat_xmlparser_SetParamEntityParsing(xmlparseobject *self, PyObject *arg)
+pyexpat_xmlparser_SetParamEntityParsing(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int flag;
@@ -342,7 +342,7 @@ pyexpat_xmlparser_SetParamEntityParsing(xmlparseobject *self, PyObject *arg)
     if (flag == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = pyexpat_xmlparser_SetParamEntityParsing_impl(self, flag);
+    return_value = pyexpat_xmlparser_SetParamEntityParsing_impl((xmlparseobject *)self, flag);
 
 exit:
     return return_value;
@@ -368,7 +368,7 @@ pyexpat_xmlparser_UseForeignDTD_impl(xmlparseobject *self, PyTypeObject *cls,
                                      int flag);
 
 static PyObject *
-pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pyexpat_xmlparser_UseForeignDTD(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -400,7 +400,7 @@ pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyTypeObject *cls, PyObjec
         goto exit;
     }
 skip_optional_posonly:
-    return_value = pyexpat_xmlparser_UseForeignDTD_impl(self, cls, flag);
+    return_value = pyexpat_xmlparser_UseForeignDTD_impl((xmlparseobject *)self, cls, flag);
 
 exit:
     return return_value;
@@ -550,4 +550,4 @@ pyexpat_ErrorString(PyObject *module, PyObject *arg)
 #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
     #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
 #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */
-/*[clinic end generated code: output=63be65cb1823b5f8 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7ee30ae5b666d0a8 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/selectmodule.c.h b/Modules/clinic/selectmodule.c.h
index 806a888d6b8cd9..d8bdd6f95f3d29 100644
--- a/Modules/clinic/selectmodule.c.h
+++ b/Modules/clinic/selectmodule.c.h
@@ -91,7 +91,7 @@ static PyObject *
 select_poll_register_impl(pollObject *self, int fd, unsigned short eventmask);
 
 static PyObject *
-select_poll_register(pollObject *self, PyObject *const *args, Py_ssize_t nargs)
+select_poll_register(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int fd;
@@ -112,7 +112,7 @@ select_poll_register(pollObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_poll_register_impl(self, fd, eventmask);
+    return_value = select_poll_register_impl((pollObject *)self, fd, eventmask);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -142,7 +142,7 @@ static PyObject *
 select_poll_modify_impl(pollObject *self, int fd, unsigned short eventmask);
 
 static PyObject *
-select_poll_modify(pollObject *self, PyObject *const *args, Py_ssize_t nargs)
+select_poll_modify(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int fd;
@@ -159,7 +159,7 @@ select_poll_modify(pollObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_poll_modify_impl(self, fd, eventmask);
+    return_value = select_poll_modify_impl((pollObject *)self, fd, eventmask);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -183,7 +183,7 @@ static PyObject *
 select_poll_unregister_impl(pollObject *self, int fd);
 
 static PyObject *
-select_poll_unregister(pollObject *self, PyObject *arg)
+select_poll_unregister(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int fd;
@@ -193,7 +193,7 @@ select_poll_unregister(pollObject *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_poll_unregister_impl(self, fd);
+    return_value = select_poll_unregister_impl((pollObject *)self, fd);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -224,7 +224,7 @@ static PyObject *
 select_poll_poll_impl(pollObject *self, PyObject *timeout_obj);
 
 static PyObject *
-select_poll_poll(pollObject *self, PyObject *const *args, Py_ssize_t nargs)
+select_poll_poll(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *timeout_obj = Py_None;
@@ -238,7 +238,7 @@ select_poll_poll(pollObject *self, PyObject *const *args, Py_ssize_t nargs)
     timeout_obj = args[0];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_poll_poll_impl(self, timeout_obj);
+    return_value = select_poll_poll_impl((pollObject *)self, timeout_obj);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -270,7 +270,7 @@ select_devpoll_register_impl(devpollObject *self, int fd,
                              unsigned short eventmask);
 
 static PyObject *
-select_devpoll_register(devpollObject *self, PyObject *const *args, Py_ssize_t nargs)
+select_devpoll_register(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int fd;
@@ -291,7 +291,7 @@ select_devpoll_register(devpollObject *self, PyObject *const *args, Py_ssize_t n
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_devpoll_register_impl(self, fd, eventmask);
+    return_value = select_devpoll_register_impl((devpollObject *)self, fd, eventmask);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -323,7 +323,7 @@ select_devpoll_modify_impl(devpollObject *self, int fd,
                            unsigned short eventmask);
 
 static PyObject *
-select_devpoll_modify(devpollObject *self, PyObject *const *args, Py_ssize_t nargs)
+select_devpoll_modify(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int fd;
@@ -344,7 +344,7 @@ select_devpoll_modify(devpollObject *self, PyObject *const *args, Py_ssize_t nar
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_devpoll_modify_impl(self, fd, eventmask);
+    return_value = select_devpoll_modify_impl((devpollObject *)self, fd, eventmask);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -368,7 +368,7 @@ static PyObject *
 select_devpoll_unregister_impl(devpollObject *self, int fd);
 
 static PyObject *
-select_devpoll_unregister(devpollObject *self, PyObject *arg)
+select_devpoll_unregister(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int fd;
@@ -378,7 +378,7 @@ select_devpoll_unregister(devpollObject *self, PyObject *arg)
         goto exit;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_devpoll_unregister_impl(self, fd);
+    return_value = select_devpoll_unregister_impl((devpollObject *)self, fd);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -409,7 +409,7 @@ static PyObject *
 select_devpoll_poll_impl(devpollObject *self, PyObject *timeout_obj);
 
 static PyObject *
-select_devpoll_poll(devpollObject *self, PyObject *const *args, Py_ssize_t nargs)
+select_devpoll_poll(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *timeout_obj = Py_None;
@@ -423,7 +423,7 @@ select_devpoll_poll(devpollObject *self, PyObject *const *args, Py_ssize_t nargs
     timeout_obj = args[0];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_devpoll_poll_impl(self, timeout_obj);
+    return_value = select_devpoll_poll_impl((devpollObject *)self, timeout_obj);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -449,12 +449,12 @@ static PyObject *
 select_devpoll_close_impl(devpollObject *self);
 
 static PyObject *
-select_devpoll_close(devpollObject *self, PyObject *Py_UNUSED(ignored))
+select_devpoll_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_devpoll_close_impl(self);
+    return_value = select_devpoll_close_impl((devpollObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -477,12 +477,12 @@ static PyObject *
 select_devpoll_fileno_impl(devpollObject *self);
 
 static PyObject *
-select_devpoll_fileno(devpollObject *self, PyObject *Py_UNUSED(ignored))
+select_devpoll_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_devpoll_fileno_impl(self);
+    return_value = select_devpoll_fileno_impl((devpollObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -643,12 +643,12 @@ static PyObject *
 select_epoll_close_impl(pyEpoll_Object *self);
 
 static PyObject *
-select_epoll_close(pyEpoll_Object *self, PyObject *Py_UNUSED(ignored))
+select_epoll_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_epoll_close_impl(self);
+    return_value = select_epoll_close_impl((pyEpoll_Object *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -671,9 +671,9 @@ static PyObject *
 select_epoll_fileno_impl(pyEpoll_Object *self);
 
 static PyObject *
-select_epoll_fileno(pyEpoll_Object *self, PyObject *Py_UNUSED(ignored))
+select_epoll_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return select_epoll_fileno_impl(self);
+    return select_epoll_fileno_impl((pyEpoll_Object *)self);
 }
 
 #endif /* defined(HAVE_EPOLL) */
@@ -734,7 +734,7 @@ select_epoll_register_impl(pyEpoll_Object *self, int fd,
                            unsigned int eventmask);
 
 static PyObject *
-select_epoll_register(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+select_epoll_register(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -784,7 +784,7 @@ select_epoll_register(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t na
         goto exit;
     }
 skip_optional_pos:
-    return_value = select_epoll_register_impl(self, fd, eventmask);
+    return_value = select_epoll_register_impl((pyEpoll_Object *)self, fd, eventmask);
 
 exit:
     return return_value;
@@ -813,7 +813,7 @@ select_epoll_modify_impl(pyEpoll_Object *self, int fd,
                          unsigned int eventmask);
 
 static PyObject *
-select_epoll_modify(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+select_epoll_modify(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -858,7 +858,7 @@ select_epoll_modify(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t narg
     if (eventmask == (unsigned int)-1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = select_epoll_modify_impl(self, fd, eventmask);
+    return_value = select_epoll_modify_impl((pyEpoll_Object *)self, fd, eventmask);
 
 exit:
     return return_value;
@@ -884,7 +884,7 @@ static PyObject *
 select_epoll_unregister_impl(pyEpoll_Object *self, int fd);
 
 static PyObject *
-select_epoll_unregister(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+select_epoll_unregister(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -924,7 +924,7 @@ select_epoll_unregister(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t
     if (fd < 0) {
         goto exit;
     }
-    return_value = select_epoll_unregister_impl(self, fd);
+    return_value = select_epoll_unregister_impl((pyEpoll_Object *)self, fd);
 
 exit:
     return return_value;
@@ -957,7 +957,7 @@ select_epoll_poll_impl(pyEpoll_Object *self, PyObject *timeout_obj,
                        int maxevents);
 
 static PyObject *
-select_epoll_poll(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+select_epoll_poll(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1009,7 +1009,7 @@ select_epoll_poll(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs,
         goto exit;
     }
 skip_optional_pos:
-    return_value = select_epoll_poll_impl(self, timeout_obj, maxevents);
+    return_value = select_epoll_poll_impl((pyEpoll_Object *)self, timeout_obj, maxevents);
 
 exit:
     return return_value;
@@ -1031,9 +1031,9 @@ static PyObject *
 select_epoll___enter___impl(pyEpoll_Object *self);
 
 static PyObject *
-select_epoll___enter__(pyEpoll_Object *self, PyObject *Py_UNUSED(ignored))
+select_epoll___enter__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return select_epoll___enter___impl(self);
+    return select_epoll___enter___impl((pyEpoll_Object *)self);
 }
 
 #endif /* defined(HAVE_EPOLL) */
@@ -1053,7 +1053,7 @@ select_epoll___exit___impl(pyEpoll_Object *self, PyObject *exc_type,
                            PyObject *exc_value, PyObject *exc_tb);
 
 static PyObject *
-select_epoll___exit__(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs)
+select_epoll___exit__(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *exc_type = Py_None;
@@ -1076,7 +1076,7 @@ select_epoll___exit__(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t na
     }
     exc_tb = args[2];
 skip_optional:
-    return_value = select_epoll___exit___impl(self, exc_type, exc_value, exc_tb);
+    return_value = select_epoll___exit___impl((pyEpoll_Object *)self, exc_type, exc_value, exc_tb);
 
 exit:
     return return_value;
@@ -1146,12 +1146,12 @@ static PyObject *
 select_kqueue_close_impl(kqueue_queue_Object *self);
 
 static PyObject *
-select_kqueue_close(kqueue_queue_Object *self, PyObject *Py_UNUSED(ignored))
+select_kqueue_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = select_kqueue_close_impl(self);
+    return_value = select_kqueue_close_impl((kqueue_queue_Object *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -1174,9 +1174,9 @@ static PyObject *
 select_kqueue_fileno_impl(kqueue_queue_Object *self);
 
 static PyObject *
-select_kqueue_fileno(kqueue_queue_Object *self, PyObject *Py_UNUSED(ignored))
+select_kqueue_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return select_kqueue_fileno_impl(self);
+    return select_kqueue_fileno_impl((kqueue_queue_Object *)self);
 }
 
 #endif /* defined(HAVE_KQUEUE) */
@@ -1238,7 +1238,7 @@ select_kqueue_control_impl(kqueue_queue_Object *self, PyObject *changelist,
                            int maxevents, PyObject *otimeout);
 
 static PyObject *
-select_kqueue_control(kqueue_queue_Object *self, PyObject *const *args, Py_ssize_t nargs)
+select_kqueue_control(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *changelist;
@@ -1258,7 +1258,7 @@ select_kqueue_control(kqueue_queue_Object *self, PyObject *const *args, Py_ssize
     }
     otimeout = args[2];
 skip_optional:
-    return_value = select_kqueue_control_impl(self, changelist, maxevents, otimeout);
+    return_value = select_kqueue_control_impl((kqueue_queue_Object *)self, changelist, maxevents, otimeout);
 
 exit:
     return return_value;
@@ -1365,4 +1365,4 @@ select_kqueue_control(kqueue_queue_Object *self, PyObject *const *args, Py_ssize
 #ifndef SELECT_KQUEUE_CONTROL_METHODDEF
     #define SELECT_KQUEUE_CONTROL_METHODDEF
 #endif /* !defined(SELECT_KQUEUE_CONTROL_METHODDEF) */
-/*[clinic end generated code: output=78b4e67f7d401b5e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c18fd93efc5f4dce input=a9049054013a1b77]*/
diff --git a/Modules/clinic/sha1module.c.h b/Modules/clinic/sha1module.c.h
index 6af77ba64ecce6..ddd8e66a41d7ff 100644
--- a/Modules/clinic/sha1module.c.h
+++ b/Modules/clinic/sha1module.c.h
@@ -21,13 +21,13 @@ static PyObject *
 SHA1Type_copy_impl(SHA1object *self, PyTypeObject *cls);
 
 static PyObject *
-SHA1Type_copy(SHA1object *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+SHA1Type_copy(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "copy() takes no arguments");
         return NULL;
     }
-    return SHA1Type_copy_impl(self, cls);
+    return SHA1Type_copy_impl((SHA1object *)self, cls);
 }
 
 PyDoc_STRVAR(SHA1Type_digest__doc__,
@@ -43,9 +43,9 @@ static PyObject *
 SHA1Type_digest_impl(SHA1object *self);
 
 static PyObject *
-SHA1Type_digest(SHA1object *self, PyObject *Py_UNUSED(ignored))
+SHA1Type_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return SHA1Type_digest_impl(self);
+    return SHA1Type_digest_impl((SHA1object *)self);
 }
 
 PyDoc_STRVAR(SHA1Type_hexdigest__doc__,
@@ -61,9 +61,9 @@ static PyObject *
 SHA1Type_hexdigest_impl(SHA1object *self);
 
 static PyObject *
-SHA1Type_hexdigest(SHA1object *self, PyObject *Py_UNUSED(ignored))
+SHA1Type_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return SHA1Type_hexdigest_impl(self);
+    return SHA1Type_hexdigest_impl((SHA1object *)self);
 }
 
 PyDoc_STRVAR(SHA1Type_update__doc__,
@@ -149,4 +149,4 @@ _sha1_sha1(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=917e2789f1f5ebf9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ad6f3788a6e7ff6f input=a9049054013a1b77]*/
diff --git a/Modules/clinic/sha2module.c.h b/Modules/clinic/sha2module.c.h
index fec655a0dfaa58..d86f5510d752e8 100644
--- a/Modules/clinic/sha2module.c.h
+++ b/Modules/clinic/sha2module.c.h
@@ -21,13 +21,13 @@ static PyObject *
 SHA256Type_copy_impl(SHA256object *self, PyTypeObject *cls);
 
 static PyObject *
-SHA256Type_copy(SHA256object *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+SHA256Type_copy(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "copy() takes no arguments");
         return NULL;
     }
-    return SHA256Type_copy_impl(self, cls);
+    return SHA256Type_copy_impl((SHA256object *)self, cls);
 }
 
 PyDoc_STRVAR(SHA512Type_copy__doc__,
@@ -43,13 +43,13 @@ static PyObject *
 SHA512Type_copy_impl(SHA512object *self, PyTypeObject *cls);
 
 static PyObject *
-SHA512Type_copy(SHA512object *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+SHA512Type_copy(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "copy() takes no arguments");
         return NULL;
     }
-    return SHA512Type_copy_impl(self, cls);
+    return SHA512Type_copy_impl((SHA512object *)self, cls);
 }
 
 PyDoc_STRVAR(SHA256Type_digest__doc__,
@@ -65,9 +65,9 @@ static PyObject *
 SHA256Type_digest_impl(SHA256object *self);
 
 static PyObject *
-SHA256Type_digest(SHA256object *self, PyObject *Py_UNUSED(ignored))
+SHA256Type_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return SHA256Type_digest_impl(self);
+    return SHA256Type_digest_impl((SHA256object *)self);
 }
 
 PyDoc_STRVAR(SHA512Type_digest__doc__,
@@ -83,9 +83,9 @@ static PyObject *
 SHA512Type_digest_impl(SHA512object *self);
 
 static PyObject *
-SHA512Type_digest(SHA512object *self, PyObject *Py_UNUSED(ignored))
+SHA512Type_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return SHA512Type_digest_impl(self);
+    return SHA512Type_digest_impl((SHA512object *)self);
 }
 
 PyDoc_STRVAR(SHA256Type_hexdigest__doc__,
@@ -101,9 +101,9 @@ static PyObject *
 SHA256Type_hexdigest_impl(SHA256object *self);
 
 static PyObject *
-SHA256Type_hexdigest(SHA256object *self, PyObject *Py_UNUSED(ignored))
+SHA256Type_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return SHA256Type_hexdigest_impl(self);
+    return SHA256Type_hexdigest_impl((SHA256object *)self);
 }
 
 PyDoc_STRVAR(SHA512Type_hexdigest__doc__,
@@ -119,9 +119,9 @@ static PyObject *
 SHA512Type_hexdigest_impl(SHA512object *self);
 
 static PyObject *
-SHA512Type_hexdigest(SHA512object *self, PyObject *Py_UNUSED(ignored))
+SHA512Type_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return SHA512Type_hexdigest_impl(self);
+    return SHA512Type_hexdigest_impl((SHA512object *)self);
 }
 
 PyDoc_STRVAR(SHA256Type_update__doc__,
@@ -441,4 +441,4 @@ _sha2_sha384(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=602a6939b8ec0927 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1d7fec114eb6b6e3 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/sha3module.c.h b/Modules/clinic/sha3module.c.h
index d9f4b66f81a038..729e216ce023cf 100644
--- a/Modules/clinic/sha3module.c.h
+++ b/Modules/clinic/sha3module.c.h
@@ -92,9 +92,9 @@ static PyObject *
 _sha3_sha3_224_copy_impl(SHA3object *self);
 
 static PyObject *
-_sha3_sha3_224_copy(SHA3object *self, PyObject *Py_UNUSED(ignored))
+_sha3_sha3_224_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _sha3_sha3_224_copy_impl(self);
+    return _sha3_sha3_224_copy_impl((SHA3object *)self);
 }
 
 PyDoc_STRVAR(_sha3_sha3_224_digest__doc__,
@@ -110,9 +110,9 @@ static PyObject *
 _sha3_sha3_224_digest_impl(SHA3object *self);
 
 static PyObject *
-_sha3_sha3_224_digest(SHA3object *self, PyObject *Py_UNUSED(ignored))
+_sha3_sha3_224_digest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _sha3_sha3_224_digest_impl(self);
+    return _sha3_sha3_224_digest_impl((SHA3object *)self);
 }
 
 PyDoc_STRVAR(_sha3_sha3_224_hexdigest__doc__,
@@ -128,9 +128,9 @@ static PyObject *
 _sha3_sha3_224_hexdigest_impl(SHA3object *self);
 
 static PyObject *
-_sha3_sha3_224_hexdigest(SHA3object *self, PyObject *Py_UNUSED(ignored))
+_sha3_sha3_224_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _sha3_sha3_224_hexdigest_impl(self);
+    return _sha3_sha3_224_hexdigest_impl((SHA3object *)self);
 }
 
 PyDoc_STRVAR(_sha3_sha3_224_update__doc__,
@@ -155,7 +155,7 @@ static PyObject *
 _sha3_shake_128_digest_impl(SHA3object *self, unsigned long length);
 
 static PyObject *
-_sha3_shake_128_digest(SHA3object *self, PyObject *arg)
+_sha3_shake_128_digest(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     unsigned long length;
@@ -163,7 +163,7 @@ _sha3_shake_128_digest(SHA3object *self, PyObject *arg)
     if (!_PyLong_UnsignedLong_Converter(arg, &length)) {
         goto exit;
     }
-    return_value = _sha3_shake_128_digest_impl(self, length);
+    return_value = _sha3_shake_128_digest_impl((SHA3object *)self, length);
 
 exit:
     return return_value;
@@ -182,7 +182,7 @@ static PyObject *
 _sha3_shake_128_hexdigest_impl(SHA3object *self, unsigned long length);
 
 static PyObject *
-_sha3_shake_128_hexdigest(SHA3object *self, PyObject *arg)
+_sha3_shake_128_hexdigest(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     unsigned long length;
@@ -190,9 +190,9 @@ _sha3_shake_128_hexdigest(SHA3object *self, PyObject *arg)
     if (!_PyLong_UnsignedLong_Converter(arg, &length)) {
         goto exit;
     }
-    return_value = _sha3_shake_128_hexdigest_impl(self, length);
+    return_value = _sha3_shake_128_hexdigest_impl((SHA3object *)self, length);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=5c644eb0ed42b993 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=21da06d9570969d8 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/socketmodule.c.h b/Modules/clinic/socketmodule.c.h
index 2152f288a9722f..dc62c4290d3e3b 100644
--- a/Modules/clinic/socketmodule.c.h
+++ b/Modules/clinic/socketmodule.c.h
@@ -23,9 +23,9 @@ static PyObject *
 _socket_socket_close_impl(PySocketSockObject *s);
 
 static PyObject *
-_socket_socket_close(PySocketSockObject *s, PyObject *Py_UNUSED(ignored))
+_socket_socket_close(PyObject *s, PyObject *Py_UNUSED(ignored))
 {
-    return _socket_socket_close_impl(s);
+    return _socket_socket_close_impl((PySocketSockObject *)s);
 }
 
 static int
@@ -126,7 +126,7 @@ static PyObject *
 _socket_socket_ntohs_impl(PySocketSockObject *self, int x);
 
 static PyObject *
-_socket_socket_ntohs(PySocketSockObject *self, PyObject *arg)
+_socket_socket_ntohs(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int x;
@@ -135,7 +135,7 @@ _socket_socket_ntohs(PySocketSockObject *self, PyObject *arg)
     if (x == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _socket_socket_ntohs_impl(self, x);
+    return_value = _socket_socket_ntohs_impl((PySocketSockObject *)self, x);
 
 exit:
     return return_value;
@@ -154,7 +154,7 @@ static PyObject *
 _socket_socket_htons_impl(PySocketSockObject *self, int x);
 
 static PyObject *
-_socket_socket_htons(PySocketSockObject *self, PyObject *arg)
+_socket_socket_htons(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int x;
@@ -163,7 +163,7 @@ _socket_socket_htons(PySocketSockObject *self, PyObject *arg)
     if (x == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = _socket_socket_htons_impl(self, x);
+    return_value = _socket_socket_htons_impl((PySocketSockObject *)self, x);
 
 exit:
     return return_value;
@@ -182,7 +182,7 @@ static PyObject *
 _socket_socket_inet_aton_impl(PySocketSockObject *self, const char *ip_addr);
 
 static PyObject *
-_socket_socket_inet_aton(PySocketSockObject *self, PyObject *arg)
+_socket_socket_inet_aton(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *ip_addr;
@@ -200,7 +200,7 @@ _socket_socket_inet_aton(PySocketSockObject *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _socket_socket_inet_aton_impl(self, ip_addr);
+    return_value = _socket_socket_inet_aton_impl((PySocketSockObject *)self, ip_addr);
 
 exit:
     return return_value;
@@ -221,7 +221,7 @@ static PyObject *
 _socket_socket_inet_ntoa_impl(PySocketSockObject *self, Py_buffer *packed_ip);
 
 static PyObject *
-_socket_socket_inet_ntoa(PySocketSockObject *self, PyObject *arg)
+_socket_socket_inet_ntoa(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer packed_ip = {NULL, NULL};
@@ -229,7 +229,7 @@ _socket_socket_inet_ntoa(PySocketSockObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &packed_ip, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = _socket_socket_inet_ntoa_impl(self, &packed_ip);
+    return_value = _socket_socket_inet_ntoa_impl((PySocketSockObject *)self, &packed_ip);
 
 exit:
     /* Cleanup for packed_ip */
@@ -257,7 +257,7 @@ static PyObject *
 _socket_socket_if_nametoindex_impl(PySocketSockObject *self, PyObject *oname);
 
 static PyObject *
-_socket_socket_if_nametoindex(PySocketSockObject *self, PyObject *arg)
+_socket_socket_if_nametoindex(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *oname;
@@ -265,7 +265,7 @@ _socket_socket_if_nametoindex(PySocketSockObject *self, PyObject *arg)
     if (!PyUnicode_FSConverter(arg, &oname)) {
         goto exit;
     }
-    return_value = _socket_socket_if_nametoindex_impl(self, oname);
+    return_value = _socket_socket_if_nametoindex_impl((PySocketSockObject *)self, oname);
 
 exit:
     return return_value;
@@ -280,4 +280,4 @@ _socket_socket_if_nametoindex(PySocketSockObject *self, PyObject *arg)
 #ifndef _SOCKET_SOCKET_IF_NAMETOINDEX_METHODDEF
     #define _SOCKET_SOCKET_IF_NAMETOINDEX_METHODDEF
 #endif /* !defined(_SOCKET_SOCKET_IF_NAMETOINDEX_METHODDEF) */
-/*[clinic end generated code: output=3e612e8df1c322dd input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d39efc30d811e74b input=a9049054013a1b77]*/
diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h
index 19906dc328d897..91a3ac76bcf0cc 100644
--- a/Modules/clinic/zlibmodule.c.h
+++ b/Modules/clinic/zlibmodule.c.h
@@ -439,7 +439,7 @@ zlib_Compress_compress_impl(compobject *self, PyTypeObject *cls,
                             Py_buffer *data);
 
 static PyObject *
-zlib_Compress_compress(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Compress_compress(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -466,7 +466,7 @@ zlib_Compress_compress(compobject *self, PyTypeObject *cls, PyObject *const *arg
     if (PyObject_GetBuffer(args[0], &data, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = zlib_Compress_compress_impl(self, cls, &data);
+    return_value = zlib_Compress_compress_impl((compobject *)self, cls, &data);
 
 exit:
     /* Cleanup for data */
@@ -502,7 +502,7 @@ zlib_Decompress_decompress_impl(compobject *self, PyTypeObject *cls,
                                 Py_buffer *data, Py_ssize_t max_length);
 
 static PyObject *
-zlib_Decompress_decompress(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Decompress_decompress(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -559,7 +559,7 @@ zlib_Decompress_decompress(compobject *self, PyTypeObject *cls, PyObject *const
         max_length = ival;
     }
 skip_optional_pos:
-    return_value = zlib_Decompress_decompress_impl(self, cls, &data, max_length);
+    return_value = zlib_Decompress_decompress_impl((compobject *)self, cls, &data, max_length);
 
 exit:
     /* Cleanup for data */
@@ -589,7 +589,7 @@ static PyObject *
 zlib_Compress_flush_impl(compobject *self, PyTypeObject *cls, int mode);
 
 static PyObject *
-zlib_Compress_flush(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Compress_flush(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -621,7 +621,7 @@ zlib_Compress_flush(compobject *self, PyTypeObject *cls, PyObject *const *args,
         goto exit;
     }
 skip_optional_posonly:
-    return_value = zlib_Compress_flush_impl(self, cls, mode);
+    return_value = zlib_Compress_flush_impl((compobject *)self, cls, mode);
 
 exit:
     return return_value;
@@ -642,13 +642,13 @@ static PyObject *
 zlib_Compress_copy_impl(compobject *self, PyTypeObject *cls);
 
 static PyObject *
-zlib_Compress_copy(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Compress_copy(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "copy() takes no arguments");
         return NULL;
     }
-    return zlib_Compress_copy_impl(self, cls);
+    return zlib_Compress_copy_impl((compobject *)self, cls);
 }
 
 #endif /* defined(HAVE_ZLIB_COPY) */
@@ -667,13 +667,13 @@ static PyObject *
 zlib_Compress___copy___impl(compobject *self, PyTypeObject *cls);
 
 static PyObject *
-zlib_Compress___copy__(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Compress___copy__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "__copy__() takes no arguments");
         return NULL;
     }
-    return zlib_Compress___copy___impl(self, cls);
+    return zlib_Compress___copy___impl((compobject *)self, cls);
 }
 
 #endif /* defined(HAVE_ZLIB_COPY) */
@@ -693,7 +693,7 @@ zlib_Compress___deepcopy___impl(compobject *self, PyTypeObject *cls,
                                 PyObject *memo);
 
 static PyObject *
-zlib_Compress___deepcopy__(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Compress___deepcopy__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -718,7 +718,7 @@ zlib_Compress___deepcopy__(compobject *self, PyTypeObject *cls, PyObject *const
         goto exit;
     }
     memo = args[0];
-    return_value = zlib_Compress___deepcopy___impl(self, cls, memo);
+    return_value = zlib_Compress___deepcopy___impl((compobject *)self, cls, memo);
 
 exit:
     return return_value;
@@ -741,13 +741,13 @@ static PyObject *
 zlib_Decompress_copy_impl(compobject *self, PyTypeObject *cls);
 
 static PyObject *
-zlib_Decompress_copy(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Decompress_copy(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "copy() takes no arguments");
         return NULL;
     }
-    return zlib_Decompress_copy_impl(self, cls);
+    return zlib_Decompress_copy_impl((compobject *)self, cls);
 }
 
 #endif /* defined(HAVE_ZLIB_COPY) */
@@ -766,13 +766,13 @@ static PyObject *
 zlib_Decompress___copy___impl(compobject *self, PyTypeObject *cls);
 
 static PyObject *
-zlib_Decompress___copy__(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Decompress___copy__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     if (nargs || (kwnames && PyTuple_GET_SIZE(kwnames))) {
         PyErr_SetString(PyExc_TypeError, "__copy__() takes no arguments");
         return NULL;
     }
-    return zlib_Decompress___copy___impl(self, cls);
+    return zlib_Decompress___copy___impl((compobject *)self, cls);
 }
 
 #endif /* defined(HAVE_ZLIB_COPY) */
@@ -792,7 +792,7 @@ zlib_Decompress___deepcopy___impl(compobject *self, PyTypeObject *cls,
                                   PyObject *memo);
 
 static PyObject *
-zlib_Decompress___deepcopy__(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Decompress___deepcopy__(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -817,7 +817,7 @@ zlib_Decompress___deepcopy__(compobject *self, PyTypeObject *cls, PyObject *cons
         goto exit;
     }
     memo = args[0];
-    return_value = zlib_Decompress___deepcopy___impl(self, cls, memo);
+    return_value = zlib_Decompress___deepcopy___impl((compobject *)self, cls, memo);
 
 exit:
     return return_value;
@@ -842,7 +842,7 @@ zlib_Decompress_flush_impl(compobject *self, PyTypeObject *cls,
                            Py_ssize_t length);
 
 static PyObject *
-zlib_Decompress_flush(compobject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_Decompress_flush(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -882,7 +882,7 @@ zlib_Decompress_flush(compobject *self, PyTypeObject *cls, PyObject *const *args
         length = ival;
     }
 skip_optional_posonly:
-    return_value = zlib_Decompress_flush_impl(self, cls, length);
+    return_value = zlib_Decompress_flush_impl((compobject *)self, cls, length);
 
 exit:
     return return_value;
@@ -915,7 +915,7 @@ zlib_ZlibDecompressor_decompress_impl(ZlibDecompressor *self,
                                       Py_buffer *data, Py_ssize_t max_length);
 
 static PyObject *
-zlib_ZlibDecompressor_decompress(ZlibDecompressor *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+zlib_ZlibDecompressor_decompress(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -972,7 +972,7 @@ zlib_ZlibDecompressor_decompress(ZlibDecompressor *self, PyObject *const *args,
         max_length = ival;
     }
 skip_optional_pos:
-    return_value = zlib_ZlibDecompressor_decompress_impl(self, &data, max_length);
+    return_value = zlib_ZlibDecompressor_decompress_impl((ZlibDecompressor *)self, &data, max_length);
 
 exit:
     /* Cleanup for data */
@@ -1109,4 +1109,4 @@ zlib_crc32(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 #ifndef ZLIB_DECOMPRESS___DEEPCOPY___METHODDEF
     #define ZLIB_DECOMPRESS___DEEPCOPY___METHODDEF
 #endif /* !defined(ZLIB_DECOMPRESS___DEEPCOPY___METHODDEF) */
-/*[clinic end generated code: output=2fef49f168842b17 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=969872868c303e8a input=a9049054013a1b77]*/
diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h
index dee7c1e8bffd25..91cf5363e639d1 100644
--- a/Objects/clinic/bytearrayobject.c.h
+++ b/Objects/clinic/bytearrayobject.c.h
@@ -123,7 +123,7 @@ bytearray_find_impl(PyByteArrayObject *self, PyObject *sub, Py_ssize_t start,
                     Py_ssize_t end);
 
 static PyObject *
-bytearray_find(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_find(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -147,7 +147,7 @@ bytearray_find(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_find_impl(self, sub, start, end);
+    return_value = bytearray_find_impl((PyByteArrayObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -172,7 +172,7 @@ bytearray_count_impl(PyByteArrayObject *self, PyObject *sub,
                      Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytearray_count(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_count(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -196,7 +196,7 @@ bytearray_count(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_count_impl(self, sub, start, end);
+    return_value = bytearray_count_impl((PyByteArrayObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -215,9 +215,9 @@ static PyObject *
 bytearray_clear_impl(PyByteArrayObject *self);
 
 static PyObject *
-bytearray_clear(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
+bytearray_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return bytearray_clear_impl(self);
+    return bytearray_clear_impl((PyByteArrayObject *)self);
 }
 
 PyDoc_STRVAR(bytearray_copy__doc__,
@@ -233,9 +233,9 @@ static PyObject *
 bytearray_copy_impl(PyByteArrayObject *self);
 
 static PyObject *
-bytearray_copy(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
+bytearray_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return bytearray_copy_impl(self);
+    return bytearray_copy_impl((PyByteArrayObject *)self);
 }
 
 PyDoc_STRVAR(bytearray_index__doc__,
@@ -259,7 +259,7 @@ bytearray_index_impl(PyByteArrayObject *self, PyObject *sub,
                      Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytearray_index(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -283,7 +283,7 @@ bytearray_index(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_index_impl(self, sub, start, end);
+    return_value = bytearray_index_impl((PyByteArrayObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -310,7 +310,7 @@ bytearray_rfind_impl(PyByteArrayObject *self, PyObject *sub,
                      Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytearray_rfind(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_rfind(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -334,7 +334,7 @@ bytearray_rfind(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_rfind_impl(self, sub, start, end);
+    return_value = bytearray_rfind_impl((PyByteArrayObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -361,7 +361,7 @@ bytearray_rindex_impl(PyByteArrayObject *self, PyObject *sub,
                       Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytearray_rindex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_rindex(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -385,7 +385,7 @@ bytearray_rindex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_rindex_impl(self, sub, start, end);
+    return_value = bytearray_rindex_impl((PyByteArrayObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -412,7 +412,7 @@ bytearray_startswith_impl(PyByteArrayObject *self, PyObject *subobj,
                           Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytearray_startswith(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_startswith(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *subobj;
@@ -436,7 +436,7 @@ bytearray_startswith(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_startswith_impl(self, subobj, start, end);
+    return_value = bytearray_startswith_impl((PyByteArrayObject *)self, subobj, start, end);
 
 exit:
     return return_value;
@@ -463,7 +463,7 @@ bytearray_endswith_impl(PyByteArrayObject *self, PyObject *subobj,
                         Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytearray_endswith(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_endswith(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *subobj;
@@ -487,7 +487,7 @@ bytearray_endswith(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t na
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_endswith_impl(self, subobj, start, end);
+    return_value = bytearray_endswith_impl((PyByteArrayObject *)self, subobj, start, end);
 
 exit:
     return return_value;
@@ -510,7 +510,7 @@ static PyObject *
 bytearray_removeprefix_impl(PyByteArrayObject *self, Py_buffer *prefix);
 
 static PyObject *
-bytearray_removeprefix(PyByteArrayObject *self, PyObject *arg)
+bytearray_removeprefix(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer prefix = {NULL, NULL};
@@ -518,7 +518,7 @@ bytearray_removeprefix(PyByteArrayObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &prefix, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = bytearray_removeprefix_impl(self, &prefix);
+    return_value = bytearray_removeprefix_impl((PyByteArrayObject *)self, &prefix);
 
 exit:
     /* Cleanup for prefix */
@@ -546,7 +546,7 @@ static PyObject *
 bytearray_removesuffix_impl(PyByteArrayObject *self, Py_buffer *suffix);
 
 static PyObject *
-bytearray_removesuffix(PyByteArrayObject *self, PyObject *arg)
+bytearray_removesuffix(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer suffix = {NULL, NULL};
@@ -554,7 +554,7 @@ bytearray_removesuffix(PyByteArrayObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &suffix, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = bytearray_removesuffix_impl(self, &suffix);
+    return_value = bytearray_removesuffix_impl((PyByteArrayObject *)self, &suffix);
 
 exit:
     /* Cleanup for suffix */
@@ -585,7 +585,7 @@ bytearray_translate_impl(PyByteArrayObject *self, PyObject *table,
                          PyObject *deletechars);
 
 static PyObject *
-bytearray_translate(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytearray_translate(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -629,7 +629,7 @@ bytearray_translate(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t n
     }
     deletechars = args[1];
 skip_optional_pos:
-    return_value = bytearray_translate_impl(self, table, deletechars);
+    return_value = bytearray_translate_impl((PyByteArrayObject *)self, table, deletechars);
 
 exit:
     return return_value;
@@ -704,7 +704,7 @@ bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old,
                        Py_buffer *new, Py_ssize_t count);
 
 static PyObject *
-bytearray_replace(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_replace(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_buffer old = {NULL, NULL};
@@ -736,7 +736,7 @@ bytearray_replace(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nar
         count = ival;
     }
 skip_optional:
-    return_value = bytearray_replace_impl(self, &old, &new, count);
+    return_value = bytearray_replace_impl((PyByteArrayObject *)self, &old, &new, count);
 
 exit:
     /* Cleanup for old */
@@ -773,7 +773,7 @@ bytearray_split_impl(PyByteArrayObject *self, PyObject *sep,
                      Py_ssize_t maxsplit);
 
 static PyObject *
-bytearray_split(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytearray_split(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -833,7 +833,7 @@ bytearray_split(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs
         maxsplit = ival;
     }
 skip_optional_pos:
-    return_value = bytearray_split_impl(self, sep, maxsplit);
+    return_value = bytearray_split_impl((PyByteArrayObject *)self, sep, maxsplit);
 
 exit:
     return return_value;
@@ -896,7 +896,7 @@ bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep,
                       Py_ssize_t maxsplit);
 
 static PyObject *
-bytearray_rsplit(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytearray_rsplit(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -956,7 +956,7 @@ bytearray_rsplit(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg
         maxsplit = ival;
     }
 skip_optional_pos:
-    return_value = bytearray_rsplit_impl(self, sep, maxsplit);
+    return_value = bytearray_rsplit_impl((PyByteArrayObject *)self, sep, maxsplit);
 
 exit:
     return return_value;
@@ -975,9 +975,9 @@ static PyObject *
 bytearray_reverse_impl(PyByteArrayObject *self);
 
 static PyObject *
-bytearray_reverse(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
+bytearray_reverse(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return bytearray_reverse_impl(self);
+    return bytearray_reverse_impl((PyByteArrayObject *)self);
 }
 
 PyDoc_STRVAR(bytearray_insert__doc__,
@@ -998,7 +998,7 @@ static PyObject *
 bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item);
 
 static PyObject *
-bytearray_insert(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_insert(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t index;
@@ -1022,7 +1022,7 @@ bytearray_insert(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg
     if (!_getbytevalue(args[1], &item)) {
         goto exit;
     }
-    return_value = bytearray_insert_impl(self, index, item);
+    return_value = bytearray_insert_impl((PyByteArrayObject *)self, index, item);
 
 exit:
     return return_value;
@@ -1044,7 +1044,7 @@ static PyObject *
 bytearray_append_impl(PyByteArrayObject *self, int item);
 
 static PyObject *
-bytearray_append(PyByteArrayObject *self, PyObject *arg)
+bytearray_append(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int item;
@@ -1052,7 +1052,7 @@ bytearray_append(PyByteArrayObject *self, PyObject *arg)
     if (!_getbytevalue(arg, &item)) {
         goto exit;
     }
-    return_value = bytearray_append_impl(self, item);
+    return_value = bytearray_append_impl((PyByteArrayObject *)self, item);
 
 exit:
     return return_value;
@@ -1089,7 +1089,7 @@ static PyObject *
 bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index);
 
 static PyObject *
-bytearray_pop(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_pop(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t index = -1;
@@ -1113,7 +1113,7 @@ bytearray_pop(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
         index = ival;
     }
 skip_optional:
-    return_value = bytearray_pop_impl(self, index);
+    return_value = bytearray_pop_impl((PyByteArrayObject *)self, index);
 
 exit:
     return return_value;
@@ -1135,7 +1135,7 @@ static PyObject *
 bytearray_remove_impl(PyByteArrayObject *self, int value);
 
 static PyObject *
-bytearray_remove(PyByteArrayObject *self, PyObject *arg)
+bytearray_remove(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int value;
@@ -1143,7 +1143,7 @@ bytearray_remove(PyByteArrayObject *self, PyObject *arg)
     if (!_getbytevalue(arg, &value)) {
         goto exit;
     }
-    return_value = bytearray_remove_impl(self, value);
+    return_value = bytearray_remove_impl((PyByteArrayObject *)self, value);
 
 exit:
     return return_value;
@@ -1164,7 +1164,7 @@ static PyObject *
 bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes);
 
 static PyObject *
-bytearray_strip(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_strip(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *bytes = Py_None;
@@ -1177,7 +1177,7 @@ bytearray_strip(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs
     }
     bytes = args[0];
 skip_optional:
-    return_value = bytearray_strip_impl(self, bytes);
+    return_value = bytearray_strip_impl((PyByteArrayObject *)self, bytes);
 
 exit:
     return return_value;
@@ -1198,7 +1198,7 @@ static PyObject *
 bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes);
 
 static PyObject *
-bytearray_lstrip(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_lstrip(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *bytes = Py_None;
@@ -1211,7 +1211,7 @@ bytearray_lstrip(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg
     }
     bytes = args[0];
 skip_optional:
-    return_value = bytearray_lstrip_impl(self, bytes);
+    return_value = bytearray_lstrip_impl((PyByteArrayObject *)self, bytes);
 
 exit:
     return return_value;
@@ -1232,7 +1232,7 @@ static PyObject *
 bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes);
 
 static PyObject *
-bytearray_rstrip(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_rstrip(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *bytes = Py_None;
@@ -1245,7 +1245,7 @@ bytearray_rstrip(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg
     }
     bytes = args[0];
 skip_optional:
-    return_value = bytearray_rstrip_impl(self, bytes);
+    return_value = bytearray_rstrip_impl((PyByteArrayObject *)self, bytes);
 
 exit:
     return return_value;
@@ -1274,7 +1274,7 @@ bytearray_decode_impl(PyByteArrayObject *self, const char *encoding,
                       const char *errors);
 
 static PyObject *
-bytearray_decode(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytearray_decode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1347,7 +1347,7 @@ bytearray_decode(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg
         goto exit;
     }
 skip_optional_pos:
-    return_value = bytearray_decode_impl(self, encoding, errors);
+    return_value = bytearray_decode_impl((PyByteArrayObject *)self, encoding, errors);
 
 exit:
     return return_value;
@@ -1382,7 +1382,7 @@ static PyObject *
 bytearray_splitlines_impl(PyByteArrayObject *self, int keepends);
 
 static PyObject *
-bytearray_splitlines(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytearray_splitlines(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1427,7 +1427,7 @@ bytearray_splitlines(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t
         goto exit;
     }
 skip_optional_pos:
-    return_value = bytearray_splitlines_impl(self, keepends);
+    return_value = bytearray_splitlines_impl((PyByteArrayObject *)self, keepends);
 
 exit:
     return return_value;
@@ -1495,7 +1495,7 @@ static PyObject *
 bytearray_hex_impl(PyByteArrayObject *self, PyObject *sep, int bytes_per_sep);
 
 static PyObject *
-bytearray_hex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytearray_hex(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1547,7 +1547,7 @@ bytearray_hex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs,
         goto exit;
     }
 skip_optional_pos:
-    return_value = bytearray_hex_impl(self, sep, bytes_per_sep);
+    return_value = bytearray_hex_impl((PyByteArrayObject *)self, sep, bytes_per_sep);
 
 exit:
     return return_value;
@@ -1566,9 +1566,9 @@ static PyObject *
 bytearray_reduce_impl(PyByteArrayObject *self);
 
 static PyObject *
-bytearray_reduce(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
+bytearray_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return bytearray_reduce_impl(self);
+    return bytearray_reduce_impl((PyByteArrayObject *)self);
 }
 
 PyDoc_STRVAR(bytearray_reduce_ex__doc__,
@@ -1584,7 +1584,7 @@ static PyObject *
 bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto);
 
 static PyObject *
-bytearray_reduce_ex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytearray_reduce_ex(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int proto = 0;
@@ -1600,7 +1600,7 @@ bytearray_reduce_ex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t n
         goto exit;
     }
 skip_optional:
-    return_value = bytearray_reduce_ex_impl(self, proto);
+    return_value = bytearray_reduce_ex_impl((PyByteArrayObject *)self, proto);
 
 exit:
     return return_value;
@@ -1619,8 +1619,8 @@ static PyObject *
 bytearray_sizeof_impl(PyByteArrayObject *self);
 
 static PyObject *
-bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored))
+bytearray_sizeof(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return bytearray_sizeof_impl(self);
+    return bytearray_sizeof_impl((PyByteArrayObject *)self);
 }
-/*[clinic end generated code: output=4488e38e7ffcc6ec input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bc8bec8514102bf3 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h
index d2c6cc88770999..9aef736428ad0e 100644
--- a/Objects/clinic/bytesobject.c.h
+++ b/Objects/clinic/bytesobject.c.h
@@ -22,9 +22,9 @@ static PyObject *
 bytes___bytes___impl(PyBytesObject *self);
 
 static PyObject *
-bytes___bytes__(PyBytesObject *self, PyObject *Py_UNUSED(ignored))
+bytes___bytes__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return bytes___bytes___impl(self);
+    return bytes___bytes___impl((PyBytesObject *)self);
 }
 
 PyDoc_STRVAR(bytes_split__doc__,
@@ -48,7 +48,7 @@ static PyObject *
 bytes_split_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit);
 
 static PyObject *
-bytes_split(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytes_split(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -108,7 +108,7 @@ bytes_split(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje
         maxsplit = ival;
     }
 skip_optional_pos:
-    return_value = bytes_split_impl(self, sep, maxsplit);
+    return_value = bytes_split_impl((PyBytesObject *)self, sep, maxsplit);
 
 exit:
     return return_value;
@@ -134,7 +134,7 @@ static PyObject *
 bytes_partition_impl(PyBytesObject *self, Py_buffer *sep);
 
 static PyObject *
-bytes_partition(PyBytesObject *self, PyObject *arg)
+bytes_partition(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer sep = {NULL, NULL};
@@ -142,7 +142,7 @@ bytes_partition(PyBytesObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &sep, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = bytes_partition_impl(self, &sep);
+    return_value = bytes_partition_impl((PyBytesObject *)self, &sep);
 
 exit:
     /* Cleanup for sep */
@@ -173,7 +173,7 @@ static PyObject *
 bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep);
 
 static PyObject *
-bytes_rpartition(PyBytesObject *self, PyObject *arg)
+bytes_rpartition(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer sep = {NULL, NULL};
@@ -181,7 +181,7 @@ bytes_rpartition(PyBytesObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &sep, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = bytes_rpartition_impl(self, &sep);
+    return_value = bytes_rpartition_impl((PyBytesObject *)self, &sep);
 
 exit:
     /* Cleanup for sep */
@@ -215,7 +215,7 @@ static PyObject *
 bytes_rsplit_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit);
 
 static PyObject *
-bytes_rsplit(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytes_rsplit(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -275,7 +275,7 @@ bytes_rsplit(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObj
         maxsplit = ival;
     }
 skip_optional_pos:
-    return_value = bytes_rsplit_impl(self, sep, maxsplit);
+    return_value = bytes_rsplit_impl((PyBytesObject *)self, sep, maxsplit);
 
 exit:
     return return_value;
@@ -317,7 +317,7 @@ bytes_find_impl(PyBytesObject *self, PyObject *sub, Py_ssize_t start,
                 Py_ssize_t end);
 
 static PyObject *
-bytes_find(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_find(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -341,7 +341,7 @@ bytes_find(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_find_impl(self, sub, start, end);
+    return_value = bytes_find_impl((PyBytesObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -368,7 +368,7 @@ bytes_index_impl(PyBytesObject *self, PyObject *sub, Py_ssize_t start,
                  Py_ssize_t end);
 
 static PyObject *
-bytes_index(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -392,7 +392,7 @@ bytes_index(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_index_impl(self, sub, start, end);
+    return_value = bytes_index_impl((PyBytesObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -419,7 +419,7 @@ bytes_rfind_impl(PyBytesObject *self, PyObject *sub, Py_ssize_t start,
                  Py_ssize_t end);
 
 static PyObject *
-bytes_rfind(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_rfind(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -443,7 +443,7 @@ bytes_rfind(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_rfind_impl(self, sub, start, end);
+    return_value = bytes_rfind_impl((PyBytesObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -470,7 +470,7 @@ bytes_rindex_impl(PyBytesObject *self, PyObject *sub, Py_ssize_t start,
                   Py_ssize_t end);
 
 static PyObject *
-bytes_rindex(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_rindex(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -494,7 +494,7 @@ bytes_rindex(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_rindex_impl(self, sub, start, end);
+    return_value = bytes_rindex_impl((PyBytesObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -515,7 +515,7 @@ static PyObject *
 bytes_strip_impl(PyBytesObject *self, PyObject *bytes);
 
 static PyObject *
-bytes_strip(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_strip(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *bytes = Py_None;
@@ -528,7 +528,7 @@ bytes_strip(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     bytes = args[0];
 skip_optional:
-    return_value = bytes_strip_impl(self, bytes);
+    return_value = bytes_strip_impl((PyBytesObject *)self, bytes);
 
 exit:
     return return_value;
@@ -549,7 +549,7 @@ static PyObject *
 bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes);
 
 static PyObject *
-bytes_lstrip(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_lstrip(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *bytes = Py_None;
@@ -562,7 +562,7 @@ bytes_lstrip(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     bytes = args[0];
 skip_optional:
-    return_value = bytes_lstrip_impl(self, bytes);
+    return_value = bytes_lstrip_impl((PyBytesObject *)self, bytes);
 
 exit:
     return return_value;
@@ -583,7 +583,7 @@ static PyObject *
 bytes_rstrip_impl(PyBytesObject *self, PyObject *bytes);
 
 static PyObject *
-bytes_rstrip(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_rstrip(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *bytes = Py_None;
@@ -596,7 +596,7 @@ bytes_rstrip(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     bytes = args[0];
 skip_optional:
-    return_value = bytes_rstrip_impl(self, bytes);
+    return_value = bytes_rstrip_impl((PyBytesObject *)self, bytes);
 
 exit:
     return return_value;
@@ -621,7 +621,7 @@ bytes_count_impl(PyBytesObject *self, PyObject *sub, Py_ssize_t start,
                  Py_ssize_t end);
 
 static PyObject *
-bytes_count(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_count(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sub;
@@ -645,7 +645,7 @@ bytes_count(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_count_impl(self, sub, start, end);
+    return_value = bytes_count_impl((PyBytesObject *)self, sub, start, end);
 
 exit:
     return return_value;
@@ -671,7 +671,7 @@ bytes_translate_impl(PyBytesObject *self, PyObject *table,
                      PyObject *deletechars);
 
 static PyObject *
-bytes_translate(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytes_translate(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -715,7 +715,7 @@ bytes_translate(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, Py
     }
     deletechars = args[1];
 skip_optional_pos:
-    return_value = bytes_translate_impl(self, table, deletechars);
+    return_value = bytes_translate_impl((PyBytesObject *)self, table, deletechars);
 
 exit:
     return return_value;
@@ -790,7 +790,7 @@ bytes_replace_impl(PyBytesObject *self, Py_buffer *old, Py_buffer *new,
                    Py_ssize_t count);
 
 static PyObject *
-bytes_replace(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_replace(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_buffer old = {NULL, NULL};
@@ -822,7 +822,7 @@ bytes_replace(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         count = ival;
     }
 skip_optional:
-    return_value = bytes_replace_impl(self, &old, &new, count);
+    return_value = bytes_replace_impl((PyBytesObject *)self, &old, &new, count);
 
 exit:
     /* Cleanup for old */
@@ -853,7 +853,7 @@ static PyObject *
 bytes_removeprefix_impl(PyBytesObject *self, Py_buffer *prefix);
 
 static PyObject *
-bytes_removeprefix(PyBytesObject *self, PyObject *arg)
+bytes_removeprefix(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer prefix = {NULL, NULL};
@@ -861,7 +861,7 @@ bytes_removeprefix(PyBytesObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &prefix, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = bytes_removeprefix_impl(self, &prefix);
+    return_value = bytes_removeprefix_impl((PyBytesObject *)self, &prefix);
 
 exit:
     /* Cleanup for prefix */
@@ -889,7 +889,7 @@ static PyObject *
 bytes_removesuffix_impl(PyBytesObject *self, Py_buffer *suffix);
 
 static PyObject *
-bytes_removesuffix(PyBytesObject *self, PyObject *arg)
+bytes_removesuffix(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer suffix = {NULL, NULL};
@@ -897,7 +897,7 @@ bytes_removesuffix(PyBytesObject *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &suffix, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = bytes_removesuffix_impl(self, &suffix);
+    return_value = bytes_removesuffix_impl((PyBytesObject *)self, &suffix);
 
 exit:
     /* Cleanup for suffix */
@@ -929,7 +929,7 @@ bytes_startswith_impl(PyBytesObject *self, PyObject *subobj,
                       Py_ssize_t start, Py_ssize_t end);
 
 static PyObject *
-bytes_startswith(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_startswith(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *subobj;
@@ -953,7 +953,7 @@ bytes_startswith(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_startswith_impl(self, subobj, start, end);
+    return_value = bytes_startswith_impl((PyBytesObject *)self, subobj, start, end);
 
 exit:
     return return_value;
@@ -980,7 +980,7 @@ bytes_endswith_impl(PyBytesObject *self, PyObject *subobj, Py_ssize_t start,
                     Py_ssize_t end);
 
 static PyObject *
-bytes_endswith(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
+bytes_endswith(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *subobj;
@@ -1004,7 +1004,7 @@ bytes_endswith(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = bytes_endswith_impl(self, subobj, start, end);
+    return_value = bytes_endswith_impl((PyBytesObject *)self, subobj, start, end);
 
 exit:
     return return_value;
@@ -1033,7 +1033,7 @@ bytes_decode_impl(PyBytesObject *self, const char *encoding,
                   const char *errors);
 
 static PyObject *
-bytes_decode(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytes_decode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1106,7 +1106,7 @@ bytes_decode(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObj
         goto exit;
     }
 skip_optional_pos:
-    return_value = bytes_decode_impl(self, encoding, errors);
+    return_value = bytes_decode_impl((PyBytesObject *)self, encoding, errors);
 
 exit:
     return return_value;
@@ -1128,7 +1128,7 @@ static PyObject *
 bytes_splitlines_impl(PyBytesObject *self, int keepends);
 
 static PyObject *
-bytes_splitlines(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytes_splitlines(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1173,7 +1173,7 @@ bytes_splitlines(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, P
         goto exit;
     }
 skip_optional_pos:
-    return_value = bytes_splitlines_impl(self, keepends);
+    return_value = bytes_splitlines_impl((PyBytesObject *)self, keepends);
 
 exit:
     return return_value;
@@ -1241,7 +1241,7 @@ static PyObject *
 bytes_hex_impl(PyBytesObject *self, PyObject *sep, int bytes_per_sep);
 
 static PyObject *
-bytes_hex(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+bytes_hex(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1293,7 +1293,7 @@ bytes_hex(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject
         goto exit;
     }
 skip_optional_pos:
-    return_value = bytes_hex_impl(self, sep, bytes_per_sep);
+    return_value = bytes_hex_impl((PyBytesObject *)self, sep, bytes_per_sep);
 
 exit:
     return return_value;
@@ -1391,4 +1391,4 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=fb7939a1983e463a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=96fe2d6ef9ac8f6a input=a9049054013a1b77]*/
diff --git a/Objects/clinic/classobject.c.h b/Objects/clinic/classobject.c.h
index 3e149c97324a6a..5934f1c2a41669 100644
--- a/Objects/clinic/classobject.c.h
+++ b/Objects/clinic/classobject.c.h
@@ -16,9 +16,9 @@ static PyObject *
 method___reduce___impl(PyMethodObject *self);
 
 static PyObject *
-method___reduce__(PyMethodObject *self, PyObject *Py_UNUSED(ignored))
+method___reduce__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return method___reduce___impl(self);
+    return method___reduce___impl((PyMethodObject *)self);
 }
 
 PyDoc_STRVAR(method_new__doc__,
@@ -82,4 +82,4 @@ instancemethod_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=5a5e3f2d0726f189 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ab546abf90aac94e input=a9049054013a1b77]*/
diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h
index 45738f767df50f..2184742cc0d99d 100644
--- a/Objects/clinic/codeobject.c.h
+++ b/Objects/clinic/codeobject.c.h
@@ -174,7 +174,7 @@ code_replace_impl(PyCodeObject *self, int co_argcount,
                   PyObject *co_exceptiontable);
 
 static PyObject *
-code_replace(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+code_replace(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -204,24 +204,24 @@ code_replace(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje
     #undef KWTUPLE
     PyObject *argsbuf[18];
     Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
-    int co_argcount = self->co_argcount;
-    int co_posonlyargcount = self->co_posonlyargcount;
-    int co_kwonlyargcount = self->co_kwonlyargcount;
-    int co_nlocals = self->co_nlocals;
-    int co_stacksize = self->co_stacksize;
-    int co_flags = self->co_flags;
-    int co_firstlineno = self->co_firstlineno;
+    int co_argcount = ((PyCodeObject *)self)->co_argcount;
+    int co_posonlyargcount = ((PyCodeObject *)self)->co_posonlyargcount;
+    int co_kwonlyargcount = ((PyCodeObject *)self)->co_kwonlyargcount;
+    int co_nlocals = ((PyCodeObject *)self)->co_nlocals;
+    int co_stacksize = ((PyCodeObject *)self)->co_stacksize;
+    int co_flags = ((PyCodeObject *)self)->co_flags;
+    int co_firstlineno = ((PyCodeObject *)self)->co_firstlineno;
     PyObject *co_code = NULL;
-    PyObject *co_consts = self->co_consts;
-    PyObject *co_names = self->co_names;
+    PyObject *co_consts = ((PyCodeObject *)self)->co_consts;
+    PyObject *co_names = ((PyCodeObject *)self)->co_names;
     PyObject *co_varnames = NULL;
     PyObject *co_freevars = NULL;
     PyObject *co_cellvars = NULL;
-    PyObject *co_filename = self->co_filename;
-    PyObject *co_name = self->co_name;
-    PyObject *co_qualname = self->co_qualname;
-    PyObject *co_linetable = self->co_linetable;
-    PyObject *co_exceptiontable = self->co_exceptiontable;
+    PyObject *co_filename = ((PyCodeObject *)self)->co_filename;
+    PyObject *co_name = ((PyCodeObject *)self)->co_name;
+    PyObject *co_qualname = ((PyCodeObject *)self)->co_qualname;
+    PyObject *co_linetable = ((PyCodeObject *)self)->co_linetable;
+    PyObject *co_exceptiontable = ((PyCodeObject *)self)->co_exceptiontable;
 
     args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser,
             /*minpos*/ 0, /*maxpos*/ 0, /*minkw*/ 0, /*varpos*/ 0, argsbuf);
@@ -400,7 +400,7 @@ code_replace(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje
     }
     co_exceptiontable = args[17];
 skip_optional_kwonly:
-    return_value = code_replace_impl(self, co_argcount, co_posonlyargcount, co_kwonlyargcount, co_nlocals, co_stacksize, co_flags, co_firstlineno, co_code, co_consts, co_names, co_varnames, co_freevars, co_cellvars, co_filename, co_name, co_qualname, co_linetable, co_exceptiontable);
+    return_value = code_replace_impl((PyCodeObject *)self, co_argcount, co_posonlyargcount, co_kwonlyargcount, co_nlocals, co_stacksize, co_flags, co_firstlineno, co_code, co_consts, co_names, co_varnames, co_freevars, co_cellvars, co_filename, co_name, co_qualname, co_linetable, co_exceptiontable);
 
 exit:
     return return_value;
@@ -421,7 +421,7 @@ static PyObject *
 code__varname_from_oparg_impl(PyCodeObject *self, int oparg);
 
 static PyObject *
-code__varname_from_oparg(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+code__varname_from_oparg(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -461,9 +461,9 @@ code__varname_from_oparg(PyCodeObject *self, PyObject *const *args, Py_ssize_t n
     if (oparg == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = code__varname_from_oparg_impl(self, oparg);
+    return_value = code__varname_from_oparg_impl((PyCodeObject *)self, oparg);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=e919ea67a1bcf524 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=73861c79e93aaee5 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h
index 3c3d1071b6eec3..e00da1d960c54d 100644
--- a/Objects/clinic/complexobject.c.h
+++ b/Objects/clinic/complexobject.c.h
@@ -21,9 +21,9 @@ static PyObject *
 complex_conjugate_impl(PyComplexObject *self);
 
 static PyObject *
-complex_conjugate(PyComplexObject *self, PyObject *Py_UNUSED(ignored))
+complex_conjugate(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return complex_conjugate_impl(self);
+    return complex_conjugate_impl((PyComplexObject *)self);
 }
 
 PyDoc_STRVAR(complex___getnewargs____doc__,
@@ -38,9 +38,9 @@ static PyObject *
 complex___getnewargs___impl(PyComplexObject *self);
 
 static PyObject *
-complex___getnewargs__(PyComplexObject *self, PyObject *Py_UNUSED(ignored))
+complex___getnewargs__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return complex___getnewargs___impl(self);
+    return complex___getnewargs___impl((PyComplexObject *)self);
 }
 
 PyDoc_STRVAR(complex___format____doc__,
@@ -56,7 +56,7 @@ static PyObject *
 complex___format___impl(PyComplexObject *self, PyObject *format_spec);
 
 static PyObject *
-complex___format__(PyComplexObject *self, PyObject *arg)
+complex___format__(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     PyObject *format_spec;
@@ -66,7 +66,7 @@ complex___format__(PyComplexObject *self, PyObject *arg)
         goto exit;
     }
     format_spec = arg;
-    return_value = complex___format___impl(self, format_spec);
+    return_value = complex___format___impl((PyComplexObject *)self, format_spec);
 
 exit:
     return return_value;
@@ -85,9 +85,9 @@ static PyObject *
 complex___complex___impl(PyComplexObject *self);
 
 static PyObject *
-complex___complex__(PyComplexObject *self, PyObject *Py_UNUSED(ignored))
+complex___complex__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return complex___complex___impl(self);
+    return complex___complex___impl((PyComplexObject *)self);
 }
 
 PyDoc_STRVAR(complex_new__doc__,
@@ -170,4 +170,4 @@ PyDoc_STRVAR(complex_from_number__doc__,
 
 #define COMPLEX_FROM_NUMBER_METHODDEF    \
     {"from_number", (PyCFunction)complex_from_number, METH_O|METH_CLASS, complex_from_number__doc__},
-/*[clinic end generated code: output=8c49a41c5a7f0aee input=a9049054013a1b77]*/
+/*[clinic end generated code: output=252cddef7f9169a0 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/dictobject.c.h b/Objects/clinic/dictobject.c.h
index fb46c4c64334f9..cdf39ce147203b 100644
--- a/Objects/clinic/dictobject.c.h
+++ b/Objects/clinic/dictobject.c.h
@@ -52,9 +52,9 @@ static PyObject *
 dict_copy_impl(PyDictObject *self);
 
 static PyObject *
-dict_copy(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict_copy_impl(self);
+    return dict_copy_impl((PyDictObject *)self);
 }
 
 PyDoc_STRVAR(dict___contains____doc__,
@@ -79,7 +79,7 @@ static PyObject *
 dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value);
 
 static PyObject *
-dict_get(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
+dict_get(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -95,7 +95,7 @@ dict_get(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
     default_value = args[1];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = dict_get_impl(self, key, default_value);
+    return_value = dict_get_impl((PyDictObject *)self, key, default_value);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -118,7 +118,7 @@ dict_setdefault_impl(PyDictObject *self, PyObject *key,
                      PyObject *default_value);
 
 static PyObject *
-dict_setdefault(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
+dict_setdefault(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -134,7 +134,7 @@ dict_setdefault(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
     default_value = args[1];
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = dict_setdefault_impl(self, key, default_value);
+    return_value = dict_setdefault_impl((PyDictObject *)self, key, default_value);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -154,9 +154,9 @@ static PyObject *
 dict_clear_impl(PyDictObject *self);
 
 static PyObject *
-dict_clear(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict_clear_impl(self);
+    return dict_clear_impl((PyDictObject *)self);
 }
 
 PyDoc_STRVAR(dict_pop__doc__,
@@ -175,7 +175,7 @@ static PyObject *
 dict_pop_impl(PyDictObject *self, PyObject *key, PyObject *default_value);
 
 static PyObject *
-dict_pop(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
+dict_pop(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -190,7 +190,7 @@ dict_pop(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     default_value = args[1];
 skip_optional:
-    return_value = dict_pop_impl(self, key, default_value);
+    return_value = dict_pop_impl((PyDictObject *)self, key, default_value);
 
 exit:
     return return_value;
@@ -212,12 +212,12 @@ static PyObject *
 dict_popitem_impl(PyDictObject *self);
 
 static PyObject *
-dict_popitem(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict_popitem(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = dict_popitem_impl(self);
+    return_value = dict_popitem_impl((PyDictObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -236,9 +236,9 @@ static PyObject *
 dict___sizeof___impl(PyDictObject *self);
 
 static PyObject *
-dict___sizeof__(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict___sizeof___impl(self);
+    return dict___sizeof___impl((PyDictObject *)self);
 }
 
 PyDoc_STRVAR(dict___reversed____doc__,
@@ -254,9 +254,9 @@ static PyObject *
 dict___reversed___impl(PyDictObject *self);
 
 static PyObject *
-dict___reversed__(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict___reversed__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict___reversed___impl(self);
+    return dict___reversed___impl((PyDictObject *)self);
 }
 
 PyDoc_STRVAR(dict_keys__doc__,
@@ -272,9 +272,9 @@ static PyObject *
 dict_keys_impl(PyDictObject *self);
 
 static PyObject *
-dict_keys(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict_keys(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict_keys_impl(self);
+    return dict_keys_impl((PyDictObject *)self);
 }
 
 PyDoc_STRVAR(dict_items__doc__,
@@ -290,9 +290,9 @@ static PyObject *
 dict_items_impl(PyDictObject *self);
 
 static PyObject *
-dict_items(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict_items(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict_items_impl(self);
+    return dict_items_impl((PyDictObject *)self);
 }
 
 PyDoc_STRVAR(dict_values__doc__,
@@ -308,8 +308,8 @@ static PyObject *
 dict_values_impl(PyDictObject *self);
 
 static PyObject *
-dict_values(PyDictObject *self, PyObject *Py_UNUSED(ignored))
+dict_values(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return dict_values_impl(self);
+    return dict_values_impl((PyDictObject *)self);
 }
-/*[clinic end generated code: output=f3dd5f3fb8122aef input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4956c5b276ea652f input=a9049054013a1b77]*/
diff --git a/Objects/clinic/listobject.c.h b/Objects/clinic/listobject.c.h
index 975f253c096275..a29ed9f7088700 100644
--- a/Objects/clinic/listobject.c.h
+++ b/Objects/clinic/listobject.c.h
@@ -23,7 +23,7 @@ static PyObject *
 list_insert_impl(PyListObject *self, Py_ssize_t index, PyObject *object);
 
 static PyObject *
-list_insert(PyListObject *self, PyObject *const *args, Py_ssize_t nargs)
+list_insert(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t index;
@@ -46,7 +46,7 @@ list_insert(PyListObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     object = args[1];
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_insert_impl(self, index, object);
+    return_value = list_insert_impl((PyListObject *)self, index, object);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -66,12 +66,12 @@ static PyObject *
 py_list_clear_impl(PyListObject *self);
 
 static PyObject *
-py_list_clear(PyListObject *self, PyObject *Py_UNUSED(ignored))
+py_list_clear(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = py_list_clear_impl(self);
+    return_value = py_list_clear_impl((PyListObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -90,12 +90,12 @@ static PyObject *
 list_copy_impl(PyListObject *self);
 
 static PyObject *
-list_copy(PyListObject *self, PyObject *Py_UNUSED(ignored))
+list_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_copy_impl(self);
+    return_value = list_copy_impl((PyListObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -119,7 +119,7 @@ list_append(PyListObject *self, PyObject *object)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_append_impl(self, object);
+    return_value = list_append_impl((PyListObject *)self, object);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -149,7 +149,7 @@ static PyObject *
 list_pop_impl(PyListObject *self, Py_ssize_t index);
 
 static PyObject *
-list_pop(PyListObject *self, PyObject *const *args, Py_ssize_t nargs)
+list_pop(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     Py_ssize_t index = -1;
@@ -174,7 +174,7 @@ list_pop(PyListObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
 skip_optional:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_pop_impl(self, index);
+    return_value = list_pop_impl((PyListObject *)self, index);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -202,7 +202,7 @@ static PyObject *
 list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse);
 
 static PyObject *
-list_sort(PyListObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+list_sort(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -255,7 +255,7 @@ list_sort(PyListObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject
     }
 skip_optional_kwonly:
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_sort_impl(self, keyfunc, reverse);
+    return_value = list_sort_impl((PyListObject *)self, keyfunc, reverse);
     Py_END_CRITICAL_SECTION();
 
 exit:
@@ -275,12 +275,12 @@ static PyObject *
 list_reverse_impl(PyListObject *self);
 
 static PyObject *
-list_reverse(PyListObject *self, PyObject *Py_UNUSED(ignored))
+list_reverse(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_reverse_impl(self);
+    return_value = list_reverse_impl((PyListObject *)self);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -302,7 +302,7 @@ list_index_impl(PyListObject *self, PyObject *value, Py_ssize_t start,
                 Py_ssize_t stop);
 
 static PyObject *
-list_index(PyListObject *self, PyObject *const *args, Py_ssize_t nargs)
+list_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *value;
@@ -326,7 +326,7 @@ list_index(PyListObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = list_index_impl(self, value, start, stop);
+    return_value = list_index_impl((PyListObject *)self, value, start, stop);
 
 exit:
     return return_value;
@@ -361,7 +361,7 @@ list_remove(PyListObject *self, PyObject *value)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(self);
-    return_value = list_remove_impl(self, value);
+    return_value = list_remove_impl((PyListObject *)self, value);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -418,9 +418,9 @@ static PyObject *
 list___sizeof___impl(PyListObject *self);
 
 static PyObject *
-list___sizeof__(PyListObject *self, PyObject *Py_UNUSED(ignored))
+list___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return list___sizeof___impl(self);
+    return list___sizeof___impl((PyListObject *)self);
 }
 
 PyDoc_STRVAR(list___reversed____doc__,
@@ -436,8 +436,8 @@ static PyObject *
 list___reversed___impl(PyListObject *self);
 
 static PyObject *
-list___reversed__(PyListObject *self, PyObject *Py_UNUSED(ignored))
+list___reversed__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return list___reversed___impl(self);
+    return list___reversed___impl((PyListObject *)self);
 }
-/*[clinic end generated code: output=9357151278d77ea1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=35c43dc33f9ba521 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/memoryobject.c.h b/Objects/clinic/memoryobject.c.h
index a6cf1f431a15b0..4706c92051926c 100644
--- a/Objects/clinic/memoryobject.c.h
+++ b/Objects/clinic/memoryobject.c.h
@@ -137,9 +137,9 @@ static PyObject *
 memoryview_release_impl(PyMemoryViewObject *self);
 
 static PyObject *
-memoryview_release(PyMemoryViewObject *self, PyObject *Py_UNUSED(ignored))
+memoryview_release(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return memoryview_release_impl(self);
+    return memoryview_release_impl((PyMemoryViewObject *)self);
 }
 
 PyDoc_STRVAR(memoryview_cast__doc__,
@@ -156,7 +156,7 @@ memoryview_cast_impl(PyMemoryViewObject *self, PyObject *format,
                      PyObject *shape);
 
 static PyObject *
-memoryview_cast(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+memoryview_cast(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -204,7 +204,7 @@ memoryview_cast(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t narg
     }
     shape = args[1];
 skip_optional_pos:
-    return_value = memoryview_cast_impl(self, format, shape);
+    return_value = memoryview_cast_impl((PyMemoryViewObject *)self, format, shape);
 
 exit:
     return return_value;
@@ -223,9 +223,9 @@ static PyObject *
 memoryview_toreadonly_impl(PyMemoryViewObject *self);
 
 static PyObject *
-memoryview_toreadonly(PyMemoryViewObject *self, PyObject *Py_UNUSED(ignored))
+memoryview_toreadonly(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return memoryview_toreadonly_impl(self);
+    return memoryview_toreadonly_impl((PyMemoryViewObject *)self);
 }
 
 PyDoc_STRVAR(memoryview_tolist__doc__,
@@ -241,9 +241,9 @@ static PyObject *
 memoryview_tolist_impl(PyMemoryViewObject *self);
 
 static PyObject *
-memoryview_tolist(PyMemoryViewObject *self, PyObject *Py_UNUSED(ignored))
+memoryview_tolist(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return memoryview_tolist_impl(self);
+    return memoryview_tolist_impl((PyMemoryViewObject *)self);
 }
 
 PyDoc_STRVAR(memoryview_tobytes__doc__,
@@ -265,7 +265,7 @@ static PyObject *
 memoryview_tobytes_impl(PyMemoryViewObject *self, const char *order);
 
 static PyObject *
-memoryview_tobytes(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+memoryview_tobytes(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -324,7 +324,7 @@ memoryview_tobytes(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t n
         goto exit;
     }
 skip_optional_pos:
-    return_value = memoryview_tobytes_impl(self, order);
+    return_value = memoryview_tobytes_impl((PyMemoryViewObject *)self, order);
 
 exit:
     return return_value;
@@ -361,7 +361,7 @@ memoryview_hex_impl(PyMemoryViewObject *self, PyObject *sep,
                     int bytes_per_sep);
 
 static PyObject *
-memoryview_hex(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+memoryview_hex(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -413,7 +413,7 @@ memoryview_hex(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
 skip_optional_pos:
-    return_value = memoryview_hex_impl(self, sep, bytes_per_sep);
+    return_value = memoryview_hex_impl((PyMemoryViewObject *)self, sep, bytes_per_sep);
 
 exit:
     return return_value;
@@ -444,7 +444,7 @@ memoryview_index_impl(PyMemoryViewObject *self, PyObject *value,
                       Py_ssize_t start, Py_ssize_t stop);
 
 static PyObject *
-memoryview_index(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs)
+memoryview_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *value;
@@ -468,9 +468,9 @@ memoryview_index(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nar
         goto exit;
     }
 skip_optional:
-    return_value = memoryview_index_impl(self, value, start, stop);
+    return_value = memoryview_index_impl((PyMemoryViewObject *)self, value, start, stop);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=132893ef5f67ad73 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2ef6c061d9c4e3dc input=a9049054013a1b77]*/
diff --git a/Objects/clinic/odictobject.c.h b/Objects/clinic/odictobject.c.h
index 4b97596e5dbd2f..44d89c4e0ef2f7 100644
--- a/Objects/clinic/odictobject.c.h
+++ b/Objects/clinic/odictobject.c.h
@@ -87,7 +87,7 @@ OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
                             PyObject *default_value);
 
 static PyObject *
-OrderedDict_setdefault(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+OrderedDict_setdefault(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -131,7 +131,7 @@ OrderedDict_setdefault(PyODictObject *self, PyObject *const *args, Py_ssize_t na
     }
     default_value = args[1];
 skip_optional_pos:
-    return_value = OrderedDict_setdefault_impl(self, key, default_value);
+    return_value = OrderedDict_setdefault_impl((PyODictObject *)self, key, default_value);
 
 exit:
     return return_value;
@@ -154,7 +154,7 @@ OrderedDict_pop_impl(PyODictObject *self, PyObject *key,
                      PyObject *default_value);
 
 static PyObject *
-OrderedDict_pop(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+OrderedDict_pop(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -198,7 +198,7 @@ OrderedDict_pop(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs, Py
     }
     default_value = args[1];
 skip_optional_pos:
-    return_value = OrderedDict_pop_impl(self, key, default_value);
+    return_value = OrderedDict_pop_impl((PyODictObject *)self, key, default_value);
 
 exit:
     return return_value;
@@ -219,7 +219,7 @@ static PyObject *
 OrderedDict_popitem_impl(PyODictObject *self, int last);
 
 static PyObject *
-OrderedDict_popitem(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+OrderedDict_popitem(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -264,7 +264,7 @@ OrderedDict_popitem(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
 skip_optional_pos:
-    return_value = OrderedDict_popitem_impl(self, last);
+    return_value = OrderedDict_popitem_impl((PyODictObject *)self, last);
 
 exit:
     return return_value;
@@ -285,7 +285,7 @@ static PyObject *
 OrderedDict_move_to_end_impl(PyODictObject *self, PyObject *key, int last);
 
 static PyObject *
-OrderedDict_move_to_end(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+OrderedDict_move_to_end(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -332,9 +332,9 @@ OrderedDict_move_to_end(PyODictObject *self, PyObject *const *args, Py_ssize_t n
         goto exit;
     }
 skip_optional_pos:
-    return_value = OrderedDict_move_to_end_impl(self, key, last);
+    return_value = OrderedDict_move_to_end_impl((PyODictObject *)self, key, last);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=2aa6fc0567c9252c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=55bd390bb516e997 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/setobject.c.h b/Objects/clinic/setobject.c.h
index 986993b4aa9bda..bf7e604e4b0a46 100644
--- a/Objects/clinic/setobject.c.h
+++ b/Objects/clinic/setobject.c.h
@@ -19,12 +19,12 @@ static PyObject *
 set_pop_impl(PySetObject *so);
 
 static PyObject *
-set_pop(PySetObject *so, PyObject *Py_UNUSED(ignored))
+set_pop(PyObject *so, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set_pop_impl(so);
+    return_value = set_pop_impl((PySetObject *)so);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -44,7 +44,7 @@ set_update_impl(PySetObject *so, PyObject * const *others,
                 Py_ssize_t others_length);
 
 static PyObject *
-set_update(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
+set_update(PyObject *so, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject * const *others;
@@ -52,7 +52,7 @@ set_update(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
 
     others = args;
     others_length = nargs;
-    return_value = set_update_impl(so, others, others_length);
+    return_value = set_update_impl((PySetObject *)so, others, others_length);
 
     return return_value;
 }
@@ -70,12 +70,12 @@ static PyObject *
 set_copy_impl(PySetObject *so);
 
 static PyObject *
-set_copy(PySetObject *so, PyObject *Py_UNUSED(ignored))
+set_copy(PyObject *so, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set_copy_impl(so);
+    return_value = set_copy_impl((PySetObject *)so);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -94,12 +94,12 @@ static PyObject *
 frozenset_copy_impl(PySetObject *so);
 
 static PyObject *
-frozenset_copy(PySetObject *so, PyObject *Py_UNUSED(ignored))
+frozenset_copy(PyObject *so, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = frozenset_copy_impl(so);
+    return_value = frozenset_copy_impl((PySetObject *)so);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -118,12 +118,12 @@ static PyObject *
 set_clear_impl(PySetObject *so);
 
 static PyObject *
-set_clear(PySetObject *so, PyObject *Py_UNUSED(ignored))
+set_clear(PyObject *so, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set_clear_impl(so);
+    return_value = set_clear_impl((PySetObject *)so);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -143,7 +143,7 @@ set_union_impl(PySetObject *so, PyObject * const *others,
                Py_ssize_t others_length);
 
 static PyObject *
-set_union(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
+set_union(PyObject *so, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject * const *others;
@@ -151,7 +151,7 @@ set_union(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
 
     others = args;
     others_length = nargs;
-    return_value = set_union_impl(so, others, others_length);
+    return_value = set_union_impl((PySetObject *)so, others, others_length);
 
     return return_value;
 }
@@ -170,7 +170,7 @@ set_intersection_multi_impl(PySetObject *so, PyObject * const *others,
                             Py_ssize_t others_length);
 
 static PyObject *
-set_intersection_multi(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
+set_intersection_multi(PyObject *so, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject * const *others;
@@ -178,7 +178,7 @@ set_intersection_multi(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
 
     others = args;
     others_length = nargs;
-    return_value = set_intersection_multi_impl(so, others, others_length);
+    return_value = set_intersection_multi_impl((PySetObject *)so, others, others_length);
 
     return return_value;
 }
@@ -197,7 +197,7 @@ set_intersection_update_multi_impl(PySetObject *so, PyObject * const *others,
                                    Py_ssize_t others_length);
 
 static PyObject *
-set_intersection_update_multi(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
+set_intersection_update_multi(PyObject *so, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject * const *others;
@@ -205,7 +205,7 @@ set_intersection_update_multi(PySetObject *so, PyObject *const *args, Py_ssize_t
 
     others = args;
     others_length = nargs;
-    return_value = set_intersection_update_multi_impl(so, others, others_length);
+    return_value = set_intersection_update_multi_impl((PySetObject *)so, others, others_length);
 
     return return_value;
 }
@@ -228,7 +228,7 @@ set_isdisjoint(PySetObject *so, PyObject *other)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION2(so, other);
-    return_value = set_isdisjoint_impl(so, other);
+    return_value = set_isdisjoint_impl((PySetObject *)so, other);
     Py_END_CRITICAL_SECTION2();
 
     return return_value;
@@ -248,7 +248,7 @@ set_difference_update_impl(PySetObject *so, PyObject * const *others,
                            Py_ssize_t others_length);
 
 static PyObject *
-set_difference_update(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
+set_difference_update(PyObject *so, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject * const *others;
@@ -256,7 +256,7 @@ set_difference_update(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
 
     others = args;
     others_length = nargs;
-    return_value = set_difference_update_impl(so, others, others_length);
+    return_value = set_difference_update_impl((PySetObject *)so, others, others_length);
 
     return return_value;
 }
@@ -275,7 +275,7 @@ set_difference_multi_impl(PySetObject *so, PyObject * const *others,
                           Py_ssize_t others_length);
 
 static PyObject *
-set_difference_multi(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
+set_difference_multi(PyObject *so, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject * const *others;
@@ -283,7 +283,7 @@ set_difference_multi(PySetObject *so, PyObject *const *args, Py_ssize_t nargs)
 
     others = args;
     others_length = nargs;
-    return_value = set_difference_multi_impl(so, others, others_length);
+    return_value = set_difference_multi_impl((PySetObject *)so, others, others_length);
 
     return return_value;
 }
@@ -315,7 +315,7 @@ set_symmetric_difference(PySetObject *so, PyObject *other)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION2(so, other);
-    return_value = set_symmetric_difference_impl(so, other);
+    return_value = set_symmetric_difference_impl((PySetObject *)so, other);
     Py_END_CRITICAL_SECTION2();
 
     return return_value;
@@ -339,7 +339,7 @@ set_issubset(PySetObject *so, PyObject *other)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION2(so, other);
-    return_value = set_issubset_impl(so, other);
+    return_value = set_issubset_impl((PySetObject *)so, other);
     Py_END_CRITICAL_SECTION2();
 
     return return_value;
@@ -363,7 +363,7 @@ set_issuperset(PySetObject *so, PyObject *other)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION2(so, other);
-    return_value = set_issuperset_impl(so, other);
+    return_value = set_issuperset_impl((PySetObject *)so, other);
     Py_END_CRITICAL_SECTION2();
 
     return return_value;
@@ -389,7 +389,7 @@ set_add(PySetObject *so, PyObject *key)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set_add_impl(so, key);
+    return_value = set_add_impl((PySetObject *)so, key);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -413,7 +413,7 @@ set___contains__(PySetObject *so, PyObject *key)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set___contains___impl(so, key);
+    return_value = set___contains___impl((PySetObject *)so, key);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -439,7 +439,7 @@ set_remove(PySetObject *so, PyObject *key)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set_remove_impl(so, key);
+    return_value = set_remove_impl((PySetObject *)so, key);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -466,7 +466,7 @@ set_discard(PySetObject *so, PyObject *key)
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set_discard_impl(so, key);
+    return_value = set_discard_impl((PySetObject *)so, key);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -485,12 +485,12 @@ static PyObject *
 set___reduce___impl(PySetObject *so);
 
 static PyObject *
-set___reduce__(PySetObject *so, PyObject *Py_UNUSED(ignored))
+set___reduce__(PyObject *so, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set___reduce___impl(so);
+    return_value = set___reduce___impl((PySetObject *)so);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
@@ -509,14 +509,14 @@ static PyObject *
 set___sizeof___impl(PySetObject *so);
 
 static PyObject *
-set___sizeof__(PySetObject *so, PyObject *Py_UNUSED(ignored))
+set___sizeof__(PyObject *so, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
 
     Py_BEGIN_CRITICAL_SECTION(so);
-    return_value = set___sizeof___impl(so);
+    return_value = set___sizeof___impl((PySetObject *)so);
     Py_END_CRITICAL_SECTION();
 
     return return_value;
 }
-/*[clinic end generated code: output=4b65e7709927f31f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=83b7742a762ce465 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/tupleobject.c.h b/Objects/clinic/tupleobject.c.h
index 5d6a2c481a5f2a..40ffd4c1755769 100644
--- a/Objects/clinic/tupleobject.c.h
+++ b/Objects/clinic/tupleobject.c.h
@@ -20,7 +20,7 @@ tuple_index_impl(PyTupleObject *self, PyObject *value, Py_ssize_t start,
                  Py_ssize_t stop);
 
 static PyObject *
-tuple_index(PyTupleObject *self, PyObject *const *args, Py_ssize_t nargs)
+tuple_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *value;
@@ -44,7 +44,7 @@ tuple_index(PyTupleObject *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = tuple_index_impl(self, value, start, stop);
+    return_value = tuple_index_impl((PyTupleObject *)self, value, start, stop);
 
 exit:
     return return_value;
@@ -110,8 +110,8 @@ static PyObject *
 tuple___getnewargs___impl(PyTupleObject *self);
 
 static PyObject *
-tuple___getnewargs__(PyTupleObject *self, PyObject *Py_UNUSED(ignored))
+tuple___getnewargs__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return tuple___getnewargs___impl(self);
+    return tuple___getnewargs___impl((PyTupleObject *)self);
 }
-/*[clinic end generated code: output=a6a9abba5d121f4c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=779cb4a13db67397 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/typeobject.c.h b/Objects/clinic/typeobject.c.h
index 1fa153598db213..5e8187b3f5b748 100644
--- a/Objects/clinic/typeobject.c.h
+++ b/Objects/clinic/typeobject.c.h
@@ -22,7 +22,7 @@ type___instancecheck__(PyTypeObject *self, PyObject *instance)
     PyObject *return_value = NULL;
     int _return_value;
 
-    _return_value = type___instancecheck___impl(self, instance);
+    _return_value = type___instancecheck___impl((PyTypeObject *)self, instance);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -50,7 +50,7 @@ type___subclasscheck__(PyTypeObject *self, PyObject *subclass)
     PyObject *return_value = NULL;
     int _return_value;
 
-    _return_value = type___subclasscheck___impl(self, subclass);
+    _return_value = type___subclasscheck___impl((PyTypeObject *)self, subclass);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -73,9 +73,9 @@ static PyObject *
 type_mro_impl(PyTypeObject *self);
 
 static PyObject *
-type_mro(PyTypeObject *self, PyObject *Py_UNUSED(ignored))
+type_mro(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return type_mro_impl(self);
+    return type_mro_impl((PyTypeObject *)self);
 }
 
 PyDoc_STRVAR(type___subclasses____doc__,
@@ -91,9 +91,9 @@ static PyObject *
 type___subclasses___impl(PyTypeObject *self);
 
 static PyObject *
-type___subclasses__(PyTypeObject *self, PyObject *Py_UNUSED(ignored))
+type___subclasses__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return type___subclasses___impl(self);
+    return type___subclasses___impl((PyTypeObject *)self);
 }
 
 PyDoc_STRVAR(type___dir____doc__,
@@ -109,9 +109,9 @@ static PyObject *
 type___dir___impl(PyTypeObject *self);
 
 static PyObject *
-type___dir__(PyTypeObject *self, PyObject *Py_UNUSED(ignored))
+type___dir__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return type___dir___impl(self);
+    return type___dir___impl((PyTypeObject *)self);
 }
 
 PyDoc_STRVAR(type___sizeof____doc__,
@@ -127,9 +127,9 @@ static PyObject *
 type___sizeof___impl(PyTypeObject *self);
 
 static PyObject *
-type___sizeof__(PyTypeObject *self, PyObject *Py_UNUSED(ignored))
+type___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return type___sizeof___impl(self);
+    return type___sizeof___impl((PyTypeObject *)self);
 }
 
 PyDoc_STRVAR(object___getstate____doc__,
@@ -262,4 +262,4 @@ object___dir__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return object___dir___impl(self);
 }
-/*[clinic end generated code: output=b56c87f9cace1921 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f7db85fd11818c63 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/typevarobject.c.h b/Objects/clinic/typevarobject.c.h
index c17998830b02eb..e50ed7d95b9b2a 100644
--- a/Objects/clinic/typevarobject.c.h
+++ b/Objects/clinic/typevarobject.c.h
@@ -143,7 +143,7 @@ typevar_typing_prepare_subst_impl(typevarobject *self, PyObject *alias,
                                   PyObject *args);
 
 static PyObject *
-typevar_typing_prepare_subst(typevarobject *self, PyObject *const *args, Py_ssize_t nargs)
+typevar_typing_prepare_subst(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *alias;
@@ -154,7 +154,7 @@ typevar_typing_prepare_subst(typevarobject *self, PyObject *const *args, Py_ssiz
     }
     alias = args[0];
     __clinic_args = args[1];
-    return_value = typevar_typing_prepare_subst_impl(self, alias, __clinic_args);
+    return_value = typevar_typing_prepare_subst_impl((typevarobject *)self, alias, __clinic_args);
 
 exit:
     return return_value;
@@ -172,9 +172,9 @@ static PyObject *
 typevar_reduce_impl(typevarobject *self);
 
 static PyObject *
-typevar_reduce(typevarobject *self, PyObject *Py_UNUSED(ignored))
+typevar_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return typevar_reduce_impl(self);
+    return typevar_reduce_impl((typevarobject *)self);
 }
 
 PyDoc_STRVAR(typevar_has_default__doc__,
@@ -189,9 +189,9 @@ static PyObject *
 typevar_has_default_impl(typevarobject *self);
 
 static PyObject *
-typevar_has_default(typevarobject *self, PyObject *Py_UNUSED(ignored))
+typevar_has_default(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return typevar_has_default_impl(self);
+    return typevar_has_default_impl((typevarobject *)self);
 }
 
 PyDoc_STRVAR(paramspecargs_new__doc__,
@@ -431,7 +431,7 @@ paramspec_typing_prepare_subst_impl(paramspecobject *self, PyObject *alias,
                                     PyObject *args);
 
 static PyObject *
-paramspec_typing_prepare_subst(paramspecobject *self, PyObject *const *args, Py_ssize_t nargs)
+paramspec_typing_prepare_subst(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *alias;
@@ -442,7 +442,7 @@ paramspec_typing_prepare_subst(paramspecobject *self, PyObject *const *args, Py_
     }
     alias = args[0];
     __clinic_args = args[1];
-    return_value = paramspec_typing_prepare_subst_impl(self, alias, __clinic_args);
+    return_value = paramspec_typing_prepare_subst_impl((paramspecobject *)self, alias, __clinic_args);
 
 exit:
     return return_value;
@@ -460,9 +460,9 @@ static PyObject *
 paramspec_reduce_impl(paramspecobject *self);
 
 static PyObject *
-paramspec_reduce(paramspecobject *self, PyObject *Py_UNUSED(ignored))
+paramspec_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return paramspec_reduce_impl(self);
+    return paramspec_reduce_impl((paramspecobject *)self);
 }
 
 PyDoc_STRVAR(paramspec_has_default__doc__,
@@ -477,9 +477,9 @@ static PyObject *
 paramspec_has_default_impl(paramspecobject *self);
 
 static PyObject *
-paramspec_has_default(paramspecobject *self, PyObject *Py_UNUSED(ignored))
+paramspec_has_default(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return paramspec_has_default_impl(self);
+    return paramspec_has_default_impl((paramspecobject *)self);
 }
 
 PyDoc_STRVAR(typevartuple__doc__,
@@ -570,7 +570,7 @@ typevartuple_typing_prepare_subst_impl(typevartupleobject *self,
                                        PyObject *alias, PyObject *args);
 
 static PyObject *
-typevartuple_typing_prepare_subst(typevartupleobject *self, PyObject *const *args, Py_ssize_t nargs)
+typevartuple_typing_prepare_subst(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *alias;
@@ -581,7 +581,7 @@ typevartuple_typing_prepare_subst(typevartupleobject *self, PyObject *const *arg
     }
     alias = args[0];
     __clinic_args = args[1];
-    return_value = typevartuple_typing_prepare_subst_impl(self, alias, __clinic_args);
+    return_value = typevartuple_typing_prepare_subst_impl((typevartupleobject *)self, alias, __clinic_args);
 
 exit:
     return return_value;
@@ -599,9 +599,9 @@ static PyObject *
 typevartuple_reduce_impl(typevartupleobject *self);
 
 static PyObject *
-typevartuple_reduce(typevartupleobject *self, PyObject *Py_UNUSED(ignored))
+typevartuple_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return typevartuple_reduce_impl(self);
+    return typevartuple_reduce_impl((typevartupleobject *)self);
 }
 
 PyDoc_STRVAR(typevartuple_has_default__doc__,
@@ -616,9 +616,9 @@ static PyObject *
 typevartuple_has_default_impl(typevartupleobject *self);
 
 static PyObject *
-typevartuple_has_default(typevartupleobject *self, PyObject *Py_UNUSED(ignored))
+typevartuple_has_default(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return typevartuple_has_default_impl(self);
+    return typevartuple_has_default_impl((typevartupleobject *)self);
 }
 
 PyDoc_STRVAR(typealias_reduce__doc__,
@@ -633,9 +633,9 @@ static PyObject *
 typealias_reduce_impl(typealiasobject *self);
 
 static PyObject *
-typealias_reduce(typealiasobject *self, PyObject *Py_UNUSED(ignored))
+typealias_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return typealias_reduce_impl(self);
+    return typealias_reduce_impl((typealiasobject *)self);
 }
 
 PyDoc_STRVAR(typealias_new__doc__,
@@ -706,4 +706,4 @@ typealias_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=26351c3549f5ad83 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f499d959a942c599 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h
index 361f20c0fa4c1d..5c6a425b0f803a 100644
--- a/Objects/clinic/unicodeobject.c.h
+++ b/Objects/clinic/unicodeobject.c.h
@@ -22,9 +22,9 @@ static PyObject *
 EncodingMap_size_impl(struct encoding_map *self);
 
 static PyObject *
-EncodingMap_size(struct encoding_map *self, PyObject *Py_UNUSED(ignored))
+EncodingMap_size(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return EncodingMap_size_impl(self);
+    return EncodingMap_size_impl((struct encoding_map *)self);
 }
 
 PyDoc_STRVAR(unicode_title__doc__,
@@ -1895,4 +1895,4 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=30efbf79c5a07dd2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4d1cecd6d08498a4 input=a9049054013a1b77]*/
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index ae232cae86799b..be446d64e358d5 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -2208,24 +2208,24 @@ code_branchesiterator(PyCodeObject *code, PyObject *Py_UNUSED(args))
 code.replace
 
     *
-    co_argcount: int(c_default="self->co_argcount") = unchanged
-    co_posonlyargcount: int(c_default="self->co_posonlyargcount") = unchanged
-    co_kwonlyargcount: int(c_default="self->co_kwonlyargcount") = unchanged
-    co_nlocals: int(c_default="self->co_nlocals") = unchanged
-    co_stacksize: int(c_default="self->co_stacksize") = unchanged
-    co_flags: int(c_default="self->co_flags") = unchanged
-    co_firstlineno: int(c_default="self->co_firstlineno") = unchanged
+    co_argcount: int(c_default="((PyCodeObject *)self)->co_argcount") = unchanged
+    co_posonlyargcount: int(c_default="((PyCodeObject *)self)->co_posonlyargcount") = unchanged
+    co_kwonlyargcount: int(c_default="((PyCodeObject *)self)->co_kwonlyargcount") = unchanged
+    co_nlocals: int(c_default="((PyCodeObject *)self)->co_nlocals") = unchanged
+    co_stacksize: int(c_default="((PyCodeObject *)self)->co_stacksize") = unchanged
+    co_flags: int(c_default="((PyCodeObject *)self)->co_flags") = unchanged
+    co_firstlineno: int(c_default="((PyCodeObject *)self)->co_firstlineno") = unchanged
     co_code: object(subclass_of="&PyBytes_Type", c_default="NULL") = unchanged
-    co_consts: object(subclass_of="&PyTuple_Type", c_default="self->co_consts") = unchanged
-    co_names: object(subclass_of="&PyTuple_Type", c_default="self->co_names") = unchanged
+    co_consts: object(subclass_of="&PyTuple_Type", c_default="((PyCodeObject *)self)->co_consts") = unchanged
+    co_names: object(subclass_of="&PyTuple_Type", c_default="((PyCodeObject *)self)->co_names") = unchanged
     co_varnames: object(subclass_of="&PyTuple_Type", c_default="NULL") = unchanged
     co_freevars: object(subclass_of="&PyTuple_Type", c_default="NULL") = unchanged
     co_cellvars: object(subclass_of="&PyTuple_Type", c_default="NULL") = unchanged
-    co_filename: unicode(c_default="self->co_filename") = unchanged
-    co_name: unicode(c_default="self->co_name") = unchanged
-    co_qualname: unicode(c_default="self->co_qualname") = unchanged
-    co_linetable: object(subclass_of="&PyBytes_Type", c_default="self->co_linetable") = unchanged
-    co_exceptiontable: object(subclass_of="&PyBytes_Type", c_default="self->co_exceptiontable") = unchanged
+    co_filename: unicode(c_default="((PyCodeObject *)self)->co_filename") = unchanged
+    co_name: unicode(c_default="((PyCodeObject *)self)->co_name") = unchanged
+    co_qualname: unicode(c_default="((PyCodeObject *)self)->co_qualname") = unchanged
+    co_linetable: object(subclass_of="&PyBytes_Type", c_default="((PyCodeObject *)self)->co_linetable") = unchanged
+    co_exceptiontable: object(subclass_of="&PyBytes_Type", c_default="((PyCodeObject *)self)->co_exceptiontable") = unchanged
 
 Return a copy of the code object with new values for the specified fields.
 [clinic start generated code]*/
@@ -2240,7 +2240,7 @@ code_replace_impl(PyCodeObject *self, int co_argcount,
                   PyObject *co_filename, PyObject *co_name,
                   PyObject *co_qualname, PyObject *co_linetable,
                   PyObject *co_exceptiontable)
-/*[clinic end generated code: output=e75c48a15def18b9 input=18e280e07846c122]*/
+/*[clinic end generated code: output=e75c48a15def18b9 input=a455a89c57ac9d42]*/
 {
 #define CHECK_INT_ARG(ARG) \
         if (ARG < 0) { \
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 955ccbebf74b54..26ab352ca6d989 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1298,7 +1298,7 @@ set_union_impl(PySetObject *so, PyObject * const *others,
     PyObject *other;
     Py_ssize_t i;
 
-    result = (PySetObject *)set_copy(so, NULL);
+    result = (PySetObject *)set_copy((PyObject *)so, NULL);
     if (result == NULL)
         return NULL;
 
@@ -1321,13 +1321,12 @@ set_or(PyObject *self, PyObject *other)
 
     if (!PyAnySet_Check(self) || !PyAnySet_Check(other))
         Py_RETURN_NOTIMPLEMENTED;
-    PySetObject *so = _PySet_CAST(self);
 
-    result = (PySetObject *)set_copy(so, NULL);
+    result = (PySetObject *)set_copy(self, NULL);
     if (result == NULL) {
         return NULL;
     }
-    if (Py_Is((PyObject *)so, other)) {
+    if (Py_Is(self, other)) {
         return (PyObject *)result;
     }
     if (set_update_local(result, other)) {
@@ -1449,7 +1448,7 @@ set_intersection_multi_impl(PySetObject *so, PyObject * const *others,
     Py_ssize_t i;
 
     if (others_length == 0) {
-        return set_copy(so, NULL);
+        return set_copy((PyObject *)so, NULL);
     }
 
     PyObject *result = Py_NewRef(so);
@@ -1806,7 +1805,7 @@ set_difference_multi_impl(PySetObject *so, PyObject * const *others,
     PyObject *result, *other;
 
     if (others_length == 0) {
-        return set_copy(so, NULL);
+        return set_copy((PyObject *)so, NULL);
     }
 
     other = others[0];
@@ -1929,7 +1928,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
 /*[clinic end generated code: output=fbb049c0806028de input=a50acf0365e1f0a5]*/
 {
     if (Py_Is((PyObject *)so, other)) {
-        return set_clear(so, NULL);
+        return set_clear((PyObject *)so, NULL);
     }
 
     int rv;
@@ -2646,7 +2645,7 @@ PySet_Clear(PyObject *set)
         PyErr_BadInternalCall();
         return -1;
     }
-    (void)set_clear((PySetObject *)set, NULL);
+    (void)set_clear(set, NULL);
     return 0;
 }
 
@@ -2742,7 +2741,7 @@ PySet_Pop(PyObject *set)
         PyErr_BadInternalCall();
         return NULL;
     }
-    return set_pop((PySetObject *)set, NULL);
+    return set_pop(set, NULL);
 }
 
 int
diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h
index b14913366b77eb..00fa6a75ec113e 100644
--- a/PC/clinic/winreg.c.h
+++ b/PC/clinic/winreg.c.h
@@ -26,9 +26,9 @@ static PyObject *
 winreg_HKEYType_Close_impl(PyHKEYObject *self);
 
 static PyObject *
-winreg_HKEYType_Close(PyHKEYObject *self, PyObject *Py_UNUSED(ignored))
+winreg_HKEYType_Close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return winreg_HKEYType_Close_impl(self);
+    return winreg_HKEYType_Close_impl((PyHKEYObject *)self);
 }
 
 #endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
@@ -56,9 +56,9 @@ static PyObject *
 winreg_HKEYType_Detach_impl(PyHKEYObject *self);
 
 static PyObject *
-winreg_HKEYType_Detach(PyHKEYObject *self, PyObject *Py_UNUSED(ignored))
+winreg_HKEYType_Detach(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return winreg_HKEYType_Detach_impl(self);
+    return winreg_HKEYType_Detach_impl((PyHKEYObject *)self);
 }
 
 #endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
@@ -77,12 +77,12 @@ static PyHKEYObject *
 winreg_HKEYType___enter___impl(PyHKEYObject *self);
 
 static PyObject *
-winreg_HKEYType___enter__(PyHKEYObject *self, PyObject *Py_UNUSED(ignored))
+winreg_HKEYType___enter__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     PyHKEYObject *_return_value;
 
-    _return_value = winreg_HKEYType___enter___impl(self);
+    _return_value = winreg_HKEYType___enter___impl((PyHKEYObject *)self);
     return_value = (PyObject *)_return_value;
 
     return return_value;
@@ -105,7 +105,7 @@ winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type,
                               PyObject *exc_value, PyObject *traceback);
 
 static PyObject *
-winreg_HKEYType___exit__(PyHKEYObject *self, PyObject *const *args, Py_ssize_t nargs)
+winreg_HKEYType___exit__(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *exc_type;
@@ -118,7 +118,7 @@ winreg_HKEYType___exit__(PyHKEYObject *self, PyObject *const *args, Py_ssize_t n
     exc_type = args[0];
     exc_value = args[1];
     traceback = args[2];
-    return_value = winreg_HKEYType___exit___impl(self, exc_type, exc_value, traceback);
+    return_value = winreg_HKEYType___exit___impl((PyHKEYObject *)self, exc_type, exc_value, traceback);
 
 exit:
     return return_value;
@@ -1766,4 +1766,4 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg)
 #ifndef WINREG_QUERYREFLECTIONKEY_METHODDEF
     #define WINREG_QUERYREFLECTIONKEY_METHODDEF
 #endif /* !defined(WINREG_QUERYREFLECTIONKEY_METHODDEF) */
-/*[clinic end generated code: output=aef4aa8ab8ddf38f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fbe9b075cd2fa833 input=a9049054013a1b77]*/
diff --git a/Python/clinic/context.c.h b/Python/clinic/context.c.h
index 997ac6f63384a9..71f05aa02a51e7 100644
--- a/Python/clinic/context.c.h
+++ b/Python/clinic/context.c.h
@@ -21,7 +21,7 @@ _contextvars_Context_get_impl(PyContext *self, PyObject *key,
                               PyObject *default_value);
 
 static PyObject *
-_contextvars_Context_get(PyContext *self, PyObject *const *args, Py_ssize_t nargs)
+_contextvars_Context_get(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *key;
@@ -36,7 +36,7 @@ _contextvars_Context_get(PyContext *self, PyObject *const *args, Py_ssize_t narg
     }
     default_value = args[1];
 skip_optional:
-    return_value = _contextvars_Context_get_impl(self, key, default_value);
+    return_value = _contextvars_Context_get_impl((PyContext *)self, key, default_value);
 
 exit:
     return return_value;
@@ -57,9 +57,9 @@ static PyObject *
 _contextvars_Context_items_impl(PyContext *self);
 
 static PyObject *
-_contextvars_Context_items(PyContext *self, PyObject *Py_UNUSED(ignored))
+_contextvars_Context_items(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _contextvars_Context_items_impl(self);
+    return _contextvars_Context_items_impl((PyContext *)self);
 }
 
 PyDoc_STRVAR(_contextvars_Context_keys__doc__,
@@ -75,9 +75,9 @@ static PyObject *
 _contextvars_Context_keys_impl(PyContext *self);
 
 static PyObject *
-_contextvars_Context_keys(PyContext *self, PyObject *Py_UNUSED(ignored))
+_contextvars_Context_keys(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _contextvars_Context_keys_impl(self);
+    return _contextvars_Context_keys_impl((PyContext *)self);
 }
 
 PyDoc_STRVAR(_contextvars_Context_values__doc__,
@@ -93,9 +93,9 @@ static PyObject *
 _contextvars_Context_values_impl(PyContext *self);
 
 static PyObject *
-_contextvars_Context_values(PyContext *self, PyObject *Py_UNUSED(ignored))
+_contextvars_Context_values(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _contextvars_Context_values_impl(self);
+    return _contextvars_Context_values_impl((PyContext *)self);
 }
 
 PyDoc_STRVAR(_contextvars_Context_copy__doc__,
@@ -111,9 +111,9 @@ static PyObject *
 _contextvars_Context_copy_impl(PyContext *self);
 
 static PyObject *
-_contextvars_Context_copy(PyContext *self, PyObject *Py_UNUSED(ignored))
+_contextvars_Context_copy(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return _contextvars_Context_copy_impl(self);
+    return _contextvars_Context_copy_impl((PyContext *)self);
 }
 
 PyDoc_STRVAR(_contextvars_ContextVar_get__doc__,
@@ -135,7 +135,7 @@ static PyObject *
 _contextvars_ContextVar_get_impl(PyContextVar *self, PyObject *default_value);
 
 static PyObject *
-_contextvars_ContextVar_get(PyContextVar *self, PyObject *const *args, Py_ssize_t nargs)
+_contextvars_ContextVar_get(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *default_value = NULL;
@@ -148,7 +148,7 @@ _contextvars_ContextVar_get(PyContextVar *self, PyObject *const *args, Py_ssize_
     }
     default_value = args[0];
 skip_optional:
-    return_value = _contextvars_ContextVar_get_impl(self, default_value);
+    return_value = _contextvars_ContextVar_get_impl((PyContextVar *)self, default_value);
 
 exit:
     return return_value;
@@ -179,4 +179,4 @@ PyDoc_STRVAR(_contextvars_ContextVar_reset__doc__,
 
 #define _CONTEXTVARS_CONTEXTVAR_RESET_METHODDEF    \
     {"reset", (PyCFunction)_contextvars_ContextVar_reset, METH_O, _contextvars_ContextVar_reset__doc__},
-/*[clinic end generated code: output=b667826178444c3f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=444567eaf0df25e0 input=a9049054013a1b77]*/
diff --git a/Python/clinic/instruction_sequence.c.h b/Python/clinic/instruction_sequence.c.h
index 45693e5856f8a7..41ab2de44e426e 100644
--- a/Python/clinic/instruction_sequence.c.h
+++ b/Python/clinic/instruction_sequence.c.h
@@ -51,7 +51,7 @@ InstructionSequenceType_use_label_impl(_PyInstructionSequence *self,
                                        int label);
 
 static PyObject *
-InstructionSequenceType_use_label(_PyInstructionSequence *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+InstructionSequenceType_use_label(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -91,7 +91,7 @@ InstructionSequenceType_use_label(_PyInstructionSequence *self, PyObject *const
     if (label == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = InstructionSequenceType_use_label_impl(self, label);
+    return_value = InstructionSequenceType_use_label_impl((_PyInstructionSequence *)self, label);
 
 exit:
     return return_value;
@@ -113,7 +113,7 @@ InstructionSequenceType_addop_impl(_PyInstructionSequence *self, int opcode,
                                    int end_lineno, int end_col_offset);
 
 static PyObject *
-InstructionSequenceType_addop(_PyInstructionSequence *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+InstructionSequenceType_addop(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -178,7 +178,7 @@ InstructionSequenceType_addop(_PyInstructionSequence *self, PyObject *const *arg
     if (end_col_offset == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = InstructionSequenceType_addop_impl(self, opcode, oparg, lineno, col_offset, end_lineno, end_col_offset);
+    return_value = InstructionSequenceType_addop_impl((_PyInstructionSequence *)self, opcode, oparg, lineno, col_offset, end_lineno, end_col_offset);
 
 exit:
     return return_value;
@@ -197,12 +197,12 @@ static int
 InstructionSequenceType_new_label_impl(_PyInstructionSequence *self);
 
 static PyObject *
-InstructionSequenceType_new_label(_PyInstructionSequence *self, PyObject *Py_UNUSED(ignored))
+InstructionSequenceType_new_label(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *return_value = NULL;
     int _return_value;
 
-    _return_value = InstructionSequenceType_new_label_impl(self);
+    _return_value = InstructionSequenceType_new_label_impl((_PyInstructionSequence *)self);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -226,7 +226,7 @@ InstructionSequenceType_add_nested_impl(_PyInstructionSequence *self,
                                         PyObject *nested);
 
 static PyObject *
-InstructionSequenceType_add_nested(_PyInstructionSequence *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+InstructionSequenceType_add_nested(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -263,7 +263,7 @@ InstructionSequenceType_add_nested(_PyInstructionSequence *self, PyObject *const
         goto exit;
     }
     nested = args[0];
-    return_value = InstructionSequenceType_add_nested_impl(self, nested);
+    return_value = InstructionSequenceType_add_nested_impl((_PyInstructionSequence *)self, nested);
 
 exit:
     return return_value;
@@ -282,9 +282,9 @@ static PyObject *
 InstructionSequenceType_get_nested_impl(_PyInstructionSequence *self);
 
 static PyObject *
-InstructionSequenceType_get_nested(_PyInstructionSequence *self, PyObject *Py_UNUSED(ignored))
+InstructionSequenceType_get_nested(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return InstructionSequenceType_get_nested_impl(self);
+    return InstructionSequenceType_get_nested_impl((_PyInstructionSequence *)self);
 }
 
 PyDoc_STRVAR(InstructionSequenceType_get_instructions__doc__,
@@ -300,8 +300,8 @@ static PyObject *
 InstructionSequenceType_get_instructions_impl(_PyInstructionSequence *self);
 
 static PyObject *
-InstructionSequenceType_get_instructions(_PyInstructionSequence *self, PyObject *Py_UNUSED(ignored))
+InstructionSequenceType_get_instructions(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return InstructionSequenceType_get_instructions_impl(self);
+    return InstructionSequenceType_get_instructions_impl((_PyInstructionSequence *)self);
 }
-/*[clinic end generated code: output=35163e5b589b4446 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e6b5d05bde008cc2 input=a9049054013a1b77]*/
diff --git a/Tools/clinic/libclinic/converters.py b/Tools/clinic/libclinic/converters.py
index a65f73ba02fb5d..2998eb519648aa 100644
--- a/Tools/clinic/libclinic/converters.py
+++ b/Tools/clinic/libclinic/converters.py
@@ -1182,10 +1182,8 @@ def pre_render(self) -> None:
     @property
     def parser_type(self) -> str:
         assert self.type is not None
-        if self.function.kind in {METHOD_INIT, METHOD_NEW, STATIC_METHOD, CLASS_METHOD}:
-            tp, _ = correct_name_for_self(self.function)
-            return tp
-        return self.type
+        tp, _ = correct_name_for_self(self.function)
+        return tp
 
     def render(self, parameter: Parameter, data: CRenderData) -> None:
         """