diff --git a/Lib/test/clinic.test.c b/Lib/test/clinic.test.c
index 8bc6d511e6c4a8..7582ecb22fed09 100644
--- a/Lib/test/clinic.test.c
+++ b/Lib/test/clinic.test.c
@@ -133,11 +133,11 @@ PyDoc_STRVAR(test_object_converter_one_arg__doc__,
 "\n");
 
 #define TEST_OBJECT_CONVERTER_ONE_ARG_METHODDEF    \
-    {"test_object_converter_one_arg", (PyCFunction)test_object_converter_one_arg, METH_O, test_object_converter_one_arg__doc__},
+    {"test_object_converter_one_arg", test_object_converter_one_arg, METH_O, test_object_converter_one_arg__doc__},
 
 static PyObject *
 test_object_converter_one_arg(PyObject *module, PyObject *a)
-/*[clinic end generated code: output=6da755f8502139df input=d635d92a421f1ca3]*/
+/*[clinic end generated code: output=a1272d4a621e3280 input=d635d92a421f1ca3]*/
 
 
 /*[clinic input]
@@ -315,7 +315,7 @@ PyDoc_STRVAR(test_PyBytesObject_converter__doc__,
 "\n");
 
 #define TEST_PYBYTESOBJECT_CONVERTER_METHODDEF    \
-    {"test_PyBytesObject_converter", (PyCFunction)test_PyBytesObject_converter, METH_O, test_PyBytesObject_converter__doc__},
+    {"test_PyBytesObject_converter", test_PyBytesObject_converter, METH_O, test_PyBytesObject_converter__doc__},
 
 static PyObject *
 test_PyBytesObject_converter_impl(PyObject *module, PyBytesObject *a);
@@ -339,7 +339,7 @@ test_PyBytesObject_converter(PyObject *module, PyObject *arg)
 
 static PyObject *
 test_PyBytesObject_converter_impl(PyObject *module, PyBytesObject *a)
-/*[clinic end generated code: output=7539d628e6fceace input=12b10c7cb5750400]*/
+/*[clinic end generated code: output=a1f2b92832ee6372 input=12b10c7cb5750400]*/
 
 
 /*[clinic input]
@@ -356,7 +356,7 @@ PyDoc_STRVAR(test_PyByteArrayObject_converter__doc__,
 "\n");
 
 #define TEST_PYBYTEARRAYOBJECT_CONVERTER_METHODDEF    \
-    {"test_PyByteArrayObject_converter", (PyCFunction)test_PyByteArrayObject_converter, METH_O, test_PyByteArrayObject_converter__doc__},
+    {"test_PyByteArrayObject_converter", test_PyByteArrayObject_converter, METH_O, test_PyByteArrayObject_converter__doc__},
 
 static PyObject *
 test_PyByteArrayObject_converter_impl(PyObject *module, PyByteArrayObject *a);
@@ -380,7 +380,7 @@ test_PyByteArrayObject_converter(PyObject *module, PyObject *arg)
 
 static PyObject *
 test_PyByteArrayObject_converter_impl(PyObject *module, PyByteArrayObject *a)
-/*[clinic end generated code: output=1245af9f5b3e355e input=5a657da535d194ae]*/
+/*[clinic end generated code: output=745c66001160f9cf input=5a657da535d194ae]*/
 
 
 /*[clinic input]
@@ -397,7 +397,7 @@ PyDoc_STRVAR(test_unicode_converter__doc__,
 "\n");
 
 #define TEST_UNICODE_CONVERTER_METHODDEF    \
-    {"test_unicode_converter", (PyCFunction)test_unicode_converter, METH_O, test_unicode_converter__doc__},
+    {"test_unicode_converter", test_unicode_converter, METH_O, test_unicode_converter__doc__},
 
 static PyObject *
 test_unicode_converter_impl(PyObject *module, PyObject *a);
@@ -421,7 +421,7 @@ test_unicode_converter(PyObject *module, PyObject *arg)
 
 static PyObject *
 test_unicode_converter_impl(PyObject *module, PyObject *a)
-/*[clinic end generated code: output=8c1625cc272c1f3d input=aa33612df92aa9c5]*/
+/*[clinic end generated code: output=d3eba4040b357127 input=aa33612df92aa9c5]*/
 
 
 /*[clinic input]
@@ -1857,7 +1857,7 @@ PyDoc_STRVAR(test_Py_complex_converter__doc__,
 "\n");
 
 #define TEST_PY_COMPLEX_CONVERTER_METHODDEF    \
-    {"test_Py_complex_converter", (PyCFunction)test_Py_complex_converter, METH_O, test_Py_complex_converter__doc__},
+    {"test_Py_complex_converter", test_Py_complex_converter, METH_O, test_Py_complex_converter__doc__},
 
 static PyObject *
 test_Py_complex_converter_impl(PyObject *module, Py_complex a);
@@ -1880,7 +1880,7 @@ test_Py_complex_converter(PyObject *module, PyObject *arg)
 
 static PyObject *
 test_Py_complex_converter_impl(PyObject *module, Py_complex a)
-/*[clinic end generated code: output=c2ecbec2144ca540 input=070f216a515beb79]*/
+/*[clinic end generated code: output=86f47ff04e11183c input=070f216a515beb79]*/
 
 
 /*[clinic input]
@@ -4041,7 +4041,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_condition_a__doc__,
 "\n");
 
 #define TEST_PREPROCESSOR_GUARDED_CONDITION_A_METHODDEF    \
-    {"test_preprocessor_guarded_condition_a", (PyCFunction)test_preprocessor_guarded_condition_a, METH_NOARGS, test_preprocessor_guarded_condition_a__doc__},
+    {"test_preprocessor_guarded_condition_a", test_preprocessor_guarded_condition_a, METH_NOARGS, test_preprocessor_guarded_condition_a__doc__},
 
 static PyObject *
 test_preprocessor_guarded_condition_a(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4059,7 +4059,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_elif_condition_b__doc__,
 "\n");
 
 #define TEST_PREPROCESSOR_GUARDED_ELIF_CONDITION_B_METHODDEF    \
-    {"test_preprocessor_guarded_elif_condition_b", (PyCFunction)test_preprocessor_guarded_elif_condition_b, METH_NOARGS, test_preprocessor_guarded_elif_condition_b__doc__},
+    {"test_preprocessor_guarded_elif_condition_b", test_preprocessor_guarded_elif_condition_b, METH_NOARGS, test_preprocessor_guarded_elif_condition_b__doc__},
 
 static PyObject *
 test_preprocessor_guarded_elif_condition_b(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4077,7 +4077,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_else__doc__,
 "\n");
 
 #define TEST_PREPROCESSOR_GUARDED_ELSE_METHODDEF    \
-    {"test_preprocessor_guarded_else", (PyCFunction)test_preprocessor_guarded_else, METH_NOARGS, test_preprocessor_guarded_else__doc__},
+    {"test_preprocessor_guarded_else", test_preprocessor_guarded_else, METH_NOARGS, test_preprocessor_guarded_else__doc__},
 
 static PyObject *
 test_preprocessor_guarded_else(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4095,7 +4095,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_ifndef_condition_c__doc__,
 "\n");
 
 #define TEST_PREPROCESSOR_GUARDED_IFNDEF_CONDITION_C_METHODDEF    \
-    {"test_preprocessor_guarded_ifndef_condition_c", (PyCFunction)test_preprocessor_guarded_ifndef_condition_c, METH_NOARGS, test_preprocessor_guarded_ifndef_condition_c__doc__},
+    {"test_preprocessor_guarded_ifndef_condition_c", test_preprocessor_guarded_ifndef_condition_c, METH_NOARGS, test_preprocessor_guarded_ifndef_condition_c__doc__},
 
 static PyObject *
 test_preprocessor_guarded_ifndef_condition_c(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4113,7 +4113,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_ifndef_not_condition_c__doc__,
 "\n");
 
 #define TEST_PREPROCESSOR_GUARDED_IFNDEF_NOT_CONDITION_C_METHODDEF    \
-    {"test_preprocessor_guarded_ifndef_not_condition_c", (PyCFunction)test_preprocessor_guarded_ifndef_not_condition_c, METH_NOARGS, test_preprocessor_guarded_ifndef_not_condition_c__doc__},
+    {"test_preprocessor_guarded_ifndef_not_condition_c", test_preprocessor_guarded_ifndef_not_condition_c, METH_NOARGS, test_preprocessor_guarded_ifndef_not_condition_c__doc__},
 
 static PyObject *
 test_preprocessor_guarded_ifndef_not_condition_c(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4131,7 +4131,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_if_with_continuation__doc__,
 "\n");
 
 #define TEST_PREPROCESSOR_GUARDED_IF_WITH_CONTINUATION_METHODDEF    \
-    {"test_preprocessor_guarded_if_with_continuation", (PyCFunction)test_preprocessor_guarded_if_with_continuation, METH_NOARGS, test_preprocessor_guarded_if_with_continuation__doc__},
+    {"test_preprocessor_guarded_if_with_continuation", test_preprocessor_guarded_if_with_continuation, METH_NOARGS, test_preprocessor_guarded_if_with_continuation__doc__},
 
 static PyObject *
 test_preprocessor_guarded_if_with_continuation(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4150,7 +4150,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_if_e_or_f__doc__,
 "Makes sure cpp.Monitor handles other directives than preprocessor conditionals.");
 
 #define TEST_PREPROCESSOR_GUARDED_IF_E_OR_F_METHODDEF    \
-    {"test_preprocessor_guarded_if_e_or_f", (PyCFunction)test_preprocessor_guarded_if_e_or_f, METH_NOARGS, test_preprocessor_guarded_if_e_or_f__doc__},
+    {"test_preprocessor_guarded_if_e_or_f", test_preprocessor_guarded_if_e_or_f, METH_NOARGS, test_preprocessor_guarded_if_e_or_f__doc__},
 
 static PyObject *
 test_preprocessor_guarded_if_e_or_f(PyObject *module, PyObject *Py_UNUSED(ignored))
@@ -4187,7 +4187,7 @@ test_preprocessor_guarded_if_e_or_f(PyObject *module, PyObject *Py_UNUSED(ignore
 #ifndef TEST_PREPROCESSOR_GUARDED_IF_E_OR_F_METHODDEF
     #define TEST_PREPROCESSOR_GUARDED_IF_E_OR_F_METHODDEF
 #endif /* !defined(TEST_PREPROCESSOR_GUARDED_IF_E_OR_F_METHODDEF) */
-/*[clinic end generated code: output=fcfae7cac7a99e62 input=3fc80c9989d2f2e1]*/
+/*[clinic end generated code: output=e693034dd5190490 input=3fc80c9989d2f2e1]*/
 
 /*[clinic input]
 test_vararg_and_posonly
@@ -4988,7 +4988,7 @@ PyDoc_STRVAR(Test_metho_not_default_return_converter__doc__,
 "\n");
 
 #define TEST_METHO_NOT_DEFAULT_RETURN_CONVERTER_METHODDEF    \
-    {"metho_not_default_return_converter", (PyCFunction)Test_metho_not_default_return_converter, METH_O, Test_metho_not_default_return_converter__doc__},
+    {"metho_not_default_return_converter", Test_metho_not_default_return_converter, METH_O, Test_metho_not_default_return_converter__doc__},
 
 static int
 Test_metho_not_default_return_converter_impl(TestObj *self, PyObject *a);
@@ -5011,7 +5011,7 @@ Test_metho_not_default_return_converter(PyObject *self, PyObject *a)
 
 static int
 Test_metho_not_default_return_converter_impl(TestObj *self, PyObject *a)
-/*[clinic end generated code: output=8b03f5213c312138 input=428657129b521177]*/
+/*[clinic end generated code: output=463ed281a4a3746b input=428657129b521177]*/
 
 
 /*[clinic input]
@@ -5031,7 +5031,7 @@ PyDoc_STRVAR(Test_an_metho_arg_named_arg__doc__,
 "    Name should be mangled to \'arg_\' in generated output.");
 
 #define TEST_AN_METHO_ARG_NAMED_ARG_METHODDEF    \
-    {"an_metho_arg_named_arg", (PyCFunction)Test_an_metho_arg_named_arg, METH_O, Test_an_metho_arg_named_arg__doc__},
+    {"an_metho_arg_named_arg", Test_an_metho_arg_named_arg, METH_O, Test_an_metho_arg_named_arg__doc__},
 
 static PyObject *
 Test_an_metho_arg_named_arg_impl(TestObj *self, int arg);
@@ -5054,7 +5054,7 @@ Test_an_metho_arg_named_arg(PyObject *self, PyObject *arg_)
 
 static PyObject *
 Test_an_metho_arg_named_arg_impl(TestObj *self, int arg)
-/*[clinic end generated code: output=38554f09950d07e7 input=2a53a57cf5624f95]*/
+/*[clinic end generated code: output=bc7ffcb6f7243cdd input=2a53a57cf5624f95]*/
 
 
 /*[clinic input]
@@ -5285,7 +5285,7 @@ PyDoc_STRVAR(Test_class_method__doc__,
 "\n");
 
 #define TEST_CLASS_METHOD_METHODDEF    \
-    {"class_method", (PyCFunction)Test_class_method, METH_NOARGS|METH_CLASS, Test_class_method__doc__},
+    {"class_method", Test_class_method, METH_NOARGS|METH_CLASS, Test_class_method__doc__},
 
 static PyObject *
 Test_class_method_impl(PyTypeObject *type);
@@ -5298,7 +5298,7 @@ Test_class_method(PyObject *type, PyObject *Py_UNUSED(ignored))
 
 static PyObject *
 Test_class_method_impl(PyTypeObject *type)
-/*[clinic end generated code: output=64f93e6252bde409 input=43bc4a0494547b80]*/
+/*[clinic end generated code: output=dbf944c1125c4c79 input=43bc4a0494547b80]*/
 
 
 /*[clinic input]
@@ -5312,7 +5312,7 @@ PyDoc_STRVAR(Test_static_method__doc__,
 "\n");
 
 #define TEST_STATIC_METHOD_METHODDEF    \
-    {"static_method", (PyCFunction)Test_static_method, METH_NOARGS|METH_STATIC, Test_static_method__doc__},
+    {"static_method", Test_static_method, METH_NOARGS|METH_STATIC, Test_static_method__doc__},
 
 static PyObject *
 Test_static_method_impl();
@@ -5325,7 +5325,7 @@ Test_static_method(PyObject *null, PyObject *Py_UNUSED(ignored))
 
 static PyObject *
 Test_static_method_impl()
-/*[clinic end generated code: output=9e401fb6ed56a4f3 input=dae892fac55ae72b]*/
+/*[clinic end generated code: output=e21462ae93b4645c input=dae892fac55ae72b]*/
 
 
 /*[clinic input]
@@ -5339,7 +5339,7 @@ PyDoc_STRVAR(Test_meth_coexist__doc__,
 "\n");
 
 #define TEST_METH_COEXIST_METHODDEF    \
-    {"meth_coexist", (PyCFunction)Test_meth_coexist, METH_NOARGS|METH_COEXIST, Test_meth_coexist__doc__},
+    {"meth_coexist", Test_meth_coexist, METH_NOARGS|METH_COEXIST, Test_meth_coexist__doc__},
 
 static PyObject *
 Test_meth_coexist_impl(TestObj *self);
@@ -5352,7 +5352,7 @@ Test_meth_coexist(PyObject *self, PyObject *Py_UNUSED(ignored))
 
 static PyObject *
 Test_meth_coexist_impl(TestObj *self)
-/*[clinic end generated code: output=7edf4e95b29f06fa input=2a1d75b5e6fec6dd]*/
+/*[clinic end generated code: output=9e43248bae46ad30 input=2a1d75b5e6fec6dd]*/
 
 /*[clinic input]
 @getter
@@ -5364,9 +5364,9 @@ Test.property
 #endif
 #if defined(TEST_PROPERTY_GETSETDEF)
 #  undef TEST_PROPERTY_GETSETDEF
-#  define TEST_PROPERTY_GETSETDEF {"property", (getter)Test_property_get, (setter)Test_property_set, Test_property_DOCSTR},
+#  define TEST_PROPERTY_GETSETDEF {"property", Test_property_get, Test_property_set, Test_property_DOCSTR},
 #else
-#  define TEST_PROPERTY_GETSETDEF {"property", (getter)Test_property_get, NULL, Test_property_DOCSTR},
+#  define TEST_PROPERTY_GETSETDEF {"property", Test_property_get, NULL, Test_property_DOCSTR},
 #endif
 
 static PyObject *
@@ -5380,7 +5380,7 @@ Test_property_get(PyObject *self, void *Py_UNUSED(context))
 
 static PyObject *
 Test_property_get_impl(TestObj *self)
-/*[clinic end generated code: output=b38d68abd3466a6e input=2d92b3449fbc7d2b]*/
+/*[clinic end generated code: output=4d600bc77ca96957 input=2d92b3449fbc7d2b]*/
 
 /*[clinic input]
 @setter
@@ -5392,9 +5392,9 @@ Test.property
 #endif
 #if defined(TEST_PROPERTY_GETSETDEF)
 #  undef TEST_PROPERTY_GETSETDEF
-#  define TEST_PROPERTY_GETSETDEF {"property", (getter)Test_property_get, (setter)Test_property_set, Test_property_DOCSTR},
+#  define TEST_PROPERTY_GETSETDEF {"property", Test_property_get, Test_property_set, Test_property_DOCSTR},
 #else
-#  define TEST_PROPERTY_GETSETDEF {"property", NULL, (setter)Test_property_set, NULL},
+#  define TEST_PROPERTY_GETSETDEF {"property", NULL, Test_property_set, NULL},
 #endif
 
 static int
@@ -5412,7 +5412,7 @@ Test_property_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 
 static int
 Test_property_set_impl(TestObj *self, PyObject *value)
-/*[clinic end generated code: output=49f925ab2a33b637 input=3bc3f46a23c83a88]*/
+/*[clinic end generated code: output=5d1024e9700a89dd input=3bc3f46a23c83a88]*/
 
 /*[clinic input]
 @setter
@@ -5424,9 +5424,9 @@ Test.setter_first_with_docstr
 #endif
 #if defined(TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF)
 #  undef TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF
-#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", (getter)Test_setter_first_with_docstr_get, (setter)Test_setter_first_with_docstr_set, Test_setter_first_with_docstr_DOCSTR},
+#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", Test_setter_first_with_docstr_get, Test_setter_first_with_docstr_set, Test_setter_first_with_docstr_DOCSTR},
 #else
-#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", NULL, (setter)Test_setter_first_with_docstr_set, NULL},
+#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", NULL, Test_setter_first_with_docstr_set, NULL},
 #endif
 
 static int
@@ -5444,7 +5444,7 @@ Test_setter_first_with_docstr_set(PyObject *self, PyObject *value, void *Py_UNUS
 
 static int
 Test_setter_first_with_docstr_set_impl(TestObj *self, PyObject *value)
-/*[clinic end generated code: output=5aaf44373c0af545 input=31a045ce11bbe961]*/
+/*[clinic end generated code: output=b3e243759a22bb02 input=31a045ce11bbe961]*/
 
 /*[clinic input]
 @getter
@@ -5465,9 +5465,9 @@ PyDoc_STRVAR(Test_setter_first_with_docstr__doc__,
 #endif
 #if defined(TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF)
 #  undef TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF
-#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", (getter)Test_setter_first_with_docstr_get, (setter)Test_setter_first_with_docstr_set, Test_setter_first_with_docstr_DOCSTR},
+#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", Test_setter_first_with_docstr_get, Test_setter_first_with_docstr_set, Test_setter_first_with_docstr_DOCSTR},
 #else
-#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", (getter)Test_setter_first_with_docstr_get, NULL, Test_setter_first_with_docstr_DOCSTR},
+#  define TEST_SETTER_FIRST_WITH_DOCSTR_GETSETDEF {"setter_first_with_docstr", Test_setter_first_with_docstr_get, NULL, Test_setter_first_with_docstr_DOCSTR},
 #endif
 
 static PyObject *
@@ -5481,7 +5481,7 @@ Test_setter_first_with_docstr_get(PyObject *self, void *Py_UNUSED(context))
 
 static PyObject *
 Test_setter_first_with_docstr_get_impl(TestObj *self)
-/*[clinic end generated code: output=fe6e3aa844a24920 input=10af4e43b3cb34dc]*/
+/*[clinic end generated code: output=968a7642c38ef6e6 input=10af4e43b3cb34dc]*/
 
 /*[clinic input]
 output push
@@ -5621,7 +5621,7 @@ PyDoc_STRVAR(bool_return__doc__,
 "\n");
 
 #define BOOL_RETURN_METHODDEF    \
-    {"bool_return", (PyCFunction)bool_return, METH_NOARGS, bool_return__doc__},
+    {"bool_return", bool_return, METH_NOARGS, bool_return__doc__},
 
 static int
 bool_return_impl(PyObject *module);
@@ -5644,7 +5644,7 @@ bool_return(PyObject *module, PyObject *Py_UNUSED(ignored))
 
 static int
 bool_return_impl(PyObject *module)
-/*[clinic end generated code: output=3a65f07830e48e98 input=93ba95d39ee98f39]*/
+/*[clinic end generated code: output=6c8ef775e67e345f input=93ba95d39ee98f39]*/
 
 
 /*[clinic input]
@@ -5657,7 +5657,7 @@ PyDoc_STRVAR(double_return__doc__,
 "\n");
 
 #define DOUBLE_RETURN_METHODDEF    \
-    {"double_return", (PyCFunction)double_return, METH_NOARGS, double_return__doc__},
+    {"double_return", double_return, METH_NOARGS, double_return__doc__},
 
 static double
 double_return_impl(PyObject *module);
@@ -5680,7 +5680,7 @@ double_return(PyObject *module, PyObject *Py_UNUSED(ignored))
 
 static double
 double_return_impl(PyObject *module)
-/*[clinic end generated code: output=076dc72595d3f66d input=da11b6255e4cbfd7]*/
+/*[clinic end generated code: output=9730b7e722925cec input=da11b6255e4cbfd7]*/
 
 
 /*[clinic input]
@@ -5974,7 +5974,7 @@ PyDoc_STRVAR(test_critical_section__doc__,
 "\n");
 
 #define TEST_CRITICAL_SECTION_METHODDEF    \
-    {"test_critical_section", (PyCFunction)test_critical_section, METH_NOARGS, test_critical_section__doc__},
+    {"test_critical_section", test_critical_section, METH_NOARGS, test_critical_section__doc__},
 
 static PyObject *
 test_critical_section_impl(PyObject *module);
@@ -5993,7 +5993,7 @@ test_critical_section(PyObject *module, PyObject *Py_UNUSED(ignored))
 
 static PyObject *
 test_critical_section_impl(PyObject *module)
-/*[clinic end generated code: output=9d5a87bb28aa3f0c input=8c58956d6ff00f80]*/
+/*[clinic end generated code: output=94a82ca7cb65a84a input=8c58956d6ff00f80]*/
 
 
 /*[clinic input]
@@ -6009,7 +6009,7 @@ PyDoc_STRVAR(test_critical_section_meth_o__doc__,
 "\n");
 
 #define TEST_CRITICAL_SECTION_METH_O_METHODDEF    \
-    {"test_critical_section_meth_o", (PyCFunction)test_critical_section_meth_o, METH_O, test_critical_section_meth_o__doc__},
+    {"test_critical_section_meth_o", test_critical_section_meth_o, METH_O, test_critical_section_meth_o__doc__},
 
 static PyObject *
 test_critical_section_meth_o_impl(PyObject *module, PyObject *a);
@@ -6035,7 +6035,7 @@ test_critical_section_meth_o(PyObject *module, PyObject *arg)
 
 static PyObject *
 test_critical_section_meth_o_impl(PyObject *module, PyObject *a)
-/*[clinic end generated code: output=7a9d7420802d1202 input=376533f51eceb6c3]*/
+/*[clinic end generated code: output=6276bd911b60c196 input=376533f51eceb6c3]*/
 
 /*[clinic input]
 @critical_section a
@@ -6052,7 +6052,7 @@ PyDoc_STRVAR(test_critical_section_object__doc__,
 "test_critical_section_object");
 
 #define TEST_CRITICAL_SECTION_OBJECT_METHODDEF    \
-    {"test_critical_section_object", (PyCFunction)test_critical_section_object, METH_O, test_critical_section_object__doc__},
+    {"test_critical_section_object", test_critical_section_object, METH_O, test_critical_section_object__doc__},
 
 static PyObject *
 test_critical_section_object_impl(PyObject *module, PyObject *a);
@@ -6078,7 +6078,7 @@ test_critical_section_object(PyObject *module, PyObject *arg)
 
 static PyObject *
 test_critical_section_object_impl(PyObject *module, PyObject *a)
-/*[clinic end generated code: output=ec06df92232b0fb5 input=6f67f91b523c875f]*/
+/*[clinic end generated code: output=975dc9674e9c5bfa input=6f67f91b523c875f]*/
 
 PyDoc_STRVAR(test_critical_section_object__doc__,
 "test_critical_section_object($module, a, /)\n"
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
index 199050d0d61438..137144b25fb79d 100644
--- a/Lib/test/test_clinic.py
+++ b/Lib/test/test_clinic.py
@@ -432,11 +432,11 @@ def test_dest_buffer_not_empty_at_eof(self):
             "\\n");
 
             #define FN_METHODDEF    \\
-                {"fn", (PyCFunction)fn, METH_O, fn__doc__},
+                {"fn", fn, METH_O, fn__doc__},
 
             static PyObject *
             fn(PyObject *module, PyObject *a)
-            /*[clinic end generated code: output=be6798b148ab4e53 input=524ce2e021e4eba6]*/
+            /*[clinic end generated code: output=9ca52938037af908 input=524ce2e021e4eba6]*/
         """)
         block = dedent("""
             /*[clinic input]
@@ -2930,11 +2930,11 @@ def test_file_dest(self):
             "\\n");
 
             #define FUNC_METHODDEF    \\
-                {"func", (PyCFunction)func, METH_O, func__doc__},
+                {"func", func, METH_O, func__doc__},
 
             static PyObject *
             func(PyObject *module, PyObject *a)
-            /*[clinic end generated code: output=3dde2d13002165b9 input=a9049054013a1b77]*/
+            /*[clinic end generated code: output=c710c5cbbd6f0a2f input=a9049054013a1b77]*/
         """)
         with os_helper.temp_dir() as tmp_dir:
             in_fn = os.path.join(tmp_dir, "test.c")
diff --git a/Modules/_ctypes/clinic/_ctypes.c.h b/Modules/_ctypes/clinic/_ctypes.c.h
index 92dfb8f83b7da6..e885201e4de959 100644
--- a/Modules/_ctypes/clinic/_ctypes.c.h
+++ b/Modules/_ctypes/clinic/_ctypes.c.h
@@ -412,9 +412,9 @@ PyCPointerType_from_param(PyObject *type, PyTypeObject *cls, PyObject *const *ar
 #endif
 #if defined(_CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF)
 #  undef _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF
-#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", (getter)_ctypes_PyCArrayType_Type_raw_get, (setter)_ctypes_PyCArrayType_Type_raw_set, _ctypes_PyCArrayType_Type_raw_DOCSTR},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", _ctypes_PyCArrayType_Type_raw_get, _ctypes_PyCArrayType_Type_raw_set, _ctypes_PyCArrayType_Type_raw_DOCSTR},
 #else
-#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", NULL, (setter)_ctypes_PyCArrayType_Type_raw_set, NULL},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", NULL, _ctypes_PyCArrayType_Type_raw_set, NULL},
 #endif
 
 static int
@@ -437,9 +437,9 @@ _ctypes_PyCArrayType_Type_raw_set(PyObject *self, PyObject *value, void *Py_UNUS
 #endif
 #if defined(_CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF)
 #  undef _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF
-#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", (getter)_ctypes_PyCArrayType_Type_raw_get, (setter)_ctypes_PyCArrayType_Type_raw_set, _ctypes_PyCArrayType_Type_raw_DOCSTR},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", _ctypes_PyCArrayType_Type_raw_get, _ctypes_PyCArrayType_Type_raw_set, _ctypes_PyCArrayType_Type_raw_DOCSTR},
 #else
-#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", (getter)_ctypes_PyCArrayType_Type_raw_get, NULL, _ctypes_PyCArrayType_Type_raw_DOCSTR},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_RAW_GETSETDEF {"raw", _ctypes_PyCArrayType_Type_raw_get, NULL, _ctypes_PyCArrayType_Type_raw_DOCSTR},
 #endif
 
 static PyObject *
@@ -462,9 +462,9 @@ _ctypes_PyCArrayType_Type_raw_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF)
 #  undef _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF
-#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", (getter)_ctypes_PyCArrayType_Type_value_get, (setter)_ctypes_PyCArrayType_Type_value_set, _ctypes_PyCArrayType_Type_value_DOCSTR},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", _ctypes_PyCArrayType_Type_value_get, _ctypes_PyCArrayType_Type_value_set, _ctypes_PyCArrayType_Type_value_DOCSTR},
 #else
-#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", (getter)_ctypes_PyCArrayType_Type_value_get, NULL, _ctypes_PyCArrayType_Type_value_DOCSTR},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", _ctypes_PyCArrayType_Type_value_get, NULL, _ctypes_PyCArrayType_Type_value_DOCSTR},
 #endif
 
 static PyObject *
@@ -487,9 +487,9 @@ _ctypes_PyCArrayType_Type_value_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF)
 #  undef _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF
-#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", (getter)_ctypes_PyCArrayType_Type_value_get, (setter)_ctypes_PyCArrayType_Type_value_set, _ctypes_PyCArrayType_Type_value_DOCSTR},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", _ctypes_PyCArrayType_Type_value_get, _ctypes_PyCArrayType_Type_value_set, _ctypes_PyCArrayType_Type_value_DOCSTR},
 #else
-#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", NULL, (setter)_ctypes_PyCArrayType_Type_value_set, NULL},
+#  define _CTYPES_PYCARRAYTYPE_TYPE_VALUE_GETSETDEF {"value", NULL, _ctypes_PyCArrayType_Type_value_set, NULL},
 #endif
 
 static int
@@ -748,7 +748,7 @@ PyDoc_STRVAR(_ctypes_PyCData___ctypes_from_outparam____doc__,
 "default __ctypes_from_outparam__ method returns self.");
 
 #define _CTYPES_PYCDATA___CTYPES_FROM_OUTPARAM___METHODDEF    \
-    {"__ctypes_from_outparam__", (PyCFunction)_ctypes_PyCData___ctypes_from_outparam__, METH_NOARGS, _ctypes_PyCData___ctypes_from_outparam____doc__},
+    {"__ctypes_from_outparam__", _ctypes_PyCData___ctypes_from_outparam__, METH_NOARGS, _ctypes_PyCData___ctypes_from_outparam____doc__},
 
 static PyObject *
 _ctypes_PyCData___ctypes_from_outparam___impl(PyObject *self);
@@ -764,9 +764,9 @@ _ctypes_PyCData___ctypes_from_outparam__(PyObject *self, PyObject *Py_UNUSED(ign
 #endif
 #if defined(_CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF)
 #  undef _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF
-#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", (getter)_ctypes_CFuncPtr_errcheck_get, (setter)_ctypes_CFuncPtr_errcheck_set, _ctypes_CFuncPtr_errcheck_DOCSTR},
+#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", _ctypes_CFuncPtr_errcheck_get, _ctypes_CFuncPtr_errcheck_set, _ctypes_CFuncPtr_errcheck_DOCSTR},
 #else
-#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", NULL, (setter)_ctypes_CFuncPtr_errcheck_set, NULL},
+#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", NULL, _ctypes_CFuncPtr_errcheck_set, NULL},
 #endif
 
 static int
@@ -796,9 +796,9 @@ PyDoc_STRVAR(_ctypes_CFuncPtr_errcheck__doc__,
 #endif
 #if defined(_CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF)
 #  undef _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF
-#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", (getter)_ctypes_CFuncPtr_errcheck_get, (setter)_ctypes_CFuncPtr_errcheck_set, _ctypes_CFuncPtr_errcheck_DOCSTR},
+#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", _ctypes_CFuncPtr_errcheck_get, _ctypes_CFuncPtr_errcheck_set, _ctypes_CFuncPtr_errcheck_DOCSTR},
 #else
-#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", (getter)_ctypes_CFuncPtr_errcheck_get, NULL, _ctypes_CFuncPtr_errcheck_DOCSTR},
+#  define _CTYPES_CFUNCPTR_ERRCHECK_GETSETDEF {"errcheck", _ctypes_CFuncPtr_errcheck_get, NULL, _ctypes_CFuncPtr_errcheck_DOCSTR},
 #endif
 
 static PyObject *
@@ -821,9 +821,9 @@ _ctypes_CFuncPtr_errcheck_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_CTYPES_CFUNCPTR_RESTYPE_GETSETDEF)
 #  undef _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF
-#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", (getter)_ctypes_CFuncPtr_restype_get, (setter)_ctypes_CFuncPtr_restype_set, _ctypes_CFuncPtr_restype_DOCSTR},
+#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", _ctypes_CFuncPtr_restype_get, _ctypes_CFuncPtr_restype_set, _ctypes_CFuncPtr_restype_DOCSTR},
 #else
-#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", NULL, (setter)_ctypes_CFuncPtr_restype_set, NULL},
+#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", NULL, _ctypes_CFuncPtr_restype_set, NULL},
 #endif
 
 static int
@@ -853,9 +853,9 @@ PyDoc_STRVAR(_ctypes_CFuncPtr_restype__doc__,
 #endif
 #if defined(_CTYPES_CFUNCPTR_RESTYPE_GETSETDEF)
 #  undef _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF
-#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", (getter)_ctypes_CFuncPtr_restype_get, (setter)_ctypes_CFuncPtr_restype_set, _ctypes_CFuncPtr_restype_DOCSTR},
+#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", _ctypes_CFuncPtr_restype_get, _ctypes_CFuncPtr_restype_set, _ctypes_CFuncPtr_restype_DOCSTR},
 #else
-#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", (getter)_ctypes_CFuncPtr_restype_get, NULL, _ctypes_CFuncPtr_restype_DOCSTR},
+#  define _CTYPES_CFUNCPTR_RESTYPE_GETSETDEF {"restype", _ctypes_CFuncPtr_restype_get, NULL, _ctypes_CFuncPtr_restype_DOCSTR},
 #endif
 
 static PyObject *
@@ -878,9 +878,9 @@ _ctypes_CFuncPtr_restype_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF)
 #  undef _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF
-#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", (getter)_ctypes_CFuncPtr_argtypes_get, (setter)_ctypes_CFuncPtr_argtypes_set, _ctypes_CFuncPtr_argtypes_DOCSTR},
+#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", _ctypes_CFuncPtr_argtypes_get, _ctypes_CFuncPtr_argtypes_set, _ctypes_CFuncPtr_argtypes_DOCSTR},
 #else
-#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", NULL, (setter)_ctypes_CFuncPtr_argtypes_set, NULL},
+#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", NULL, _ctypes_CFuncPtr_argtypes_set, NULL},
 #endif
 
 static int
@@ -910,9 +910,9 @@ PyDoc_STRVAR(_ctypes_CFuncPtr_argtypes__doc__,
 #endif
 #if defined(_CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF)
 #  undef _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF
-#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", (getter)_ctypes_CFuncPtr_argtypes_get, (setter)_ctypes_CFuncPtr_argtypes_set, _ctypes_CFuncPtr_argtypes_DOCSTR},
+#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", _ctypes_CFuncPtr_argtypes_get, _ctypes_CFuncPtr_argtypes_set, _ctypes_CFuncPtr_argtypes_DOCSTR},
 #else
-#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", (getter)_ctypes_CFuncPtr_argtypes_get, NULL, _ctypes_CFuncPtr_argtypes_DOCSTR},
+#  define _CTYPES_CFUNCPTR_ARGTYPES_GETSETDEF {"argtypes", _ctypes_CFuncPtr_argtypes_get, NULL, _ctypes_CFuncPtr_argtypes_DOCSTR},
 #endif
 
 static PyObject *
@@ -935,9 +935,9 @@ _ctypes_CFuncPtr_argtypes_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_CTYPES_SIMPLE_VALUE_GETSETDEF)
 #  undef _CTYPES_SIMPLE_VALUE_GETSETDEF
-#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", (getter)_ctypes_Simple_value_get, (setter)_ctypes_Simple_value_set, _ctypes_Simple_value_DOCSTR},
+#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", _ctypes_Simple_value_get, _ctypes_Simple_value_set, _ctypes_Simple_value_DOCSTR},
 #else
-#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", NULL, (setter)_ctypes_Simple_value_set, NULL},
+#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", NULL, _ctypes_Simple_value_set, NULL},
 #endif
 
 static int
@@ -960,9 +960,9 @@ _ctypes_Simple_value_set(PyObject *self, PyObject *value, void *Py_UNUSED(contex
 #endif
 #if defined(_CTYPES_SIMPLE_VALUE_GETSETDEF)
 #  undef _CTYPES_SIMPLE_VALUE_GETSETDEF
-#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", (getter)_ctypes_Simple_value_get, (setter)_ctypes_Simple_value_set, _ctypes_Simple_value_DOCSTR},
+#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", _ctypes_Simple_value_get, _ctypes_Simple_value_set, _ctypes_Simple_value_DOCSTR},
 #else
-#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", (getter)_ctypes_Simple_value_get, NULL, _ctypes_Simple_value_DOCSTR},
+#  define _CTYPES_SIMPLE_VALUE_GETSETDEF {"value", _ctypes_Simple_value_get, NULL, _ctypes_Simple_value_DOCSTR},
 #endif
 
 static PyObject *
@@ -1000,4 +1000,4 @@ Simple_from_outparm(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py
     }
     return Simple_from_outparm_impl(self, cls);
 }
-/*[clinic end generated code: output=9fb75bf7e9a17df2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1850a7f8208a1290 input=a9049054013a1b77]*/
diff --git a/Modules/_ctypes/clinic/callproc.c.h b/Modules/_ctypes/clinic/callproc.c.h
index 8a5c8f6427b7f0..fca5fa36276c47 100644
--- a/Modules/_ctypes/clinic/callproc.c.h
+++ b/Modules/_ctypes/clinic/callproc.c.h
@@ -13,7 +13,7 @@ PyDoc_STRVAR(_ctypes_sizeof__doc__,
 "Return the size in bytes of a C instance.");
 
 #define _CTYPES_SIZEOF_METHODDEF    \
-    {"sizeof", (PyCFunction)_ctypes_sizeof, METH_O, _ctypes_sizeof__doc__},
+    {"sizeof", _ctypes_sizeof, METH_O, _ctypes_sizeof__doc__},
 
 PyDoc_STRVAR(_ctypes_byref__doc__,
 "byref($module, obj, offset=0, /)\n"
@@ -73,7 +73,7 @@ PyDoc_STRVAR(_ctypes_addressof__doc__,
 "Return the address of the C instance internal buffer");
 
 #define _CTYPES_ADDRESSOF_METHODDEF    \
-    {"addressof", (PyCFunction)_ctypes_addressof, METH_O, _ctypes_addressof__doc__},
+    {"addressof", _ctypes_addressof, METH_O, _ctypes_addressof__doc__},
 
 static PyObject *
 _ctypes_addressof_impl(PyObject *module, PyObject *obj);
@@ -156,7 +156,7 @@ PyDoc_STRVAR(create_pointer_type__doc__,
 "so calling this function repeatedly is cheap.");
 
 #define CREATE_POINTER_TYPE_METHODDEF    \
-    {"POINTER", (PyCFunction)create_pointer_type, METH_O, create_pointer_type__doc__},
+    {"POINTER", create_pointer_type, METH_O, create_pointer_type__doc__},
 
 PyDoc_STRVAR(create_pointer_inst__doc__,
 "pointer($module, obj, /)\n"
@@ -169,5 +169,5 @@ PyDoc_STRVAR(create_pointer_inst__doc__,
 "should use byref(obj) which is much faster.");
 
 #define CREATE_POINTER_INST_METHODDEF    \
-    {"pointer", (PyCFunction)create_pointer_inst, METH_O, create_pointer_inst__doc__},
-/*[clinic end generated code: output=46a3841cbe5ddc96 input=a9049054013a1b77]*/
+    {"pointer", create_pointer_inst, METH_O, create_pointer_inst__doc__},
+/*[clinic end generated code: output=abdb718fdec648c2 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h
index b7c0ca2c4b919b..496792de4092f4 100644
--- a/Modules/_io/clinic/bufferedio.c.h
+++ b/Modules/_io/clinic/bufferedio.c.h
@@ -16,7 +16,7 @@ PyDoc_STRVAR(_io__BufferedIOBase_readinto__doc__,
 "\n");
 
 #define _IO__BUFFEREDIOBASE_READINTO_METHODDEF    \
-    {"readinto", (PyCFunction)_io__BufferedIOBase_readinto, METH_O, _io__BufferedIOBase_readinto__doc__},
+    {"readinto", _io__BufferedIOBase_readinto, METH_O, _io__BufferedIOBase_readinto__doc__},
 
 static PyObject *
 _io__BufferedIOBase_readinto_impl(PyObject *self, Py_buffer *buffer);
@@ -50,7 +50,7 @@ PyDoc_STRVAR(_io__BufferedIOBase_readinto1__doc__,
 "\n");
 
 #define _IO__BUFFEREDIOBASE_READINTO1_METHODDEF    \
-    {"readinto1", (PyCFunction)_io__BufferedIOBase_readinto1, METH_O, _io__BufferedIOBase_readinto1__doc__},
+    {"readinto1", _io__BufferedIOBase_readinto1, METH_O, _io__BufferedIOBase_readinto1__doc__},
 
 static PyObject *
 _io__BufferedIOBase_readinto1_impl(PyObject *self, Py_buffer *buffer);
@@ -282,7 +282,7 @@ PyDoc_STRVAR(_io__Buffered___sizeof____doc__,
 "\n");
 
 #define _IO__BUFFERED___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)_io__Buffered___sizeof__, METH_NOARGS, _io__Buffered___sizeof____doc__},
+    {"__sizeof__", _io__Buffered___sizeof__, METH_NOARGS, _io__Buffered___sizeof____doc__},
 
 static PyObject *
 _io__Buffered___sizeof___impl(buffered *self);
@@ -305,7 +305,7 @@ PyDoc_STRVAR(_io__Buffered__dealloc_warn__doc__,
 "\n");
 
 #define _IO__BUFFERED__DEALLOC_WARN_METHODDEF    \
-    {"_dealloc_warn", (PyCFunction)_io__Buffered__dealloc_warn, METH_O, _io__Buffered__dealloc_warn__doc__},
+    {"_dealloc_warn", _io__Buffered__dealloc_warn, METH_O, _io__Buffered__dealloc_warn__doc__},
 
 static PyObject *
 _io__Buffered__dealloc_warn_impl(buffered *self, PyObject *source);
@@ -326,7 +326,7 @@ PyDoc_STRVAR(_io__Buffered_simple_flush__doc__,
 "\n");
 
 #define _IO__BUFFERED_SIMPLE_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_io__Buffered_simple_flush, METH_NOARGS, _io__Buffered_simple_flush__doc__},
+    {"flush", _io__Buffered_simple_flush, METH_NOARGS, _io__Buffered_simple_flush__doc__},
 
 static PyObject *
 _io__Buffered_simple_flush_impl(buffered *self);
@@ -348,9 +348,9 @@ _io__Buffered_simple_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
 #endif
 #if defined(_IO__BUFFERED_CLOSED_GETSETDEF)
 #  undef _IO__BUFFERED_CLOSED_GETSETDEF
-#  define _IO__BUFFERED_CLOSED_GETSETDEF {"closed", (getter)_io__Buffered_closed_get, (setter)_io__Buffered_closed_set, _io__Buffered_closed_DOCSTR},
+#  define _IO__BUFFERED_CLOSED_GETSETDEF {"closed", _io__Buffered_closed_get, _io__Buffered_closed_set, _io__Buffered_closed_DOCSTR},
 #else
-#  define _IO__BUFFERED_CLOSED_GETSETDEF {"closed", (getter)_io__Buffered_closed_get, NULL, _io__Buffered_closed_DOCSTR},
+#  define _IO__BUFFERED_CLOSED_GETSETDEF {"closed", _io__Buffered_closed_get, NULL, _io__Buffered_closed_DOCSTR},
 #endif
 
 static PyObject *
@@ -374,7 +374,7 @@ PyDoc_STRVAR(_io__Buffered_close__doc__,
 "\n");
 
 #define _IO__BUFFERED_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_io__Buffered_close, METH_NOARGS, _io__Buffered_close__doc__},
+    {"close", _io__Buffered_close, METH_NOARGS, _io__Buffered_close__doc__},
 
 static PyObject *
 _io__Buffered_close_impl(buffered *self);
@@ -397,7 +397,7 @@ PyDoc_STRVAR(_io__Buffered_detach__doc__,
 "\n");
 
 #define _IO__BUFFERED_DETACH_METHODDEF    \
-    {"detach", (PyCFunction)_io__Buffered_detach, METH_NOARGS, _io__Buffered_detach__doc__},
+    {"detach", _io__Buffered_detach, METH_NOARGS, _io__Buffered_detach__doc__},
 
 static PyObject *
 _io__Buffered_detach_impl(buffered *self);
@@ -420,7 +420,7 @@ PyDoc_STRVAR(_io__Buffered_seekable__doc__,
 "\n");
 
 #define _IO__BUFFERED_SEEKABLE_METHODDEF    \
-    {"seekable", (PyCFunction)_io__Buffered_seekable, METH_NOARGS, _io__Buffered_seekable__doc__},
+    {"seekable", _io__Buffered_seekable, METH_NOARGS, _io__Buffered_seekable__doc__},
 
 static PyObject *
 _io__Buffered_seekable_impl(buffered *self);
@@ -443,7 +443,7 @@ PyDoc_STRVAR(_io__Buffered_readable__doc__,
 "\n");
 
 #define _IO__BUFFERED_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io__Buffered_readable, METH_NOARGS, _io__Buffered_readable__doc__},
+    {"readable", _io__Buffered_readable, METH_NOARGS, _io__Buffered_readable__doc__},
 
 static PyObject *
 _io__Buffered_readable_impl(buffered *self);
@@ -466,7 +466,7 @@ PyDoc_STRVAR(_io__Buffered_writable__doc__,
 "\n");
 
 #define _IO__BUFFERED_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io__Buffered_writable, METH_NOARGS, _io__Buffered_writable__doc__},
+    {"writable", _io__Buffered_writable, METH_NOARGS, _io__Buffered_writable__doc__},
 
 static PyObject *
 _io__Buffered_writable_impl(buffered *self);
@@ -488,9 +488,9 @@ _io__Buffered_writable(PyObject *self, PyObject *Py_UNUSED(ignored))
 #endif
 #if defined(_IO__BUFFERED_NAME_GETSETDEF)
 #  undef _IO__BUFFERED_NAME_GETSETDEF
-#  define _IO__BUFFERED_NAME_GETSETDEF {"name", (getter)_io__Buffered_name_get, (setter)_io__Buffered_name_set, _io__Buffered_name_DOCSTR},
+#  define _IO__BUFFERED_NAME_GETSETDEF {"name", _io__Buffered_name_get, _io__Buffered_name_set, _io__Buffered_name_DOCSTR},
 #else
-#  define _IO__BUFFERED_NAME_GETSETDEF {"name", (getter)_io__Buffered_name_get, NULL, _io__Buffered_name_DOCSTR},
+#  define _IO__BUFFERED_NAME_GETSETDEF {"name", _io__Buffered_name_get, NULL, _io__Buffered_name_DOCSTR},
 #endif
 
 static PyObject *
@@ -513,9 +513,9 @@ _io__Buffered_name_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO__BUFFERED_MODE_GETSETDEF)
 #  undef _IO__BUFFERED_MODE_GETSETDEF
-#  define _IO__BUFFERED_MODE_GETSETDEF {"mode", (getter)_io__Buffered_mode_get, (setter)_io__Buffered_mode_set, _io__Buffered_mode_DOCSTR},
+#  define _IO__BUFFERED_MODE_GETSETDEF {"mode", _io__Buffered_mode_get, _io__Buffered_mode_set, _io__Buffered_mode_DOCSTR},
 #else
-#  define _IO__BUFFERED_MODE_GETSETDEF {"mode", (getter)_io__Buffered_mode_get, NULL, _io__Buffered_mode_DOCSTR},
+#  define _IO__BUFFERED_MODE_GETSETDEF {"mode", _io__Buffered_mode_get, NULL, _io__Buffered_mode_DOCSTR},
 #endif
 
 static PyObject *
@@ -539,7 +539,7 @@ PyDoc_STRVAR(_io__Buffered_fileno__doc__,
 "\n");
 
 #define _IO__BUFFERED_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)_io__Buffered_fileno, METH_NOARGS, _io__Buffered_fileno__doc__},
+    {"fileno", _io__Buffered_fileno, METH_NOARGS, _io__Buffered_fileno__doc__},
 
 static PyObject *
 _io__Buffered_fileno_impl(buffered *self);
@@ -562,7 +562,7 @@ PyDoc_STRVAR(_io__Buffered_isatty__doc__,
 "\n");
 
 #define _IO__BUFFERED_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)_io__Buffered_isatty, METH_NOARGS, _io__Buffered_isatty__doc__},
+    {"isatty", _io__Buffered_isatty, METH_NOARGS, _io__Buffered_isatty__doc__},
 
 static PyObject *
 _io__Buffered_isatty_impl(buffered *self);
@@ -585,7 +585,7 @@ PyDoc_STRVAR(_io__Buffered_flush__doc__,
 "\n");
 
 #define _IO__BUFFERED_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_io__Buffered_flush, METH_NOARGS, _io__Buffered_flush__doc__},
+    {"flush", _io__Buffered_flush, METH_NOARGS, _io__Buffered_flush__doc__},
 
 static PyObject *
 _io__Buffered_flush_impl(buffered *self);
@@ -731,7 +731,7 @@ PyDoc_STRVAR(_io__Buffered_readinto__doc__,
 "\n");
 
 #define _IO__BUFFERED_READINTO_METHODDEF    \
-    {"readinto", (PyCFunction)_io__Buffered_readinto, METH_O, _io__Buffered_readinto__doc__},
+    {"readinto", _io__Buffered_readinto, METH_O, _io__Buffered_readinto__doc__},
 
 static PyObject *
 _io__Buffered_readinto_impl(buffered *self, Py_buffer *buffer);
@@ -765,7 +765,7 @@ PyDoc_STRVAR(_io__Buffered_readinto1__doc__,
 "\n");
 
 #define _IO__BUFFERED_READINTO1_METHODDEF    \
-    {"readinto1", (PyCFunction)_io__Buffered_readinto1, METH_O, _io__Buffered_readinto1__doc__},
+    {"readinto1", _io__Buffered_readinto1, METH_O, _io__Buffered_readinto1__doc__},
 
 static PyObject *
 _io__Buffered_readinto1_impl(buffered *self, Py_buffer *buffer);
@@ -834,7 +834,7 @@ PyDoc_STRVAR(_io__Buffered_tell__doc__,
 "\n");
 
 #define _IO__BUFFERED_TELL_METHODDEF    \
-    {"tell", (PyCFunction)_io__Buffered_tell, METH_NOARGS, _io__Buffered_tell__doc__},
+    {"tell", _io__Buffered_tell, METH_NOARGS, _io__Buffered_tell__doc__},
 
 static PyObject *
 _io__Buffered_tell_impl(buffered *self);
@@ -1100,7 +1100,7 @@ PyDoc_STRVAR(_io_BufferedWriter_write__doc__,
 "\n");
 
 #define _IO_BUFFEREDWRITER_WRITE_METHODDEF    \
-    {"write", (PyCFunction)_io_BufferedWriter_write, METH_O, _io_BufferedWriter_write__doc__},
+    {"write", _io_BufferedWriter_write, METH_O, _io_BufferedWriter_write__doc__},
 
 static PyObject *
 _io_BufferedWriter_write_impl(buffered *self, Py_buffer *buffer);
@@ -1265,4 +1265,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3ee17211d2010462 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=aaec5899657ef7b2 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h
index aaf4884d1732a9..dee37585520831 100644
--- a/Modules/_io/clinic/bytesio.c.h
+++ b/Modules/_io/clinic/bytesio.c.h
@@ -16,7 +16,7 @@ PyDoc_STRVAR(_io_BytesIO_readable__doc__,
 "Returns True if the IO object can be read.");
 
 #define _IO_BYTESIO_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io_BytesIO_readable, METH_NOARGS, _io_BytesIO_readable__doc__},
+    {"readable", _io_BytesIO_readable, METH_NOARGS, _io_BytesIO_readable__doc__},
 
 static PyObject *
 _io_BytesIO_readable_impl(bytesio *self);
@@ -34,7 +34,7 @@ PyDoc_STRVAR(_io_BytesIO_writable__doc__,
 "Returns True if the IO object can be written.");
 
 #define _IO_BYTESIO_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io_BytesIO_writable, METH_NOARGS, _io_BytesIO_writable__doc__},
+    {"writable", _io_BytesIO_writable, METH_NOARGS, _io_BytesIO_writable__doc__},
 
 static PyObject *
 _io_BytesIO_writable_impl(bytesio *self);
@@ -52,7 +52,7 @@ PyDoc_STRVAR(_io_BytesIO_seekable__doc__,
 "Returns True if the IO object can be seeked.");
 
 #define _IO_BYTESIO_SEEKABLE_METHODDEF    \
-    {"seekable", (PyCFunction)_io_BytesIO_seekable, METH_NOARGS, _io_BytesIO_seekable__doc__},
+    {"seekable", _io_BytesIO_seekable, METH_NOARGS, _io_BytesIO_seekable__doc__},
 
 static PyObject *
 _io_BytesIO_seekable_impl(bytesio *self);
@@ -70,7 +70,7 @@ PyDoc_STRVAR(_io_BytesIO_flush__doc__,
 "Does nothing.");
 
 #define _IO_BYTESIO_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_io_BytesIO_flush, METH_NOARGS, _io_BytesIO_flush__doc__},
+    {"flush", _io_BytesIO_flush, METH_NOARGS, _io_BytesIO_flush__doc__},
 
 static PyObject *
 _io_BytesIO_flush_impl(bytesio *self);
@@ -110,7 +110,7 @@ PyDoc_STRVAR(_io_BytesIO_getvalue__doc__,
 "Retrieve the entire contents of the BytesIO object.");
 
 #define _IO_BYTESIO_GETVALUE_METHODDEF    \
-    {"getvalue", (PyCFunction)_io_BytesIO_getvalue, METH_NOARGS, _io_BytesIO_getvalue__doc__},
+    {"getvalue", _io_BytesIO_getvalue, METH_NOARGS, _io_BytesIO_getvalue__doc__},
 
 static PyObject *
 _io_BytesIO_getvalue_impl(bytesio *self);
@@ -130,7 +130,7 @@ PyDoc_STRVAR(_io_BytesIO_isatty__doc__,
 "BytesIO objects are not connected to a TTY-like device.");
 
 #define _IO_BYTESIO_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)_io_BytesIO_isatty, METH_NOARGS, _io_BytesIO_isatty__doc__},
+    {"isatty", _io_BytesIO_isatty, METH_NOARGS, _io_BytesIO_isatty__doc__},
 
 static PyObject *
 _io_BytesIO_isatty_impl(bytesio *self);
@@ -148,7 +148,7 @@ PyDoc_STRVAR(_io_BytesIO_tell__doc__,
 "Current file position, an integer.");
 
 #define _IO_BYTESIO_TELL_METHODDEF    \
-    {"tell", (PyCFunction)_io_BytesIO_tell, METH_NOARGS, _io_BytesIO_tell__doc__},
+    {"tell", _io_BytesIO_tell, METH_NOARGS, _io_BytesIO_tell__doc__},
 
 static PyObject *
 _io_BytesIO_tell_impl(bytesio *self);
@@ -317,7 +317,7 @@ PyDoc_STRVAR(_io_BytesIO_readinto__doc__,
 "is set not to block and has no data to read.");
 
 #define _IO_BYTESIO_READINTO_METHODDEF    \
-    {"readinto", (PyCFunction)_io_BytesIO_readinto, METH_O, _io_BytesIO_readinto__doc__},
+    {"readinto", _io_BytesIO_readinto, METH_O, _io_BytesIO_readinto__doc__},
 
 static PyObject *
 _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer);
@@ -443,7 +443,7 @@ PyDoc_STRVAR(_io_BytesIO_write__doc__,
 "Return the number of bytes written.");
 
 #define _IO_BYTESIO_WRITE_METHODDEF    \
-    {"write", (PyCFunction)_io_BytesIO_write, METH_O, _io_BytesIO_write__doc__},
+    {"write", _io_BytesIO_write, METH_O, _io_BytesIO_write__doc__},
 
 static PyObject *
 _io_BytesIO_write_impl(bytesio *self, PyObject *b);
@@ -469,7 +469,7 @@ PyDoc_STRVAR(_io_BytesIO_writelines__doc__,
 "each element.");
 
 #define _IO_BYTESIO_WRITELINES_METHODDEF    \
-    {"writelines", (PyCFunction)_io_BytesIO_writelines, METH_O, _io_BytesIO_writelines__doc__},
+    {"writelines", _io_BytesIO_writelines, METH_O, _io_BytesIO_writelines__doc__},
 
 static PyObject *
 _io_BytesIO_writelines_impl(bytesio *self, PyObject *lines);
@@ -491,7 +491,7 @@ PyDoc_STRVAR(_io_BytesIO_close__doc__,
 "Disable all I/O operations.");
 
 #define _IO_BYTESIO_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_io_BytesIO_close, METH_NOARGS, _io_BytesIO_close__doc__},
+    {"close", _io_BytesIO_close, METH_NOARGS, _io_BytesIO_close__doc__},
 
 static PyObject *
 _io_BytesIO_close_impl(bytesio *self);
@@ -563,4 +563,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=6dbfd82f4e9d4ef3 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=84d4abe41630443c input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h
index 04870b1c890361..8ff0618b21cc0a 100644
--- a/Modules/_io/clinic/fileio.c.h
+++ b/Modules/_io/clinic/fileio.c.h
@@ -147,7 +147,7 @@ PyDoc_STRVAR(_io_FileIO_fileno__doc__,
 "Return the underlying file descriptor (an integer).");
 
 #define _IO_FILEIO_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)_io_FileIO_fileno, METH_NOARGS, _io_FileIO_fileno__doc__},
+    {"fileno", _io_FileIO_fileno, METH_NOARGS, _io_FileIO_fileno__doc__},
 
 static PyObject *
 _io_FileIO_fileno_impl(fileio *self);
@@ -165,7 +165,7 @@ PyDoc_STRVAR(_io_FileIO_readable__doc__,
 "True if file was opened in a read mode.");
 
 #define _IO_FILEIO_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io_FileIO_readable, METH_NOARGS, _io_FileIO_readable__doc__},
+    {"readable", _io_FileIO_readable, METH_NOARGS, _io_FileIO_readable__doc__},
 
 static PyObject *
 _io_FileIO_readable_impl(fileio *self);
@@ -183,7 +183,7 @@ PyDoc_STRVAR(_io_FileIO_writable__doc__,
 "True if file was opened in a write mode.");
 
 #define _IO_FILEIO_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io_FileIO_writable, METH_NOARGS, _io_FileIO_writable__doc__},
+    {"writable", _io_FileIO_writable, METH_NOARGS, _io_FileIO_writable__doc__},
 
 static PyObject *
 _io_FileIO_writable_impl(fileio *self);
@@ -201,7 +201,7 @@ PyDoc_STRVAR(_io_FileIO_seekable__doc__,
 "True if file supports random-access.");
 
 #define _IO_FILEIO_SEEKABLE_METHODDEF    \
-    {"seekable", (PyCFunction)_io_FileIO_seekable, METH_NOARGS, _io_FileIO_seekable__doc__},
+    {"seekable", _io_FileIO_seekable, METH_NOARGS, _io_FileIO_seekable__doc__},
 
 static PyObject *
 _io_FileIO_seekable_impl(fileio *self);
@@ -277,7 +277,7 @@ PyDoc_STRVAR(_io_FileIO_readall__doc__,
 "data is available (EAGAIN is returned before bytes are read) returns None.");
 
 #define _IO_FILEIO_READALL_METHODDEF    \
-    {"readall", (PyCFunction)_io_FileIO_readall, METH_NOARGS, _io_FileIO_readall__doc__},
+    {"readall", _io_FileIO_readall, METH_NOARGS, _io_FileIO_readall__doc__},
 
 static PyObject *
 _io_FileIO_readall_impl(fileio *self);
@@ -456,7 +456,7 @@ PyDoc_STRVAR(_io_FileIO_tell__doc__,
 "Can raise OSError for non seekable files.");
 
 #define _IO_FILEIO_TELL_METHODDEF    \
-    {"tell", (PyCFunction)_io_FileIO_tell, METH_NOARGS, _io_FileIO_tell__doc__},
+    {"tell", _io_FileIO_tell, METH_NOARGS, _io_FileIO_tell__doc__},
 
 static PyObject *
 _io_FileIO_tell_impl(fileio *self);
@@ -529,7 +529,7 @@ PyDoc_STRVAR(_io_FileIO_isatty__doc__,
 "True if the file is connected to a TTY device.");
 
 #define _IO_FILEIO_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)_io_FileIO_isatty, METH_NOARGS, _io_FileIO_isatty__doc__},
+    {"isatty", _io_FileIO_isatty, METH_NOARGS, _io_FileIO_isatty__doc__},
 
 static PyObject *
 _io_FileIO_isatty_impl(fileio *self);
@@ -543,4 +543,4 @@ _io_FileIO_isatty(PyObject *self, PyObject *Py_UNUSED(ignored))
 #ifndef _IO_FILEIO_TRUNCATE_METHODDEF
     #define _IO_FILEIO_TRUNCATE_METHODDEF
 #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */
-/*[clinic end generated code: output=1902fac9e39358aa input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3e3dd489cbe48d34 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h
index 402448545dfc51..2b310d6b651bbe 100644
--- a/Modules/_io/clinic/iobase.c.h
+++ b/Modules/_io/clinic/iobase.c.h
@@ -86,7 +86,7 @@ PyDoc_STRVAR(_io__IOBase_tell__doc__,
 "Return current stream position.");
 
 #define _IO__IOBASE_TELL_METHODDEF    \
-    {"tell", (PyCFunction)_io__IOBase_tell, METH_NOARGS, _io__IOBase_tell__doc__},
+    {"tell", _io__IOBase_tell, METH_NOARGS, _io__IOBase_tell__doc__},
 
 static PyObject *
 _io__IOBase_tell_impl(PyObject *self);
@@ -158,7 +158,7 @@ PyDoc_STRVAR(_io__IOBase_flush__doc__,
 "This is not implemented for read-only and non-blocking streams.");
 
 #define _IO__IOBASE_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_io__IOBase_flush, METH_NOARGS, _io__IOBase_flush__doc__},
+    {"flush", _io__IOBase_flush, METH_NOARGS, _io__IOBase_flush__doc__},
 
 static PyObject *
 _io__IOBase_flush_impl(PyObject *self);
@@ -178,7 +178,7 @@ PyDoc_STRVAR(_io__IOBase_close__doc__,
 "This method has no effect if the file is already closed.");
 
 #define _IO__IOBASE_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_io__IOBase_close, METH_NOARGS, _io__IOBase_close__doc__},
+    {"close", _io__IOBase_close, METH_NOARGS, _io__IOBase_close__doc__},
 
 static PyObject *
 _io__IOBase_close_impl(PyObject *self);
@@ -199,7 +199,7 @@ PyDoc_STRVAR(_io__IOBase_seekable__doc__,
 "This method may need to do a test seek().");
 
 #define _IO__IOBASE_SEEKABLE_METHODDEF    \
-    {"seekable", (PyCFunction)_io__IOBase_seekable, METH_NOARGS, _io__IOBase_seekable__doc__},
+    {"seekable", _io__IOBase_seekable, METH_NOARGS, _io__IOBase_seekable__doc__},
 
 static PyObject *
 _io__IOBase_seekable_impl(PyObject *self);
@@ -219,7 +219,7 @@ PyDoc_STRVAR(_io__IOBase_readable__doc__,
 "If False, read() will raise OSError.");
 
 #define _IO__IOBASE_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io__IOBase_readable, METH_NOARGS, _io__IOBase_readable__doc__},
+    {"readable", _io__IOBase_readable, METH_NOARGS, _io__IOBase_readable__doc__},
 
 static PyObject *
 _io__IOBase_readable_impl(PyObject *self);
@@ -239,7 +239,7 @@ PyDoc_STRVAR(_io__IOBase_writable__doc__,
 "If False, write() will raise OSError.");
 
 #define _IO__IOBASE_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io__IOBase_writable, METH_NOARGS, _io__IOBase_writable__doc__},
+    {"writable", _io__IOBase_writable, METH_NOARGS, _io__IOBase_writable__doc__},
 
 static PyObject *
 _io__IOBase_writable_impl(PyObject *self);
@@ -283,7 +283,7 @@ PyDoc_STRVAR(_io__IOBase_isatty__doc__,
 "Return False if it can\'t be determined.");
 
 #define _IO__IOBASE_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)_io__IOBase_isatty, METH_NOARGS, _io__IOBase_isatty__doc__},
+    {"isatty", _io__IOBase_isatty, METH_NOARGS, _io__IOBase_isatty__doc__},
 
 static PyObject *
 _io__IOBase_isatty_impl(PyObject *self);
@@ -382,7 +382,7 @@ PyDoc_STRVAR(_io__IOBase_writelines__doc__,
 "lines provided to have a line separator at the end.");
 
 #define _IO__IOBASE_WRITELINES_METHODDEF    \
-    {"writelines", (PyCFunction)_io__IOBase_writelines, METH_O, _io__IOBase_writelines__doc__},
+    {"writelines", _io__IOBase_writelines, METH_O, _io__IOBase_writelines__doc__},
 
 PyDoc_STRVAR(_io__RawIOBase_read__doc__,
 "read($self, size=-1, /)\n"
@@ -433,7 +433,7 @@ PyDoc_STRVAR(_io__RawIOBase_readall__doc__,
 "Read until EOF, using multiple read() call.");
 
 #define _IO__RAWIOBASE_READALL_METHODDEF    \
-    {"readall", (PyCFunction)_io__RawIOBase_readall, METH_NOARGS, _io__RawIOBase_readall__doc__},
+    {"readall", _io__RawIOBase_readall, METH_NOARGS, _io__RawIOBase_readall__doc__},
 
 static PyObject *
 _io__RawIOBase_readall_impl(PyObject *self);
@@ -443,4 +443,4 @@ _io__RawIOBase_readall(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return _io__RawIOBase_readall_impl(self);
 }
-/*[clinic end generated code: output=9359e74d95534bef input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6081b57d56063953 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h
index 8e8cd8df9ab8a1..d72e348d63a4e4 100644
--- a/Modules/_io/clinic/stringio.c.h
+++ b/Modules/_io/clinic/stringio.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(_io_StringIO_getvalue__doc__,
 "Retrieve the entire contents of the object.");
 
 #define _IO_STRINGIO_GETVALUE_METHODDEF    \
-    {"getvalue", (PyCFunction)_io_StringIO_getvalue, METH_NOARGS, _io_StringIO_getvalue__doc__},
+    {"getvalue", _io_StringIO_getvalue, METH_NOARGS, _io_StringIO_getvalue__doc__},
 
 static PyObject *
 _io_StringIO_getvalue_impl(stringio *self);
@@ -41,7 +41,7 @@ PyDoc_STRVAR(_io_StringIO_tell__doc__,
 "Tell the current file position.");
 
 #define _IO_STRINGIO_TELL_METHODDEF    \
-    {"tell", (PyCFunction)_io_StringIO_tell, METH_NOARGS, _io_StringIO_tell__doc__},
+    {"tell", _io_StringIO_tell, METH_NOARGS, _io_StringIO_tell__doc__},
 
 static PyObject *
 _io_StringIO_tell_impl(stringio *self);
@@ -241,7 +241,7 @@ PyDoc_STRVAR(_io_StringIO_write__doc__,
 "the length of the string.");
 
 #define _IO_STRINGIO_WRITE_METHODDEF    \
-    {"write", (PyCFunction)_io_StringIO_write, METH_O, _io_StringIO_write__doc__},
+    {"write", _io_StringIO_write, METH_O, _io_StringIO_write__doc__},
 
 static PyObject *
 _io_StringIO_write_impl(stringio *self, PyObject *obj);
@@ -270,7 +270,7 @@ PyDoc_STRVAR(_io_StringIO_close__doc__,
 "This method has no effect if the file is already closed.");
 
 #define _IO_STRINGIO_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_io_StringIO_close, METH_NOARGS, _io_StringIO_close__doc__},
+    {"close", _io_StringIO_close, METH_NOARGS, _io_StringIO_close__doc__},
 
 static PyObject *
 _io_StringIO_close_impl(stringio *self);
@@ -367,7 +367,7 @@ PyDoc_STRVAR(_io_StringIO_readable__doc__,
 "Returns True if the IO object can be read.");
 
 #define _IO_STRINGIO_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io_StringIO_readable, METH_NOARGS, _io_StringIO_readable__doc__},
+    {"readable", _io_StringIO_readable, METH_NOARGS, _io_StringIO_readable__doc__},
 
 static PyObject *
 _io_StringIO_readable_impl(stringio *self);
@@ -391,7 +391,7 @@ PyDoc_STRVAR(_io_StringIO_writable__doc__,
 "Returns True if the IO object can be written.");
 
 #define _IO_STRINGIO_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io_StringIO_writable, METH_NOARGS, _io_StringIO_writable__doc__},
+    {"writable", _io_StringIO_writable, METH_NOARGS, _io_StringIO_writable__doc__},
 
 static PyObject *
 _io_StringIO_writable_impl(stringio *self);
@@ -415,7 +415,7 @@ PyDoc_STRVAR(_io_StringIO_seekable__doc__,
 "Returns True if the IO object can be seeked.");
 
 #define _IO_STRINGIO_SEEKABLE_METHODDEF    \
-    {"seekable", (PyCFunction)_io_StringIO_seekable, METH_NOARGS, _io_StringIO_seekable__doc__},
+    {"seekable", _io_StringIO_seekable, METH_NOARGS, _io_StringIO_seekable__doc__},
 
 static PyObject *
 _io_StringIO_seekable_impl(stringio *self);
@@ -438,7 +438,7 @@ PyDoc_STRVAR(_io_StringIO___getstate____doc__,
 "\n");
 
 #define _IO_STRINGIO___GETSTATE___METHODDEF    \
-    {"__getstate__", (PyCFunction)_io_StringIO___getstate__, METH_NOARGS, _io_StringIO___getstate____doc__},
+    {"__getstate__", _io_StringIO___getstate__, METH_NOARGS, _io_StringIO___getstate____doc__},
 
 static PyObject *
 _io_StringIO___getstate___impl(stringio *self);
@@ -461,7 +461,7 @@ PyDoc_STRVAR(_io_StringIO___setstate____doc__,
 "\n");
 
 #define _IO_STRINGIO___SETSTATE___METHODDEF    \
-    {"__setstate__", (PyCFunction)_io_StringIO___setstate__, METH_O, _io_StringIO___setstate____doc__},
+    {"__setstate__", _io_StringIO___setstate__, METH_O, _io_StringIO___setstate____doc__},
 
 static PyObject *
 _io_StringIO___setstate___impl(stringio *self, PyObject *state);
@@ -483,9 +483,9 @@ _io_StringIO___setstate__(PyObject *self, PyObject *state)
 #endif
 #if defined(_IO_STRINGIO_CLOSED_GETSETDEF)
 #  undef _IO_STRINGIO_CLOSED_GETSETDEF
-#  define _IO_STRINGIO_CLOSED_GETSETDEF {"closed", (getter)_io_StringIO_closed_get, (setter)_io_StringIO_closed_set, _io_StringIO_closed_DOCSTR},
+#  define _IO_STRINGIO_CLOSED_GETSETDEF {"closed", _io_StringIO_closed_get, _io_StringIO_closed_set, _io_StringIO_closed_DOCSTR},
 #else
-#  define _IO_STRINGIO_CLOSED_GETSETDEF {"closed", (getter)_io_StringIO_closed_get, NULL, _io_StringIO_closed_DOCSTR},
+#  define _IO_STRINGIO_CLOSED_GETSETDEF {"closed", _io_StringIO_closed_get, NULL, _io_StringIO_closed_DOCSTR},
 #endif
 
 static PyObject *
@@ -508,9 +508,9 @@ _io_StringIO_closed_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_STRINGIO_LINE_BUFFERING_GETSETDEF)
 #  undef _IO_STRINGIO_LINE_BUFFERING_GETSETDEF
-#  define _IO_STRINGIO_LINE_BUFFERING_GETSETDEF {"line_buffering", (getter)_io_StringIO_line_buffering_get, (setter)_io_StringIO_line_buffering_set, _io_StringIO_line_buffering_DOCSTR},
+#  define _IO_STRINGIO_LINE_BUFFERING_GETSETDEF {"line_buffering", _io_StringIO_line_buffering_get, _io_StringIO_line_buffering_set, _io_StringIO_line_buffering_DOCSTR},
 #else
-#  define _IO_STRINGIO_LINE_BUFFERING_GETSETDEF {"line_buffering", (getter)_io_StringIO_line_buffering_get, NULL, _io_StringIO_line_buffering_DOCSTR},
+#  define _IO_STRINGIO_LINE_BUFFERING_GETSETDEF {"line_buffering", _io_StringIO_line_buffering_get, NULL, _io_StringIO_line_buffering_DOCSTR},
 #endif
 
 static PyObject *
@@ -533,9 +533,9 @@ _io_StringIO_line_buffering_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_STRINGIO_NEWLINES_GETSETDEF)
 #  undef _IO_STRINGIO_NEWLINES_GETSETDEF
-#  define _IO_STRINGIO_NEWLINES_GETSETDEF {"newlines", (getter)_io_StringIO_newlines_get, (setter)_io_StringIO_newlines_set, _io_StringIO_newlines_DOCSTR},
+#  define _IO_STRINGIO_NEWLINES_GETSETDEF {"newlines", _io_StringIO_newlines_get, _io_StringIO_newlines_set, _io_StringIO_newlines_DOCSTR},
 #else
-#  define _IO_STRINGIO_NEWLINES_GETSETDEF {"newlines", (getter)_io_StringIO_newlines_get, NULL, _io_StringIO_newlines_DOCSTR},
+#  define _IO_STRINGIO_NEWLINES_GETSETDEF {"newlines", _io_StringIO_newlines_get, NULL, _io_StringIO_newlines_DOCSTR},
 #endif
 
 static PyObject *
@@ -552,4 +552,4 @@ _io_StringIO_newlines_get(PyObject *self, void *Py_UNUSED(context))
 
     return return_value;
 }
-/*[clinic end generated code: output=5bfaaab7f41ee6b5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ca63df7a18f11eb6 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h
index 128a5ad1678f26..c0af2b7700f719 100644
--- a/Modules/_io/clinic/textio.c.h
+++ b/Modules/_io/clinic/textio.c.h
@@ -218,9 +218,9 @@ PyDoc_STRVAR(_io__TextIOBase_encoding__doc__,
 #endif
 #if defined(_IO__TEXTIOBASE_ENCODING_GETSETDEF)
 #  undef _IO__TEXTIOBASE_ENCODING_GETSETDEF
-#  define _IO__TEXTIOBASE_ENCODING_GETSETDEF {"encoding", (getter)_io__TextIOBase_encoding_get, (setter)_io__TextIOBase_encoding_set, _io__TextIOBase_encoding_DOCSTR},
+#  define _IO__TEXTIOBASE_ENCODING_GETSETDEF {"encoding", _io__TextIOBase_encoding_get, _io__TextIOBase_encoding_set, _io__TextIOBase_encoding_DOCSTR},
 #else
-#  define _IO__TEXTIOBASE_ENCODING_GETSETDEF {"encoding", (getter)_io__TextIOBase_encoding_get, NULL, _io__TextIOBase_encoding_DOCSTR},
+#  define _IO__TEXTIOBASE_ENCODING_GETSETDEF {"encoding", _io__TextIOBase_encoding_get, NULL, _io__TextIOBase_encoding_DOCSTR},
 #endif
 
 static PyObject *
@@ -248,9 +248,9 @@ PyDoc_STRVAR(_io__TextIOBase_newlines__doc__,
 #endif
 #if defined(_IO__TEXTIOBASE_NEWLINES_GETSETDEF)
 #  undef _IO__TEXTIOBASE_NEWLINES_GETSETDEF
-#  define _IO__TEXTIOBASE_NEWLINES_GETSETDEF {"newlines", (getter)_io__TextIOBase_newlines_get, (setter)_io__TextIOBase_newlines_set, _io__TextIOBase_newlines_DOCSTR},
+#  define _IO__TEXTIOBASE_NEWLINES_GETSETDEF {"newlines", _io__TextIOBase_newlines_get, _io__TextIOBase_newlines_set, _io__TextIOBase_newlines_DOCSTR},
 #else
-#  define _IO__TEXTIOBASE_NEWLINES_GETSETDEF {"newlines", (getter)_io__TextIOBase_newlines_get, NULL, _io__TextIOBase_newlines_DOCSTR},
+#  define _IO__TEXTIOBASE_NEWLINES_GETSETDEF {"newlines", _io__TextIOBase_newlines_get, NULL, _io__TextIOBase_newlines_DOCSTR},
 #endif
 
 static PyObject *
@@ -276,9 +276,9 @@ PyDoc_STRVAR(_io__TextIOBase_errors__doc__,
 #endif
 #if defined(_IO__TEXTIOBASE_ERRORS_GETSETDEF)
 #  undef _IO__TEXTIOBASE_ERRORS_GETSETDEF
-#  define _IO__TEXTIOBASE_ERRORS_GETSETDEF {"errors", (getter)_io__TextIOBase_errors_get, (setter)_io__TextIOBase_errors_set, _io__TextIOBase_errors_DOCSTR},
+#  define _IO__TEXTIOBASE_ERRORS_GETSETDEF {"errors", _io__TextIOBase_errors_get, _io__TextIOBase_errors_set, _io__TextIOBase_errors_DOCSTR},
 #else
-#  define _IO__TEXTIOBASE_ERRORS_GETSETDEF {"errors", (getter)_io__TextIOBase_errors_get, NULL, _io__TextIOBase_errors_DOCSTR},
+#  define _IO__TEXTIOBASE_ERRORS_GETSETDEF {"errors", _io__TextIOBase_errors_get, NULL, _io__TextIOBase_errors_DOCSTR},
 #endif
 
 static PyObject *
@@ -442,7 +442,7 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecoder_getstate__doc__,
 "\n");
 
 #define _IO_INCREMENTALNEWLINEDECODER_GETSTATE_METHODDEF    \
-    {"getstate", (PyCFunction)_io_IncrementalNewlineDecoder_getstate, METH_NOARGS, _io_IncrementalNewlineDecoder_getstate__doc__},
+    {"getstate", _io_IncrementalNewlineDecoder_getstate, METH_NOARGS, _io_IncrementalNewlineDecoder_getstate__doc__},
 
 static PyObject *
 _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self);
@@ -459,7 +459,7 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecoder_setstate__doc__,
 "\n");
 
 #define _IO_INCREMENTALNEWLINEDECODER_SETSTATE_METHODDEF    \
-    {"setstate", (PyCFunction)_io_IncrementalNewlineDecoder_setstate, METH_O, _io_IncrementalNewlineDecoder_setstate__doc__},
+    {"setstate", _io_IncrementalNewlineDecoder_setstate, METH_O, _io_IncrementalNewlineDecoder_setstate__doc__},
 
 static PyObject *
 _io_IncrementalNewlineDecoder_setstate_impl(nldecoder_object *self,
@@ -481,7 +481,7 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecoder_reset__doc__,
 "\n");
 
 #define _IO_INCREMENTALNEWLINEDECODER_RESET_METHODDEF    \
-    {"reset", (PyCFunction)_io_IncrementalNewlineDecoder_reset, METH_NOARGS, _io_IncrementalNewlineDecoder_reset__doc__},
+    {"reset", _io_IncrementalNewlineDecoder_reset, METH_NOARGS, _io_IncrementalNewlineDecoder_reset__doc__},
 
 static PyObject *
 _io_IncrementalNewlineDecoder_reset_impl(nldecoder_object *self);
@@ -760,7 +760,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_detach__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_DETACH_METHODDEF    \
-    {"detach", (PyCFunction)_io_TextIOWrapper_detach, METH_NOARGS, _io_TextIOWrapper_detach__doc__},
+    {"detach", _io_TextIOWrapper_detach, METH_NOARGS, _io_TextIOWrapper_detach__doc__},
 
 static PyObject *
 _io_TextIOWrapper_detach_impl(textio *self);
@@ -783,7 +783,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_write__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_WRITE_METHODDEF    \
-    {"write", (PyCFunction)_io_TextIOWrapper_write, METH_O, _io_TextIOWrapper_write__doc__},
+    {"write", _io_TextIOWrapper_write, METH_O, _io_TextIOWrapper_write__doc__},
 
 static PyObject *
 _io_TextIOWrapper_write_impl(textio *self, PyObject *text);
@@ -952,7 +952,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_tell__doc__,
 "previous stream position.");
 
 #define _IO_TEXTIOWRAPPER_TELL_METHODDEF    \
-    {"tell", (PyCFunction)_io_TextIOWrapper_tell, METH_NOARGS, _io_TextIOWrapper_tell__doc__},
+    {"tell", _io_TextIOWrapper_tell, METH_NOARGS, _io_TextIOWrapper_tell__doc__},
 
 static PyObject *
 _io_TextIOWrapper_tell_impl(textio *self);
@@ -1008,7 +1008,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_fileno__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)_io_TextIOWrapper_fileno, METH_NOARGS, _io_TextIOWrapper_fileno__doc__},
+    {"fileno", _io_TextIOWrapper_fileno, METH_NOARGS, _io_TextIOWrapper_fileno__doc__},
 
 static PyObject *
 _io_TextIOWrapper_fileno_impl(textio *self);
@@ -1031,7 +1031,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_seekable__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_SEEKABLE_METHODDEF    \
-    {"seekable", (PyCFunction)_io_TextIOWrapper_seekable, METH_NOARGS, _io_TextIOWrapper_seekable__doc__},
+    {"seekable", _io_TextIOWrapper_seekable, METH_NOARGS, _io_TextIOWrapper_seekable__doc__},
 
 static PyObject *
 _io_TextIOWrapper_seekable_impl(textio *self);
@@ -1054,7 +1054,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_readable__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io_TextIOWrapper_readable, METH_NOARGS, _io_TextIOWrapper_readable__doc__},
+    {"readable", _io_TextIOWrapper_readable, METH_NOARGS, _io_TextIOWrapper_readable__doc__},
 
 static PyObject *
 _io_TextIOWrapper_readable_impl(textio *self);
@@ -1077,7 +1077,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_writable__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io_TextIOWrapper_writable, METH_NOARGS, _io_TextIOWrapper_writable__doc__},
+    {"writable", _io_TextIOWrapper_writable, METH_NOARGS, _io_TextIOWrapper_writable__doc__},
 
 static PyObject *
 _io_TextIOWrapper_writable_impl(textio *self);
@@ -1100,7 +1100,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_isatty__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)_io_TextIOWrapper_isatty, METH_NOARGS, _io_TextIOWrapper_isatty__doc__},
+    {"isatty", _io_TextIOWrapper_isatty, METH_NOARGS, _io_TextIOWrapper_isatty__doc__},
 
 static PyObject *
 _io_TextIOWrapper_isatty_impl(textio *self);
@@ -1123,7 +1123,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_flush__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_io_TextIOWrapper_flush, METH_NOARGS, _io_TextIOWrapper_flush__doc__},
+    {"flush", _io_TextIOWrapper_flush, METH_NOARGS, _io_TextIOWrapper_flush__doc__},
 
 static PyObject *
 _io_TextIOWrapper_flush_impl(textio *self);
@@ -1146,7 +1146,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_close__doc__,
 "\n");
 
 #define _IO_TEXTIOWRAPPER_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_io_TextIOWrapper_close, METH_NOARGS, _io_TextIOWrapper_close__doc__},
+    {"close", _io_TextIOWrapper_close, METH_NOARGS, _io_TextIOWrapper_close__doc__},
 
 static PyObject *
 _io_TextIOWrapper_close_impl(textio *self);
@@ -1168,9 +1168,9 @@ _io_TextIOWrapper_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 #endif
 #if defined(_IO_TEXTIOWRAPPER_NAME_GETSETDEF)
 #  undef _IO_TEXTIOWRAPPER_NAME_GETSETDEF
-#  define _IO_TEXTIOWRAPPER_NAME_GETSETDEF {"name", (getter)_io_TextIOWrapper_name_get, (setter)_io_TextIOWrapper_name_set, _io_TextIOWrapper_name_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_NAME_GETSETDEF {"name", _io_TextIOWrapper_name_get, _io_TextIOWrapper_name_set, _io_TextIOWrapper_name_DOCSTR},
 #else
-#  define _IO_TEXTIOWRAPPER_NAME_GETSETDEF {"name", (getter)_io_TextIOWrapper_name_get, NULL, _io_TextIOWrapper_name_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_NAME_GETSETDEF {"name", _io_TextIOWrapper_name_get, NULL, _io_TextIOWrapper_name_DOCSTR},
 #endif
 
 static PyObject *
@@ -1193,9 +1193,9 @@ _io_TextIOWrapper_name_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_TEXTIOWRAPPER_CLOSED_GETSETDEF)
 #  undef _IO_TEXTIOWRAPPER_CLOSED_GETSETDEF
-#  define _IO_TEXTIOWRAPPER_CLOSED_GETSETDEF {"closed", (getter)_io_TextIOWrapper_closed_get, (setter)_io_TextIOWrapper_closed_set, _io_TextIOWrapper_closed_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_CLOSED_GETSETDEF {"closed", _io_TextIOWrapper_closed_get, _io_TextIOWrapper_closed_set, _io_TextIOWrapper_closed_DOCSTR},
 #else
-#  define _IO_TEXTIOWRAPPER_CLOSED_GETSETDEF {"closed", (getter)_io_TextIOWrapper_closed_get, NULL, _io_TextIOWrapper_closed_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_CLOSED_GETSETDEF {"closed", _io_TextIOWrapper_closed_get, NULL, _io_TextIOWrapper_closed_DOCSTR},
 #endif
 
 static PyObject *
@@ -1218,9 +1218,9 @@ _io_TextIOWrapper_closed_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF)
 #  undef _IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF
-#  define _IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF {"newlines", (getter)_io_TextIOWrapper_newlines_get, (setter)_io_TextIOWrapper_newlines_set, _io_TextIOWrapper_newlines_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF {"newlines", _io_TextIOWrapper_newlines_get, _io_TextIOWrapper_newlines_set, _io_TextIOWrapper_newlines_DOCSTR},
 #else
-#  define _IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF {"newlines", (getter)_io_TextIOWrapper_newlines_get, NULL, _io_TextIOWrapper_newlines_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF {"newlines", _io_TextIOWrapper_newlines_get, NULL, _io_TextIOWrapper_newlines_DOCSTR},
 #endif
 
 static PyObject *
@@ -1243,9 +1243,9 @@ _io_TextIOWrapper_newlines_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_TEXTIOWRAPPER_ERRORS_GETSETDEF)
 #  undef _IO_TEXTIOWRAPPER_ERRORS_GETSETDEF
-#  define _IO_TEXTIOWRAPPER_ERRORS_GETSETDEF {"errors", (getter)_io_TextIOWrapper_errors_get, (setter)_io_TextIOWrapper_errors_set, _io_TextIOWrapper_errors_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_ERRORS_GETSETDEF {"errors", _io_TextIOWrapper_errors_get, _io_TextIOWrapper_errors_set, _io_TextIOWrapper_errors_DOCSTR},
 #else
-#  define _IO_TEXTIOWRAPPER_ERRORS_GETSETDEF {"errors", (getter)_io_TextIOWrapper_errors_get, NULL, _io_TextIOWrapper_errors_DOCSTR},
+#  define _IO_TEXTIOWRAPPER_ERRORS_GETSETDEF {"errors", _io_TextIOWrapper_errors_get, NULL, _io_TextIOWrapper_errors_DOCSTR},
 #endif
 
 static PyObject *
@@ -1268,9 +1268,9 @@ _io_TextIOWrapper_errors_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF)
 #  undef _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF
-#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", (getter)_io_TextIOWrapper__CHUNK_SIZE_get, (setter)_io_TextIOWrapper__CHUNK_SIZE_set, _io_TextIOWrapper__CHUNK_SIZE_DOCSTR},
+#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", _io_TextIOWrapper__CHUNK_SIZE_get, _io_TextIOWrapper__CHUNK_SIZE_set, _io_TextIOWrapper__CHUNK_SIZE_DOCSTR},
 #else
-#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", (getter)_io_TextIOWrapper__CHUNK_SIZE_get, NULL, _io_TextIOWrapper__CHUNK_SIZE_DOCSTR},
+#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", _io_TextIOWrapper__CHUNK_SIZE_get, NULL, _io_TextIOWrapper__CHUNK_SIZE_DOCSTR},
 #endif
 
 static PyObject *
@@ -1293,9 +1293,9 @@ _io_TextIOWrapper__CHUNK_SIZE_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF)
 #  undef _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF
-#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", (getter)_io_TextIOWrapper__CHUNK_SIZE_get, (setter)_io_TextIOWrapper__CHUNK_SIZE_set, _io_TextIOWrapper__CHUNK_SIZE_DOCSTR},
+#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", _io_TextIOWrapper__CHUNK_SIZE_get, _io_TextIOWrapper__CHUNK_SIZE_set, _io_TextIOWrapper__CHUNK_SIZE_DOCSTR},
 #else
-#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", NULL, (setter)_io_TextIOWrapper__CHUNK_SIZE_set, NULL},
+#  define _IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF {"_CHUNK_SIZE", NULL, _io_TextIOWrapper__CHUNK_SIZE_set, NULL},
 #endif
 
 static int
@@ -1312,4 +1312,4 @@ _io_TextIOWrapper__CHUNK_SIZE_set(PyObject *self, PyObject *value, void *Py_UNUS
 
     return return_value;
 }
-/*[clinic end generated code: output=30404271a1151056 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=50bc041dbd9a4e78 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/winconsoleio.c.h b/Modules/_io/clinic/winconsoleio.c.h
index 7af5923b6c1747..8bd09e531f3ac8 100644
--- a/Modules/_io/clinic/winconsoleio.c.h
+++ b/Modules/_io/clinic/winconsoleio.c.h
@@ -150,7 +150,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_fileno__doc__,
 "Return the underlying file descriptor (an integer).");
 
 #define _IO__WINDOWSCONSOLEIO_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)_io__WindowsConsoleIO_fileno, METH_NOARGS, _io__WindowsConsoleIO_fileno__doc__},
+    {"fileno", _io__WindowsConsoleIO_fileno, METH_NOARGS, _io__WindowsConsoleIO_fileno__doc__},
 
 static PyObject *
 _io__WindowsConsoleIO_fileno_impl(winconsoleio *self);
@@ -172,7 +172,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_readable__doc__,
 "True if console is an input buffer.");
 
 #define _IO__WINDOWSCONSOLEIO_READABLE_METHODDEF    \
-    {"readable", (PyCFunction)_io__WindowsConsoleIO_readable, METH_NOARGS, _io__WindowsConsoleIO_readable__doc__},
+    {"readable", _io__WindowsConsoleIO_readable, METH_NOARGS, _io__WindowsConsoleIO_readable__doc__},
 
 static PyObject *
 _io__WindowsConsoleIO_readable_impl(winconsoleio *self);
@@ -194,7 +194,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_writable__doc__,
 "True if console is an output buffer.");
 
 #define _IO__WINDOWSCONSOLEIO_WRITABLE_METHODDEF    \
-    {"writable", (PyCFunction)_io__WindowsConsoleIO_writable, METH_NOARGS, _io__WindowsConsoleIO_writable__doc__},
+    {"writable", _io__WindowsConsoleIO_writable, METH_NOARGS, _io__WindowsConsoleIO_writable__doc__},
 
 static PyObject *
 _io__WindowsConsoleIO_writable_impl(winconsoleio *self);
@@ -275,7 +275,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_readall__doc__,
 "Return an empty bytes object at EOF.");
 
 #define _IO__WINDOWSCONSOLEIO_READALL_METHODDEF    \
-    {"readall", (PyCFunction)_io__WindowsConsoleIO_readall, METH_NOARGS, _io__WindowsConsoleIO_readall__doc__},
+    {"readall", _io__WindowsConsoleIO_readall, METH_NOARGS, _io__WindowsConsoleIO_readall__doc__},
 
 static PyObject *
 _io__WindowsConsoleIO_readall_impl(winconsoleio *self);
@@ -415,7 +415,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_isatty__doc__,
 "Always True.");
 
 #define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)_io__WindowsConsoleIO_isatty, METH_NOARGS, _io__WindowsConsoleIO_isatty__doc__},
+    {"isatty", _io__WindowsConsoleIO_isatty, METH_NOARGS, _io__WindowsConsoleIO_isatty__doc__},
 
 static PyObject *
 _io__WindowsConsoleIO_isatty_impl(winconsoleio *self);
@@ -463,4 +463,4 @@ _io__WindowsConsoleIO_isatty(PyObject *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=ce50bcd905f1f213 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a2a618714ecc5681 input=a9049054013a1b77]*/
diff --git a/Modules/_multiprocessing/clinic/multiprocessing.c.h b/Modules/_multiprocessing/clinic/multiprocessing.c.h
index 6d4f5c2afcfd39..192a86f8819144 100644
--- a/Modules/_multiprocessing/clinic/multiprocessing.c.h
+++ b/Modules/_multiprocessing/clinic/multiprocessing.c.h
@@ -12,7 +12,7 @@ PyDoc_STRVAR(_multiprocessing_closesocket__doc__,
 "\n");
 
 #define _MULTIPROCESSING_CLOSESOCKET_METHODDEF    \
-    {"closesocket", (PyCFunction)_multiprocessing_closesocket, METH_O, _multiprocessing_closesocket__doc__},
+    {"closesocket", _multiprocessing_closesocket, METH_O, _multiprocessing_closesocket__doc__},
 
 static PyObject *
 _multiprocessing_closesocket_impl(PyObject *module, HANDLE handle);
@@ -123,7 +123,7 @@ PyDoc_STRVAR(_multiprocessing_sem_unlink__doc__,
 "\n");
 
 #define _MULTIPROCESSING_SEM_UNLINK_METHODDEF    \
-    {"sem_unlink", (PyCFunction)_multiprocessing_sem_unlink, METH_O, _multiprocessing_sem_unlink__doc__},
+    {"sem_unlink", _multiprocessing_sem_unlink, METH_O, _multiprocessing_sem_unlink__doc__},
 
 static PyObject *
 _multiprocessing_sem_unlink_impl(PyObject *module, const char *name);
@@ -164,4 +164,4 @@ _multiprocessing_sem_unlink(PyObject *module, PyObject *arg)
 #ifndef _MULTIPROCESSING_SEND_METHODDEF
     #define _MULTIPROCESSING_SEND_METHODDEF
 #endif /* !defined(_MULTIPROCESSING_SEND_METHODDEF) */
-/*[clinic end generated code: output=73b4cb8428d816da input=a9049054013a1b77]*/
+/*[clinic end generated code: output=978917b569b6ffb0 input=a9049054013a1b77]*/
diff --git a/Modules/_multiprocessing/clinic/posixshmem.c.h b/Modules/_multiprocessing/clinic/posixshmem.c.h
index a545ff4d80f067..2d0d4f17e55274 100644
--- a/Modules/_multiprocessing/clinic/posixshmem.c.h
+++ b/Modules/_multiprocessing/clinic/posixshmem.c.h
@@ -55,7 +55,7 @@ PyDoc_STRVAR(_posixshmem_shm_unlink__doc__,
 "region.");
 
 #define _POSIXSHMEM_SHM_UNLINK_METHODDEF    \
-    {"shm_unlink", (PyCFunction)_posixshmem_shm_unlink, METH_O, _posixshmem_shm_unlink__doc__},
+    {"shm_unlink", _posixshmem_shm_unlink, METH_O, _posixshmem_shm_unlink__doc__},
 
 static PyObject *
 _posixshmem_shm_unlink_impl(PyObject *module, PyObject *path);
@@ -86,4 +86,4 @@ _posixshmem_shm_unlink(PyObject *module, PyObject *arg)
 #ifndef _POSIXSHMEM_SHM_UNLINK_METHODDEF
     #define _POSIXSHMEM_SHM_UNLINK_METHODDEF
 #endif /* !defined(_POSIXSHMEM_SHM_UNLINK_METHODDEF) */
-/*[clinic end generated code: output=74588a5abba6e36c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=69688922c0d9548a input=a9049054013a1b77]*/
diff --git a/Modules/_multiprocessing/clinic/semaphore.c.h b/Modules/_multiprocessing/clinic/semaphore.c.h
index 6b1c0092ce4816..16772a90909d8a 100644
--- a/Modules/_multiprocessing/clinic/semaphore.c.h
+++ b/Modules/_multiprocessing/clinic/semaphore.c.h
@@ -98,7 +98,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock_release__doc__,
 "Release the semaphore/lock.");
 
 #define _MULTIPROCESSING_SEMLOCK_RELEASE_METHODDEF    \
-    {"release", (PyCFunction)_multiprocessing_SemLock_release, METH_NOARGS, _multiprocessing_SemLock_release__doc__},
+    {"release", _multiprocessing_SemLock_release, METH_NOARGS, _multiprocessing_SemLock_release__doc__},
 
 static PyObject *
 _multiprocessing_SemLock_release_impl(SemLockObject *self);
@@ -206,7 +206,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock_release__doc__,
 "Release the semaphore/lock.");
 
 #define _MULTIPROCESSING_SEMLOCK_RELEASE_METHODDEF    \
-    {"release", (PyCFunction)_multiprocessing_SemLock_release, METH_NOARGS, _multiprocessing_SemLock_release__doc__},
+    {"release", _multiprocessing_SemLock_release, METH_NOARGS, _multiprocessing_SemLock_release__doc__},
 
 static PyObject *
 _multiprocessing_SemLock_release_impl(SemLockObject *self);
@@ -358,7 +358,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock__count__doc__,
 "Num of `acquire()`s minus num of `release()`s for this process.");
 
 #define _MULTIPROCESSING_SEMLOCK__COUNT_METHODDEF    \
-    {"_count", (PyCFunction)_multiprocessing_SemLock__count, METH_NOARGS, _multiprocessing_SemLock__count__doc__},
+    {"_count", _multiprocessing_SemLock__count, METH_NOARGS, _multiprocessing_SemLock__count__doc__},
 
 static PyObject *
 _multiprocessing_SemLock__count_impl(SemLockObject *self);
@@ -386,7 +386,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock__is_mine__doc__,
 "Whether the lock is owned by this thread.");
 
 #define _MULTIPROCESSING_SEMLOCK__IS_MINE_METHODDEF    \
-    {"_is_mine", (PyCFunction)_multiprocessing_SemLock__is_mine, METH_NOARGS, _multiprocessing_SemLock__is_mine__doc__},
+    {"_is_mine", _multiprocessing_SemLock__is_mine, METH_NOARGS, _multiprocessing_SemLock__is_mine__doc__},
 
 static PyObject *
 _multiprocessing_SemLock__is_mine_impl(SemLockObject *self);
@@ -408,7 +408,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock__get_value__doc__,
 "Get the value of the semaphore.");
 
 #define _MULTIPROCESSING_SEMLOCK__GET_VALUE_METHODDEF    \
-    {"_get_value", (PyCFunction)_multiprocessing_SemLock__get_value, METH_NOARGS, _multiprocessing_SemLock__get_value__doc__},
+    {"_get_value", _multiprocessing_SemLock__get_value, METH_NOARGS, _multiprocessing_SemLock__get_value__doc__},
 
 static PyObject *
 _multiprocessing_SemLock__get_value_impl(SemLockObject *self);
@@ -430,7 +430,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock__is_zero__doc__,
 "Return whether semaphore has value zero.");
 
 #define _MULTIPROCESSING_SEMLOCK__IS_ZERO_METHODDEF    \
-    {"_is_zero", (PyCFunction)_multiprocessing_SemLock__is_zero, METH_NOARGS, _multiprocessing_SemLock__is_zero__doc__},
+    {"_is_zero", _multiprocessing_SemLock__is_zero, METH_NOARGS, _multiprocessing_SemLock__is_zero__doc__},
 
 static PyObject *
 _multiprocessing_SemLock__is_zero_impl(SemLockObject *self);
@@ -452,7 +452,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock__after_fork__doc__,
 "Rezero the net acquisition count after fork().");
 
 #define _MULTIPROCESSING_SEMLOCK__AFTER_FORK_METHODDEF    \
-    {"_after_fork", (PyCFunction)_multiprocessing_SemLock__after_fork, METH_NOARGS, _multiprocessing_SemLock__after_fork__doc__},
+    {"_after_fork", _multiprocessing_SemLock__after_fork, METH_NOARGS, _multiprocessing_SemLock__after_fork__doc__},
 
 static PyObject *
 _multiprocessing_SemLock__after_fork_impl(SemLockObject *self);
@@ -474,7 +474,7 @@ PyDoc_STRVAR(_multiprocessing_SemLock___enter____doc__,
 "Enter the semaphore/lock.");
 
 #define _MULTIPROCESSING_SEMLOCK___ENTER___METHODDEF    \
-    {"__enter__", (PyCFunction)_multiprocessing_SemLock___enter__, METH_NOARGS, _multiprocessing_SemLock___enter____doc__},
+    {"__enter__", _multiprocessing_SemLock___enter__, METH_NOARGS, _multiprocessing_SemLock___enter____doc__},
 
 static PyObject *
 _multiprocessing_SemLock___enter___impl(SemLockObject *self);
@@ -582,4 +582,4 @@ _multiprocessing_SemLock___exit__(PyObject *self, PyObject *const *args, Py_ssiz
 #ifndef _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF
     #define _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF
 #endif /* !defined(_MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF) */
-/*[clinic end generated code: output=d1e349d4ee3d4bbf input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b8c140259e8ea116 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/blob.c.h b/Modules/_sqlite/clinic/blob.c.h
index 921e7cbd7ffcab..3e3e655ed2706f 100644
--- a/Modules/_sqlite/clinic/blob.c.h
+++ b/Modules/_sqlite/clinic/blob.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(blob_close__doc__,
 "Close the blob.");
 
 #define BLOB_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)blob_close, METH_NOARGS, blob_close__doc__},
+    {"close", blob_close, METH_NOARGS, blob_close__doc__},
 
 static PyObject *
 blob_close_impl(pysqlite_Blob *self);
@@ -74,7 +74,7 @@ PyDoc_STRVAR(blob_write__doc__,
 "blob will result in an exception being raised.");
 
 #define BLOB_WRITE_METHODDEF    \
-    {"write", (PyCFunction)blob_write, METH_O, blob_write__doc__},
+    {"write", blob_write, METH_O, blob_write__doc__},
 
 static PyObject *
 blob_write_impl(pysqlite_Blob *self, Py_buffer *data);
@@ -150,7 +150,7 @@ PyDoc_STRVAR(blob_tell__doc__,
 "Return the current access position for the blob.");
 
 #define BLOB_TELL_METHODDEF    \
-    {"tell", (PyCFunction)blob_tell, METH_NOARGS, blob_tell__doc__},
+    {"tell", blob_tell, METH_NOARGS, blob_tell__doc__},
 
 static PyObject *
 blob_tell_impl(pysqlite_Blob *self);
@@ -168,7 +168,7 @@ PyDoc_STRVAR(blob_enter__doc__,
 "Blob context manager enter.");
 
 #define BLOB_ENTER_METHODDEF    \
-    {"__enter__", (PyCFunction)blob_enter, METH_NOARGS, blob_enter__doc__},
+    {"__enter__", blob_enter, METH_NOARGS, blob_enter__doc__},
 
 static PyObject *
 blob_enter_impl(pysqlite_Blob *self);
@@ -211,4 +211,4 @@ blob_exit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=f03f4ba622b67ae0 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bbd981c41a4b42e3 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h
index c8e1d0b7a738d3..e06cff3343d8a2 100644
--- a/Modules/_sqlite/clinic/connection.c.h
+++ b/Modules/_sqlite/clinic/connection.c.h
@@ -372,7 +372,7 @@ PyDoc_STRVAR(pysqlite_connection_close__doc__,
 "Any pending transaction is not committed implicitly.");
 
 #define PYSQLITE_CONNECTION_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)pysqlite_connection_close, METH_NOARGS, pysqlite_connection_close__doc__},
+    {"close", pysqlite_connection_close, METH_NOARGS, pysqlite_connection_close__doc__},
 
 static PyObject *
 pysqlite_connection_close_impl(pysqlite_Connection *self);
@@ -392,7 +392,7 @@ PyDoc_STRVAR(pysqlite_connection_commit__doc__,
 "If there is no open transaction, this method is a no-op.");
 
 #define PYSQLITE_CONNECTION_COMMIT_METHODDEF    \
-    {"commit", (PyCFunction)pysqlite_connection_commit, METH_NOARGS, pysqlite_connection_commit__doc__},
+    {"commit", pysqlite_connection_commit, METH_NOARGS, pysqlite_connection_commit__doc__},
 
 static PyObject *
 pysqlite_connection_commit_impl(pysqlite_Connection *self);
@@ -412,7 +412,7 @@ PyDoc_STRVAR(pysqlite_connection_rollback__doc__,
 "If there is no open transaction, this method is a no-op.");
 
 #define PYSQLITE_CONNECTION_ROLLBACK_METHODDEF    \
-    {"rollback", (PyCFunction)pysqlite_connection_rollback, METH_NOARGS, pysqlite_connection_rollback__doc__},
+    {"rollback", pysqlite_connection_rollback, METH_NOARGS, pysqlite_connection_rollback__doc__},
 
 static PyObject *
 pysqlite_connection_rollback_impl(pysqlite_Connection *self);
@@ -1006,7 +1006,7 @@ PyDoc_STRVAR(pysqlite_connection_enable_load_extension__doc__,
 "Enable dynamic loading of SQLite extension modules.");
 
 #define PYSQLITE_CONNECTION_ENABLE_LOAD_EXTENSION_METHODDEF    \
-    {"enable_load_extension", (PyCFunction)pysqlite_connection_enable_load_extension, METH_O, pysqlite_connection_enable_load_extension__doc__},
+    {"enable_load_extension", pysqlite_connection_enable_load_extension, METH_O, pysqlite_connection_enable_load_extension__doc__},
 
 static PyObject *
 pysqlite_connection_enable_load_extension_impl(pysqlite_Connection *self,
@@ -1211,7 +1211,7 @@ PyDoc_STRVAR(pysqlite_connection_executescript__doc__,
 "Executes multiple SQL statements at once.");
 
 #define PYSQLITE_CONNECTION_EXECUTESCRIPT_METHODDEF    \
-    {"executescript", (PyCFunction)pysqlite_connection_executescript, METH_O, pysqlite_connection_executescript__doc__},
+    {"executescript", pysqlite_connection_executescript, METH_O, pysqlite_connection_executescript__doc__},
 
 static PyObject *
 pysqlite_connection_executescript_impl(pysqlite_Connection *self,
@@ -1234,7 +1234,7 @@ PyDoc_STRVAR(pysqlite_connection_interrupt__doc__,
 "Abort any pending database operation.");
 
 #define PYSQLITE_CONNECTION_INTERRUPT_METHODDEF    \
-    {"interrupt", (PyCFunction)pysqlite_connection_interrupt, METH_NOARGS, pysqlite_connection_interrupt__doc__},
+    {"interrupt", pysqlite_connection_interrupt, METH_NOARGS, pysqlite_connection_interrupt__doc__},
 
 static PyObject *
 pysqlite_connection_interrupt_impl(pysqlite_Connection *self);
@@ -1700,7 +1700,7 @@ PyDoc_STRVAR(pysqlite_connection_enter__doc__,
 "Returns itself as a convenience to the caller.");
 
 #define PYSQLITE_CONNECTION_ENTER_METHODDEF    \
-    {"__enter__", (PyCFunction)pysqlite_connection_enter, METH_NOARGS, pysqlite_connection_enter__doc__},
+    {"__enter__", pysqlite_connection_enter, METH_NOARGS, pysqlite_connection_enter__doc__},
 
 static PyObject *
 pysqlite_connection_enter_impl(pysqlite_Connection *self);
@@ -1802,7 +1802,7 @@ PyDoc_STRVAR(getlimit__doc__,
 "    The limit category to be queried.");
 
 #define GETLIMIT_METHODDEF    \
-    {"getlimit", (PyCFunction)getlimit, METH_O, getlimit__doc__},
+    {"getlimit", getlimit, METH_O, getlimit__doc__},
 
 static PyObject *
 getlimit_impl(pysqlite_Connection *self, int category);
@@ -1876,7 +1876,7 @@ PyDoc_STRVAR(getconfig__doc__,
 "    The configuration verb; one of the sqlite3.SQLITE_DBCONFIG codes.");
 
 #define GETCONFIG_METHODDEF    \
-    {"getconfig", (PyCFunction)getconfig, METH_O, getconfig__doc__},
+    {"getconfig", getconfig, METH_O, getconfig__doc__},
 
 static int
 getconfig_impl(pysqlite_Connection *self, int op);
@@ -1921,4 +1921,4 @@ getconfig(PyObject *self, PyObject *arg)
 #ifndef DESERIALIZE_METHODDEF
     #define DESERIALIZE_METHODDEF
 #endif /* !defined(DESERIALIZE_METHODDEF) */
-/*[clinic end generated code: output=2f325c2444b4bb47 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=296ab2ae590ec416 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h
index 350577f488df4b..cb665ae5494287 100644
--- a/Modules/_sqlite/clinic/cursor.c.h
+++ b/Modules/_sqlite/clinic/cursor.c.h
@@ -119,7 +119,7 @@ PyDoc_STRVAR(pysqlite_cursor_executescript__doc__,
 "Executes multiple SQL statements at once.");
 
 #define PYSQLITE_CURSOR_EXECUTESCRIPT_METHODDEF    \
-    {"executescript", (PyCFunction)pysqlite_cursor_executescript, METH_O, pysqlite_cursor_executescript__doc__},
+    {"executescript", pysqlite_cursor_executescript, METH_O, pysqlite_cursor_executescript__doc__},
 
 static PyObject *
 pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
@@ -157,7 +157,7 @@ PyDoc_STRVAR(pysqlite_cursor_fetchone__doc__,
 "Fetches one row from the resultset.");
 
 #define PYSQLITE_CURSOR_FETCHONE_METHODDEF    \
-    {"fetchone", (PyCFunction)pysqlite_cursor_fetchone, METH_NOARGS, pysqlite_cursor_fetchone__doc__},
+    {"fetchone", pysqlite_cursor_fetchone, METH_NOARGS, pysqlite_cursor_fetchone__doc__},
 
 static PyObject *
 pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self);
@@ -244,7 +244,7 @@ PyDoc_STRVAR(pysqlite_cursor_fetchall__doc__,
 "Fetches all rows from the resultset.");
 
 #define PYSQLITE_CURSOR_FETCHALL_METHODDEF    \
-    {"fetchall", (PyCFunction)pysqlite_cursor_fetchall, METH_NOARGS, pysqlite_cursor_fetchall__doc__},
+    {"fetchall", pysqlite_cursor_fetchall, METH_NOARGS, pysqlite_cursor_fetchall__doc__},
 
 static PyObject *
 pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self);
@@ -262,7 +262,7 @@ PyDoc_STRVAR(pysqlite_cursor_setinputsizes__doc__,
 "Required by DB-API. Does nothing in sqlite3.");
 
 #define PYSQLITE_CURSOR_SETINPUTSIZES_METHODDEF    \
-    {"setinputsizes", (PyCFunction)pysqlite_cursor_setinputsizes, METH_O, pysqlite_cursor_setinputsizes__doc__},
+    {"setinputsizes", pysqlite_cursor_setinputsizes, METH_O, pysqlite_cursor_setinputsizes__doc__},
 
 static PyObject *
 pysqlite_cursor_setinputsizes_impl(pysqlite_Cursor *self, PyObject *sizes);
@@ -319,7 +319,7 @@ PyDoc_STRVAR(pysqlite_cursor_close__doc__,
 "Closes the cursor.");
 
 #define PYSQLITE_CURSOR_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)pysqlite_cursor_close, METH_NOARGS, pysqlite_cursor_close__doc__},
+    {"close", pysqlite_cursor_close, METH_NOARGS, pysqlite_cursor_close__doc__},
 
 static PyObject *
 pysqlite_cursor_close_impl(pysqlite_Cursor *self);
@@ -329,4 +329,4 @@ pysqlite_cursor_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return pysqlite_cursor_close_impl((pysqlite_Cursor *)self);
 }
-/*[clinic end generated code: output=d05c7cbbc8bcab26 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=65108c2d5eb96b8d input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/module.c.h b/Modules/_sqlite/clinic/module.c.h
index 82ecd3eea1b39b..8c4a62b0c6534f 100644
--- a/Modules/_sqlite/clinic/module.c.h
+++ b/Modules/_sqlite/clinic/module.c.h
@@ -151,7 +151,7 @@ PyDoc_STRVAR(pysqlite_enable_callback_trace__doc__,
 "Enable or disable callback functions throwing errors to stderr.");
 
 #define PYSQLITE_ENABLE_CALLBACK_TRACE_METHODDEF    \
-    {"enable_callback_tracebacks", (PyCFunction)pysqlite_enable_callback_trace, METH_O, pysqlite_enable_callback_trace__doc__},
+    {"enable_callback_tracebacks", pysqlite_enable_callback_trace, METH_O, pysqlite_enable_callback_trace__doc__},
 
 static PyObject *
 pysqlite_enable_callback_trace_impl(PyObject *module, int enable);
@@ -211,4 +211,4 @@ pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=17c4e031680a5168 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2d9e3ff156ae25de input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/row.c.h b/Modules/_sqlite/clinic/row.c.h
index 068906744e445f..cf89d4f20448fa 100644
--- a/Modules/_sqlite/clinic/row.c.h
+++ b/Modules/_sqlite/clinic/row.c.h
@@ -46,7 +46,7 @@ PyDoc_STRVAR(pysqlite_row_keys__doc__,
 "Returns the keys of the row.");
 
 #define PYSQLITE_ROW_KEYS_METHODDEF    \
-    {"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS, pysqlite_row_keys__doc__},
+    {"keys", pysqlite_row_keys, METH_NOARGS, pysqlite_row_keys__doc__},
 
 static PyObject *
 pysqlite_row_keys_impl(pysqlite_Row *self);
@@ -56,4 +56,4 @@ pysqlite_row_keys(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return pysqlite_row_keys_impl((pysqlite_Row *)self);
 }
-/*[clinic end generated code: output=6c1acbb48f386468 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=06ac9c8ba2f45699 input=a9049054013a1b77]*/
diff --git a/Modules/_sre/clinic/sre.c.h b/Modules/_sre/clinic/sre.c.h
index d2f25a71495cda..daa2131d6f1ce0 100644
--- a/Modules/_sre/clinic/sre.c.h
+++ b/Modules/_sre/clinic/sre.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(_sre_getcodesize__doc__,
 "\n");
 
 #define _SRE_GETCODESIZE_METHODDEF    \
-    {"getcodesize", (PyCFunction)_sre_getcodesize, METH_NOARGS, _sre_getcodesize__doc__},
+    {"getcodesize", _sre_getcodesize, METH_NOARGS, _sre_getcodesize__doc__},
 
 static int
 _sre_getcodesize_impl(PyObject *module);
@@ -42,7 +42,7 @@ PyDoc_STRVAR(_sre_ascii_iscased__doc__,
 "\n");
 
 #define _SRE_ASCII_ISCASED_METHODDEF    \
-    {"ascii_iscased", (PyCFunction)_sre_ascii_iscased, METH_O, _sre_ascii_iscased__doc__},
+    {"ascii_iscased", _sre_ascii_iscased, METH_O, _sre_ascii_iscased__doc__},
 
 static int
 _sre_ascii_iscased_impl(PyObject *module, int character);
@@ -74,7 +74,7 @@ PyDoc_STRVAR(_sre_unicode_iscased__doc__,
 "\n");
 
 #define _SRE_UNICODE_ISCASED_METHODDEF    \
-    {"unicode_iscased", (PyCFunction)_sre_unicode_iscased, METH_O, _sre_unicode_iscased__doc__},
+    {"unicode_iscased", _sre_unicode_iscased, METH_O, _sre_unicode_iscased__doc__},
 
 static int
 _sre_unicode_iscased_impl(PyObject *module, int character);
@@ -106,7 +106,7 @@ PyDoc_STRVAR(_sre_ascii_tolower__doc__,
 "\n");
 
 #define _SRE_ASCII_TOLOWER_METHODDEF    \
-    {"ascii_tolower", (PyCFunction)_sre_ascii_tolower, METH_O, _sre_ascii_tolower__doc__},
+    {"ascii_tolower", _sre_ascii_tolower, METH_O, _sre_ascii_tolower__doc__},
 
 static int
 _sre_ascii_tolower_impl(PyObject *module, int character);
@@ -138,7 +138,7 @@ PyDoc_STRVAR(_sre_unicode_tolower__doc__,
 "\n");
 
 #define _SRE_UNICODE_TOLOWER_METHODDEF    \
-    {"unicode_tolower", (PyCFunction)_sre_unicode_tolower, METH_O, _sre_unicode_tolower__doc__},
+    {"unicode_tolower", _sre_unicode_tolower, METH_O, _sre_unicode_tolower__doc__},
 
 static int
 _sre_unicode_tolower_impl(PyObject *module, int character);
@@ -984,7 +984,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern___copy____doc__,
 "\n");
 
 #define _SRE_SRE_PATTERN___COPY___METHODDEF    \
-    {"__copy__", (PyCFunction)_sre_SRE_Pattern___copy__, METH_NOARGS, _sre_SRE_Pattern___copy____doc__},
+    {"__copy__", _sre_SRE_Pattern___copy__, METH_NOARGS, _sre_SRE_Pattern___copy____doc__},
 
 static PyObject *
 _sre_SRE_Pattern___copy___impl(PatternObject *self);
@@ -1001,7 +1001,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern___deepcopy____doc__,
 "\n");
 
 #define _SRE_SRE_PATTERN___DEEPCOPY___METHODDEF    \
-    {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_O, _sre_SRE_Pattern___deepcopy____doc__},
+    {"__deepcopy__", _sre_SRE_Pattern___deepcopy__, METH_O, _sre_SRE_Pattern___deepcopy____doc__},
 
 static PyObject *
 _sre_SRE_Pattern___deepcopy___impl(PatternObject *self, PyObject *memo);
@@ -1491,7 +1491,7 @@ PyDoc_STRVAR(_sre_SRE_Match___copy____doc__,
 "\n");
 
 #define _SRE_SRE_MATCH___COPY___METHODDEF    \
-    {"__copy__", (PyCFunction)_sre_SRE_Match___copy__, METH_NOARGS, _sre_SRE_Match___copy____doc__},
+    {"__copy__", _sre_SRE_Match___copy__, METH_NOARGS, _sre_SRE_Match___copy____doc__},
 
 static PyObject *
 _sre_SRE_Match___copy___impl(MatchObject *self);
@@ -1508,7 +1508,7 @@ PyDoc_STRVAR(_sre_SRE_Match___deepcopy____doc__,
 "\n");
 
 #define _SRE_SRE_MATCH___DEEPCOPY___METHODDEF    \
-    {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_O, _sre_SRE_Match___deepcopy____doc__},
+    {"__deepcopy__", _sre_SRE_Match___deepcopy__, METH_O, _sre_SRE_Match___deepcopy____doc__},
 
 static PyObject *
 _sre_SRE_Match___deepcopy___impl(MatchObject *self, PyObject *memo);
@@ -1568,4 +1568,4 @@ _sre_SRE_Scanner_search(PyObject *self, PyTypeObject *cls, PyObject *const *args
 #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=bbf42e1de3bdd3ae input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f8d4fa20aa69b463 input=a9049054013a1b77]*/
diff --git a/Modules/_ssl/clinic/cert.c.h b/Modules/_ssl/clinic/cert.c.h
index 7e05772e323614..f4c58567e59d9d 100644
--- a/Modules/_ssl/clinic/cert.c.h
+++ b/Modules/_ssl/clinic/cert.c.h
@@ -79,7 +79,7 @@ PyDoc_STRVAR(_ssl_Certificate_get_info__doc__,
 "\n");
 
 #define _SSL_CERTIFICATE_GET_INFO_METHODDEF    \
-    {"get_info", (PyCFunction)_ssl_Certificate_get_info, METH_NOARGS, _ssl_Certificate_get_info__doc__},
+    {"get_info", _ssl_Certificate_get_info, METH_NOARGS, _ssl_Certificate_get_info__doc__},
 
 static PyObject *
 _ssl_Certificate_get_info_impl(PySSLCertificate *self);
@@ -89,4 +89,4 @@ _ssl_Certificate_get_info(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return _ssl_Certificate_get_info_impl((PySSLCertificate *)self);
 }
-/*[clinic end generated code: output=bab2dba7dbc1523c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a1188d37625a51f9 input=a9049054013a1b77]*/
diff --git a/Modules/_testcapi/clinic/exceptions.c.h b/Modules/_testcapi/clinic/exceptions.c.h
index cac5d288f437b7..86d7d4f223232d 100644
--- a/Modules/_testcapi/clinic/exceptions.c.h
+++ b/Modules/_testcapi/clinic/exceptions.c.h
@@ -14,7 +14,7 @@ PyDoc_STRVAR(_testcapi_err_set_raised__doc__,
 "\n");
 
 #define _TESTCAPI_ERR_SET_RAISED_METHODDEF    \
-    {"err_set_raised", (PyCFunction)_testcapi_err_set_raised, METH_O, _testcapi_err_set_raised__doc__},
+    {"err_set_raised", _testcapi_err_set_raised, METH_O, _testcapi_err_set_raised__doc__},
 
 PyDoc_STRVAR(_testcapi_exception_print__doc__,
 "exception_print($module, exception, legacy=False, /)\n"
@@ -318,7 +318,7 @@ PyDoc_STRVAR(_testcapi_raise_memoryerror__doc__,
 "\n");
 
 #define _TESTCAPI_RAISE_MEMORYERROR_METHODDEF    \
-    {"raise_memoryerror", (PyCFunction)_testcapi_raise_memoryerror, METH_NOARGS, _testcapi_raise_memoryerror__doc__},
+    {"raise_memoryerror", _testcapi_raise_memoryerror, METH_NOARGS, _testcapi_raise_memoryerror__doc__},
 
 static PyObject *
 _testcapi_raise_memoryerror_impl(PyObject *module);
@@ -396,7 +396,7 @@ PyDoc_STRVAR(_testcapi_set_exception__doc__,
 "\n");
 
 #define _TESTCAPI_SET_EXCEPTION_METHODDEF    \
-    {"set_exception", (PyCFunction)_testcapi_set_exception, METH_O, _testcapi_set_exception__doc__},
+    {"set_exception", _testcapi_set_exception, METH_O, _testcapi_set_exception__doc__},
 
 PyDoc_STRVAR(_testcapi_traceback_print__doc__,
 "traceback_print($module, traceback, file, /)\n"
@@ -459,4 +459,4 @@ _testcapi_unstable_exc_prep_reraise_star(PyObject *module, PyObject *const *args
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=357caea020348789 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3367b334e9ebc36d input=a9049054013a1b77]*/
diff --git a/Modules/_testcapi/clinic/file.c.h b/Modules/_testcapi/clinic/file.c.h
index 6efb6b47353443..01b0618e941e5d 100644
--- a/Modules/_testcapi/clinic/file.c.h
+++ b/Modules/_testcapi/clinic/file.c.h
@@ -10,7 +10,7 @@ PyDoc_STRVAR(_testcapi_pyfile_newstdprinter__doc__,
 "\n");
 
 #define _TESTCAPI_PYFILE_NEWSTDPRINTER_METHODDEF    \
-    {"pyfile_newstdprinter", (PyCFunction)_testcapi_pyfile_newstdprinter, METH_O, _testcapi_pyfile_newstdprinter__doc__},
+    {"pyfile_newstdprinter", _testcapi_pyfile_newstdprinter, METH_O, _testcapi_pyfile_newstdprinter__doc__},
 
 static PyObject *
 _testcapi_pyfile_newstdprinter_impl(PyObject *module, int fd);
@@ -61,4 +61,4 @@ _testcapi_py_fopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=e943bbd7f181d079 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9a88e7c10f6c58d5 input=a9049054013a1b77]*/
diff --git a/Modules/_testcapi/clinic/long.c.h b/Modules/_testcapi/clinic/long.c.h
index 767c671abb8eae..3e43c9959e8c2e 100644
--- a/Modules/_testcapi/clinic/long.c.h
+++ b/Modules/_testcapi/clinic/long.c.h
@@ -8,5 +8,5 @@ PyDoc_STRVAR(_testcapi_call_long_compact_api__doc__,
 "\n");
 
 #define _TESTCAPI_CALL_LONG_COMPACT_API_METHODDEF    \
-    {"call_long_compact_api", (PyCFunction)_testcapi_call_long_compact_api, METH_O, _testcapi_call_long_compact_api__doc__},
-/*[clinic end generated code: output=0ddcbc6ea06e5e21 input=a9049054013a1b77]*/
+    {"call_long_compact_api", _testcapi_call_long_compact_api, METH_O, _testcapi_call_long_compact_api__doc__},
+/*[clinic end generated code: output=45f2a3cf1aa74fbb input=a9049054013a1b77]*/
diff --git a/Modules/_testcapi/clinic/vectorcall.c.h b/Modules/_testcapi/clinic/vectorcall.c.h
index c6049a438dc8fc..a110e24c0497cb 100644
--- a/Modules/_testcapi/clinic/vectorcall.c.h
+++ b/Modules/_testcapi/clinic/vectorcall.c.h
@@ -111,7 +111,7 @@ PyDoc_STRVAR(_testcapi_VectorCallClass_set_vectorcall__doc__,
 "Set self\'s vectorcall function for `type` to one that returns \"vectorcall\"");
 
 #define _TESTCAPI_VECTORCALLCLASS_SET_VECTORCALL_METHODDEF    \
-    {"set_vectorcall", (PyCFunction)_testcapi_VectorCallClass_set_vectorcall, METH_O, _testcapi_VectorCallClass_set_vectorcall__doc__},
+    {"set_vectorcall", _testcapi_VectorCallClass_set_vectorcall, METH_O, _testcapi_VectorCallClass_set_vectorcall__doc__},
 
 static PyObject *
 _testcapi_VectorCallClass_set_vectorcall_impl(PyObject *self,
@@ -180,7 +180,7 @@ PyDoc_STRVAR(_testcapi_has_vectorcall_flag__doc__,
 "Return true iff Py_TPFLAGS_HAVE_VECTORCALL is set on the class.");
 
 #define _TESTCAPI_HAS_VECTORCALL_FLAG_METHODDEF    \
-    {"has_vectorcall_flag", (PyCFunction)_testcapi_has_vectorcall_flag, METH_O, _testcapi_has_vectorcall_flag__doc__},
+    {"has_vectorcall_flag", _testcapi_has_vectorcall_flag, METH_O, _testcapi_has_vectorcall_flag__doc__},
 
 static int
 _testcapi_has_vectorcall_flag_impl(PyObject *module, PyTypeObject *type);
@@ -206,4 +206,4 @@ _testcapi_has_vectorcall_flag(PyObject *module, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=210ae67caab177ba input=a9049054013a1b77]*/
+/*[clinic end generated code: output=02ce0c764988bb3e input=a9049054013a1b77]*/
diff --git a/Modules/_testlimitedcapi/clinic/file.c.h b/Modules/_testlimitedcapi/clinic/file.c.h
index 663619eead2a3a..a8dd9db9d876c6 100644
--- a/Modules/_testlimitedcapi/clinic/file.c.h
+++ b/Modules/_testlimitedcapi/clinic/file.c.h
@@ -77,5 +77,5 @@ PyDoc_STRVAR(_testcapi_pyobject_asfiledescriptor__doc__,
 "\n");
 
 #define _TESTCAPI_PYOBJECT_ASFILEDESCRIPTOR_METHODDEF    \
-    {"pyobject_asfiledescriptor", (PyCFunction)_testcapi_pyobject_asfiledescriptor, METH_O, _testcapi_pyobject_asfiledescriptor__doc__},
-/*[clinic end generated code: output=ea572aaaa01aec7b input=a9049054013a1b77]*/
+    {"pyobject_asfiledescriptor", _testcapi_pyobject_asfiledescriptor, METH_O, _testcapi_pyobject_asfiledescriptor__doc__},
+/*[clinic end generated code: output=fb0d76fd0f7d8035 input=a9049054013a1b77]*/
diff --git a/Modules/_testlimitedcapi/clinic/long.c.h b/Modules/_testlimitedcapi/clinic/long.c.h
index ebaeb53921a82f..c98e3b1151cef1 100644
--- a/Modules/_testlimitedcapi/clinic/long.c.h
+++ b/Modules/_testlimitedcapi/clinic/long.c.h
@@ -8,7 +8,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_long_api__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_TEST_LONG_API_METHODDEF    \
-    {"test_long_api", (PyCFunction)_testlimitedcapi_test_long_api, METH_NOARGS, _testlimitedcapi_test_long_api__doc__},
+    {"test_long_api", _testlimitedcapi_test_long_api, METH_NOARGS, _testlimitedcapi_test_long_api__doc__},
 
 static PyObject *
 _testlimitedcapi_test_long_api_impl(PyObject *module);
@@ -25,7 +25,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_longlong_api__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_TEST_LONGLONG_API_METHODDEF    \
-    {"test_longlong_api", (PyCFunction)_testlimitedcapi_test_longlong_api, METH_NOARGS, _testlimitedcapi_test_longlong_api__doc__},
+    {"test_longlong_api", _testlimitedcapi_test_longlong_api, METH_NOARGS, _testlimitedcapi_test_longlong_api__doc__},
 
 static PyObject *
 _testlimitedcapi_test_longlong_api_impl(PyObject *module);
@@ -46,7 +46,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_long_and_overflow__doc__,
 "This test will concentrate on proper handling of overflow.");
 
 #define _TESTLIMITEDCAPI_TEST_LONG_AND_OVERFLOW_METHODDEF    \
-    {"test_long_and_overflow", (PyCFunction)_testlimitedcapi_test_long_and_overflow, METH_NOARGS, _testlimitedcapi_test_long_and_overflow__doc__},
+    {"test_long_and_overflow", _testlimitedcapi_test_long_and_overflow, METH_NOARGS, _testlimitedcapi_test_long_and_overflow__doc__},
 
 static PyObject *
 _testlimitedcapi_test_long_and_overflow_impl(PyObject *module);
@@ -67,7 +67,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_long_long_and_overflow__doc__,
 "This test will concentrate on proper handling of overflow.");
 
 #define _TESTLIMITEDCAPI_TEST_LONG_LONG_AND_OVERFLOW_METHODDEF    \
-    {"test_long_long_and_overflow", (PyCFunction)_testlimitedcapi_test_long_long_and_overflow, METH_NOARGS, _testlimitedcapi_test_long_long_and_overflow__doc__},
+    {"test_long_long_and_overflow", _testlimitedcapi_test_long_long_and_overflow, METH_NOARGS, _testlimitedcapi_test_long_long_and_overflow__doc__},
 
 static PyObject *
 _testlimitedcapi_test_long_long_and_overflow_impl(PyObject *module);
@@ -88,7 +88,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_long_as_size_t__doc__,
 "It should be extended to test overflow handling.");
 
 #define _TESTLIMITEDCAPI_TEST_LONG_AS_SIZE_T_METHODDEF    \
-    {"test_long_as_size_t", (PyCFunction)_testlimitedcapi_test_long_as_size_t, METH_NOARGS, _testlimitedcapi_test_long_as_size_t__doc__},
+    {"test_long_as_size_t", _testlimitedcapi_test_long_as_size_t, METH_NOARGS, _testlimitedcapi_test_long_as_size_t__doc__},
 
 static PyObject *
 _testlimitedcapi_test_long_as_size_t_impl(PyObject *module);
@@ -105,7 +105,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_long_as_unsigned_long_long_mask__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_TEST_LONG_AS_UNSIGNED_LONG_LONG_MASK_METHODDEF    \
-    {"test_long_as_unsigned_long_long_mask", (PyCFunction)_testlimitedcapi_test_long_as_unsigned_long_long_mask, METH_NOARGS, _testlimitedcapi_test_long_as_unsigned_long_long_mask__doc__},
+    {"test_long_as_unsigned_long_long_mask", _testlimitedcapi_test_long_as_unsigned_long_long_mask, METH_NOARGS, _testlimitedcapi_test_long_as_unsigned_long_long_mask__doc__},
 
 static PyObject *
 _testlimitedcapi_test_long_as_unsigned_long_long_mask_impl(PyObject *module);
@@ -122,7 +122,7 @@ PyDoc_STRVAR(_testlimitedcapi_test_long_as_double__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_TEST_LONG_AS_DOUBLE_METHODDEF    \
-    {"test_long_as_double", (PyCFunction)_testlimitedcapi_test_long_as_double, METH_NOARGS, _testlimitedcapi_test_long_as_double__doc__},
+    {"test_long_as_double", _testlimitedcapi_test_long_as_double, METH_NOARGS, _testlimitedcapi_test_long_as_double__doc__},
 
 static PyObject *
 _testlimitedcapi_test_long_as_double_impl(PyObject *module);
@@ -139,5 +139,5 @@ PyDoc_STRVAR(_testlimitedcapi_PyLong_AsInt__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_PYLONG_ASINT_METHODDEF    \
-    {"PyLong_AsInt", (PyCFunction)_testlimitedcapi_PyLong_AsInt, METH_O, _testlimitedcapi_PyLong_AsInt__doc__},
-/*[clinic end generated code: output=bc52b73c599f96c2 input=a9049054013a1b77]*/
+    {"PyLong_AsInt", _testlimitedcapi_PyLong_AsInt, METH_O, _testlimitedcapi_PyLong_AsInt__doc__},
+/*[clinic end generated code: output=b2d9fb30e9c058f5 input=a9049054013a1b77]*/
diff --git a/Modules/_testlimitedcapi/clinic/vectorcall_limited.c.h b/Modules/_testlimitedcapi/clinic/vectorcall_limited.c.h
index 6631a9c42deab0..4babbdd592b970 100644
--- a/Modules/_testlimitedcapi/clinic/vectorcall_limited.c.h
+++ b/Modules/_testlimitedcapi/clinic/vectorcall_limited.c.h
@@ -8,7 +8,7 @@ PyDoc_STRVAR(_testlimitedcapi_call_vectorcall__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_CALL_VECTORCALL_METHODDEF    \
-    {"call_vectorcall", (PyCFunction)_testlimitedcapi_call_vectorcall, METH_O, _testlimitedcapi_call_vectorcall__doc__},
+    {"call_vectorcall", _testlimitedcapi_call_vectorcall, METH_O, _testlimitedcapi_call_vectorcall__doc__},
 
 PyDoc_STRVAR(_testlimitedcapi_call_vectorcall_method__doc__,
 "call_vectorcall_method($module, callable, /)\n"
@@ -16,5 +16,5 @@ PyDoc_STRVAR(_testlimitedcapi_call_vectorcall_method__doc__,
 "\n");
 
 #define _TESTLIMITEDCAPI_CALL_VECTORCALL_METHOD_METHODDEF    \
-    {"call_vectorcall_method", (PyCFunction)_testlimitedcapi_call_vectorcall_method, METH_O, _testlimitedcapi_call_vectorcall_method__doc__},
-/*[clinic end generated code: output=5976b9b360e1ff30 input=a9049054013a1b77]*/
+    {"call_vectorcall_method", _testlimitedcapi_call_vectorcall_method, METH_O, _testlimitedcapi_call_vectorcall_method__doc__},
+/*[clinic end generated code: output=7d87830093608031 input=a9049054013a1b77]*/
diff --git a/Modules/cjkcodecs/clinic/multibytecodec.c.h b/Modules/cjkcodecs/clinic/multibytecodec.c.h
index b3663180d726e5..41598160247dff 100644
--- a/Modules/cjkcodecs/clinic/multibytecodec.c.h
+++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h
@@ -268,7 +268,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_getstate__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALENCODER_GETSTATE_METHODDEF    \
-    {"getstate", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_getstate, METH_NOARGS, _multibytecodec_MultibyteIncrementalEncoder_getstate__doc__},
+    {"getstate", _multibytecodec_MultibyteIncrementalEncoder_getstate, METH_NOARGS, _multibytecodec_MultibyteIncrementalEncoder_getstate__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_getstate_impl(MultibyteIncrementalEncoderObject *self);
@@ -285,7 +285,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_setstate__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALENCODER_SETSTATE_METHODDEF    \
-    {"setstate", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_setstate, METH_O, _multibytecodec_MultibyteIncrementalEncoder_setstate__doc__},
+    {"setstate", _multibytecodec_MultibyteIncrementalEncoder_setstate, METH_O, _multibytecodec_MultibyteIncrementalEncoder_setstate__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_setstate_impl(MultibyteIncrementalEncoderObject *self,
@@ -314,7 +314,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_reset__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALENCODER_RESET_METHODDEF    \
-    {"reset", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_reset, METH_NOARGS, _multibytecodec_MultibyteIncrementalEncoder_reset__doc__},
+    {"reset", _multibytecodec_MultibyteIncrementalEncoder_reset, METH_NOARGS, _multibytecodec_MultibyteIncrementalEncoder_reset__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_reset_impl(MultibyteIncrementalEncoderObject *self);
@@ -407,7 +407,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_getstate__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALDECODER_GETSTATE_METHODDEF    \
-    {"getstate", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_getstate, METH_NOARGS, _multibytecodec_MultibyteIncrementalDecoder_getstate__doc__},
+    {"getstate", _multibytecodec_MultibyteIncrementalDecoder_getstate, METH_NOARGS, _multibytecodec_MultibyteIncrementalDecoder_getstate__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_getstate_impl(MultibyteIncrementalDecoderObject *self);
@@ -424,7 +424,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_setstate__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALDECODER_SETSTATE_METHODDEF    \
-    {"setstate", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_setstate, METH_O, _multibytecodec_MultibyteIncrementalDecoder_setstate__doc__},
+    {"setstate", _multibytecodec_MultibyteIncrementalDecoder_setstate, METH_O, _multibytecodec_MultibyteIncrementalDecoder_setstate__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_setstate_impl(MultibyteIncrementalDecoderObject *self,
@@ -453,7 +453,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_reset__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALDECODER_RESET_METHODDEF    \
-    {"reset", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_reset, METH_NOARGS, _multibytecodec_MultibyteIncrementalDecoder_reset__doc__},
+    {"reset", _multibytecodec_MultibyteIncrementalDecoder_reset, METH_NOARGS, _multibytecodec_MultibyteIncrementalDecoder_reset__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_reset_impl(MultibyteIncrementalDecoderObject *self);
@@ -566,7 +566,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteStreamReader_reset__doc__,
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTESTREAMREADER_RESET_METHODDEF    \
-    {"reset", (PyCFunction)_multibytecodec_MultibyteStreamReader_reset, METH_NOARGS, _multibytecodec_MultibyteStreamReader_reset__doc__},
+    {"reset", _multibytecodec_MultibyteStreamReader_reset, METH_NOARGS, _multibytecodec_MultibyteStreamReader_reset__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteStreamReader_reset_impl(MultibyteStreamReaderObject *self);
@@ -695,5 +695,5 @@ PyDoc_STRVAR(_multibytecodec___create_codec__doc__,
 "\n");
 
 #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF    \
-    {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
-/*[clinic end generated code: output=014f4f6bb9d29594 input=a9049054013a1b77]*/
+    {"__create_codec", _multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
+/*[clinic end generated code: output=5f4d4f2aa29b79b1 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_abc.c.h b/Modules/clinic/_abc.c.h
index 04681fa2206a2a..3f8a3ca34cb690 100644
--- a/Modules/clinic/_abc.c.h
+++ b/Modules/clinic/_abc.c.h
@@ -13,7 +13,7 @@ PyDoc_STRVAR(_abc__reset_registry__doc__,
 "Should be only used by refleak.py");
 
 #define _ABC__RESET_REGISTRY_METHODDEF    \
-    {"_reset_registry", (PyCFunction)_abc__reset_registry, METH_O, _abc__reset_registry__doc__},
+    {"_reset_registry", _abc__reset_registry, METH_O, _abc__reset_registry__doc__},
 
 PyDoc_STRVAR(_abc__reset_caches__doc__,
 "_reset_caches($module, self, /)\n"
@@ -24,7 +24,7 @@ PyDoc_STRVAR(_abc__reset_caches__doc__,
 "Should be only used by refleak.py");
 
 #define _ABC__RESET_CACHES_METHODDEF    \
-    {"_reset_caches", (PyCFunction)_abc__reset_caches, METH_O, _abc__reset_caches__doc__},
+    {"_reset_caches", _abc__reset_caches, METH_O, _abc__reset_caches__doc__},
 
 PyDoc_STRVAR(_abc__get_dump__doc__,
 "_get_dump($module, self, /)\n"
@@ -37,7 +37,7 @@ PyDoc_STRVAR(_abc__get_dump__doc__,
 "instead use ABC._dump_registry() for a nice repr.");
 
 #define _ABC__GET_DUMP_METHODDEF    \
-    {"_get_dump", (PyCFunction)_abc__get_dump, METH_O, _abc__get_dump__doc__},
+    {"_get_dump", _abc__get_dump, METH_O, _abc__get_dump__doc__},
 
 PyDoc_STRVAR(_abc__abc_init__doc__,
 "_abc_init($module, self, /)\n"
@@ -46,7 +46,7 @@ PyDoc_STRVAR(_abc__abc_init__doc__,
 "Internal ABC helper for class set-up. Should be never used outside abc module.");
 
 #define _ABC__ABC_INIT_METHODDEF    \
-    {"_abc_init", (PyCFunction)_abc__abc_init, METH_O, _abc__abc_init__doc__},
+    {"_abc_init", _abc__abc_init, METH_O, _abc__abc_init__doc__},
 
 PyDoc_STRVAR(_abc__abc_register__doc__,
 "_abc_register($module, self, subclass, /)\n"
@@ -151,7 +151,7 @@ PyDoc_STRVAR(_abc_get_cache_token__doc__,
 "with every call to register() on any ABC.");
 
 #define _ABC_GET_CACHE_TOKEN_METHODDEF    \
-    {"get_cache_token", (PyCFunction)_abc_get_cache_token, METH_NOARGS, _abc_get_cache_token__doc__},
+    {"get_cache_token", _abc_get_cache_token, METH_NOARGS, _abc_get_cache_token__doc__},
 
 static PyObject *
 _abc_get_cache_token_impl(PyObject *module);
@@ -161,4 +161,4 @@ _abc_get_cache_token(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return _abc_get_cache_token_impl(module);
 }
-/*[clinic end generated code: output=1989b6716c950e17 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a180fd3274c1a4f7 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h
index 66953d74213b66..be3f8bc71eb7d1 100644
--- a/Modules/clinic/_asynciomodule.c.h
+++ b/Modules/clinic/_asynciomodule.c.h
@@ -93,7 +93,7 @@ PyDoc_STRVAR(_asyncio_Future_result__doc__,
 "the future is done and has an exception set, this exception is raised.");
 
 #define _ASYNCIO_FUTURE_RESULT_METHODDEF    \
-    {"result", (PyCFunction)_asyncio_Future_result, METH_NOARGS, _asyncio_Future_result__doc__},
+    {"result", _asyncio_Future_result, METH_NOARGS, _asyncio_Future_result__doc__},
 
 static PyObject *
 _asyncio_Future_result_impl(FutureObj *self);
@@ -442,7 +442,7 @@ PyDoc_STRVAR(_asyncio_Future_cancelled__doc__,
 "Return True if the future was cancelled.");
 
 #define _ASYNCIO_FUTURE_CANCELLED_METHODDEF    \
-    {"cancelled", (PyCFunction)_asyncio_Future_cancelled, METH_NOARGS, _asyncio_Future_cancelled__doc__},
+    {"cancelled", _asyncio_Future_cancelled, METH_NOARGS, _asyncio_Future_cancelled__doc__},
 
 static PyObject *
 _asyncio_Future_cancelled_impl(FutureObj *self);
@@ -469,7 +469,7 @@ PyDoc_STRVAR(_asyncio_Future_done__doc__,
 "future was cancelled.");
 
 #define _ASYNCIO_FUTURE_DONE_METHODDEF    \
-    {"done", (PyCFunction)_asyncio_Future_done, METH_NOARGS, _asyncio_Future_done__doc__},
+    {"done", _asyncio_Future_done, METH_NOARGS, _asyncio_Future_done__doc__},
 
 static PyObject *
 _asyncio_Future_done_impl(FutureObj *self);
@@ -520,9 +520,9 @@ _asyncio_Future_get_loop(PyObject *self, PyTypeObject *cls, PyObject *const *arg
 #endif
 #if defined(_ASYNCIO_FUTURE__ASYNCIO_AWAITED_BY_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__ASYNCIO_AWAITED_BY_GETSETDEF
-#  define _ASYNCIO_FUTURE__ASYNCIO_AWAITED_BY_GETSETDEF {"_asyncio_awaited_by", (getter)_asyncio_Future__asyncio_awaited_by_get, (setter)_asyncio_Future__asyncio_awaited_by_set, _asyncio_Future__asyncio_awaited_by_DOCSTR},
+#  define _ASYNCIO_FUTURE__ASYNCIO_AWAITED_BY_GETSETDEF {"_asyncio_awaited_by", _asyncio_Future__asyncio_awaited_by_get, _asyncio_Future__asyncio_awaited_by_set, _asyncio_Future__asyncio_awaited_by_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__ASYNCIO_AWAITED_BY_GETSETDEF {"_asyncio_awaited_by", (getter)_asyncio_Future__asyncio_awaited_by_get, NULL, _asyncio_Future__asyncio_awaited_by_DOCSTR},
+#  define _ASYNCIO_FUTURE__ASYNCIO_AWAITED_BY_GETSETDEF {"_asyncio_awaited_by", _asyncio_Future__asyncio_awaited_by_get, NULL, _asyncio_Future__asyncio_awaited_by_DOCSTR},
 #endif
 
 static PyObject *
@@ -545,9 +545,9 @@ _asyncio_Future__asyncio_awaited_by_get(PyObject *self, void *Py_UNUSED(context)
 #endif
 #if defined(_ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF
-#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", (getter)_asyncio_Future__asyncio_future_blocking_get, (setter)_asyncio_Future__asyncio_future_blocking_set, _asyncio_Future__asyncio_future_blocking_DOCSTR},
+#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", _asyncio_Future__asyncio_future_blocking_get, _asyncio_Future__asyncio_future_blocking_set, _asyncio_Future__asyncio_future_blocking_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", (getter)_asyncio_Future__asyncio_future_blocking_get, NULL, _asyncio_Future__asyncio_future_blocking_DOCSTR},
+#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", _asyncio_Future__asyncio_future_blocking_get, NULL, _asyncio_Future__asyncio_future_blocking_DOCSTR},
 #endif
 
 static PyObject *
@@ -570,9 +570,9 @@ _asyncio_Future__asyncio_future_blocking_get(PyObject *self, void *Py_UNUSED(con
 #endif
 #if defined(_ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF
-#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", (getter)_asyncio_Future__asyncio_future_blocking_get, (setter)_asyncio_Future__asyncio_future_blocking_set, _asyncio_Future__asyncio_future_blocking_DOCSTR},
+#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", _asyncio_Future__asyncio_future_blocking_get, _asyncio_Future__asyncio_future_blocking_set, _asyncio_Future__asyncio_future_blocking_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", NULL, (setter)_asyncio_Future__asyncio_future_blocking_set, NULL},
+#  define _ASYNCIO_FUTURE__ASYNCIO_FUTURE_BLOCKING_GETSETDEF {"_asyncio_future_blocking", NULL, _asyncio_Future__asyncio_future_blocking_set, NULL},
 #endif
 
 static int
@@ -596,9 +596,9 @@ _asyncio_Future__asyncio_future_blocking_set(PyObject *self, PyObject *value, vo
 #endif
 #if defined(_ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF
-#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", (getter)_asyncio_Future__log_traceback_get, (setter)_asyncio_Future__log_traceback_set, _asyncio_Future__log_traceback_DOCSTR},
+#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", _asyncio_Future__log_traceback_get, _asyncio_Future__log_traceback_set, _asyncio_Future__log_traceback_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", (getter)_asyncio_Future__log_traceback_get, NULL, _asyncio_Future__log_traceback_DOCSTR},
+#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", _asyncio_Future__log_traceback_get, NULL, _asyncio_Future__log_traceback_DOCSTR},
 #endif
 
 static PyObject *
@@ -621,9 +621,9 @@ _asyncio_Future__log_traceback_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF
-#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", (getter)_asyncio_Future__log_traceback_get, (setter)_asyncio_Future__log_traceback_set, _asyncio_Future__log_traceback_DOCSTR},
+#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", _asyncio_Future__log_traceback_get, _asyncio_Future__log_traceback_set, _asyncio_Future__log_traceback_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", NULL, (setter)_asyncio_Future__log_traceback_set, NULL},
+#  define _ASYNCIO_FUTURE__LOG_TRACEBACK_GETSETDEF {"_log_traceback", NULL, _asyncio_Future__log_traceback_set, NULL},
 #endif
 
 static int
@@ -646,9 +646,9 @@ _asyncio_Future__log_traceback_set(PyObject *self, PyObject *value, void *Py_UNU
 #endif
 #if defined(_ASYNCIO_FUTURE__LOOP_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__LOOP_GETSETDEF
-#  define _ASYNCIO_FUTURE__LOOP_GETSETDEF {"_loop", (getter)_asyncio_Future__loop_get, (setter)_asyncio_Future__loop_set, _asyncio_Future__loop_DOCSTR},
+#  define _ASYNCIO_FUTURE__LOOP_GETSETDEF {"_loop", _asyncio_Future__loop_get, _asyncio_Future__loop_set, _asyncio_Future__loop_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__LOOP_GETSETDEF {"_loop", (getter)_asyncio_Future__loop_get, NULL, _asyncio_Future__loop_DOCSTR},
+#  define _ASYNCIO_FUTURE__LOOP_GETSETDEF {"_loop", _asyncio_Future__loop_get, NULL, _asyncio_Future__loop_DOCSTR},
 #endif
 
 static PyObject *
@@ -671,9 +671,9 @@ _asyncio_Future__loop_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__CALLBACKS_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__CALLBACKS_GETSETDEF
-#  define _ASYNCIO_FUTURE__CALLBACKS_GETSETDEF {"_callbacks", (getter)_asyncio_Future__callbacks_get, (setter)_asyncio_Future__callbacks_set, _asyncio_Future__callbacks_DOCSTR},
+#  define _ASYNCIO_FUTURE__CALLBACKS_GETSETDEF {"_callbacks", _asyncio_Future__callbacks_get, _asyncio_Future__callbacks_set, _asyncio_Future__callbacks_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__CALLBACKS_GETSETDEF {"_callbacks", (getter)_asyncio_Future__callbacks_get, NULL, _asyncio_Future__callbacks_DOCSTR},
+#  define _ASYNCIO_FUTURE__CALLBACKS_GETSETDEF {"_callbacks", _asyncio_Future__callbacks_get, NULL, _asyncio_Future__callbacks_DOCSTR},
 #endif
 
 static PyObject *
@@ -696,9 +696,9 @@ _asyncio_Future__callbacks_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__RESULT_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__RESULT_GETSETDEF
-#  define _ASYNCIO_FUTURE__RESULT_GETSETDEF {"_result", (getter)_asyncio_Future__result_get, (setter)_asyncio_Future__result_set, _asyncio_Future__result_DOCSTR},
+#  define _ASYNCIO_FUTURE__RESULT_GETSETDEF {"_result", _asyncio_Future__result_get, _asyncio_Future__result_set, _asyncio_Future__result_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__RESULT_GETSETDEF {"_result", (getter)_asyncio_Future__result_get, NULL, _asyncio_Future__result_DOCSTR},
+#  define _ASYNCIO_FUTURE__RESULT_GETSETDEF {"_result", _asyncio_Future__result_get, NULL, _asyncio_Future__result_DOCSTR},
 #endif
 
 static PyObject *
@@ -721,9 +721,9 @@ _asyncio_Future__result_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__EXCEPTION_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__EXCEPTION_GETSETDEF
-#  define _ASYNCIO_FUTURE__EXCEPTION_GETSETDEF {"_exception", (getter)_asyncio_Future__exception_get, (setter)_asyncio_Future__exception_set, _asyncio_Future__exception_DOCSTR},
+#  define _ASYNCIO_FUTURE__EXCEPTION_GETSETDEF {"_exception", _asyncio_Future__exception_get, _asyncio_Future__exception_set, _asyncio_Future__exception_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__EXCEPTION_GETSETDEF {"_exception", (getter)_asyncio_Future__exception_get, NULL, _asyncio_Future__exception_DOCSTR},
+#  define _ASYNCIO_FUTURE__EXCEPTION_GETSETDEF {"_exception", _asyncio_Future__exception_get, NULL, _asyncio_Future__exception_DOCSTR},
 #endif
 
 static PyObject *
@@ -746,9 +746,9 @@ _asyncio_Future__exception_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__SOURCE_TRACEBACK_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__SOURCE_TRACEBACK_GETSETDEF
-#  define _ASYNCIO_FUTURE__SOURCE_TRACEBACK_GETSETDEF {"_source_traceback", (getter)_asyncio_Future__source_traceback_get, (setter)_asyncio_Future__source_traceback_set, _asyncio_Future__source_traceback_DOCSTR},
+#  define _ASYNCIO_FUTURE__SOURCE_TRACEBACK_GETSETDEF {"_source_traceback", _asyncio_Future__source_traceback_get, _asyncio_Future__source_traceback_set, _asyncio_Future__source_traceback_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__SOURCE_TRACEBACK_GETSETDEF {"_source_traceback", (getter)_asyncio_Future__source_traceback_get, NULL, _asyncio_Future__source_traceback_DOCSTR},
+#  define _ASYNCIO_FUTURE__SOURCE_TRACEBACK_GETSETDEF {"_source_traceback", _asyncio_Future__source_traceback_get, NULL, _asyncio_Future__source_traceback_DOCSTR},
 #endif
 
 static PyObject *
@@ -771,9 +771,9 @@ _asyncio_Future__source_traceback_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF
-#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", (getter)_asyncio_Future__cancel_message_get, (setter)_asyncio_Future__cancel_message_set, _asyncio_Future__cancel_message_DOCSTR},
+#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", _asyncio_Future__cancel_message_get, _asyncio_Future__cancel_message_set, _asyncio_Future__cancel_message_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", (getter)_asyncio_Future__cancel_message_get, NULL, _asyncio_Future__cancel_message_DOCSTR},
+#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", _asyncio_Future__cancel_message_get, NULL, _asyncio_Future__cancel_message_DOCSTR},
 #endif
 
 static PyObject *
@@ -796,9 +796,9 @@ _asyncio_Future__cancel_message_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF
-#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", (getter)_asyncio_Future__cancel_message_get, (setter)_asyncio_Future__cancel_message_set, _asyncio_Future__cancel_message_DOCSTR},
+#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", _asyncio_Future__cancel_message_get, _asyncio_Future__cancel_message_set, _asyncio_Future__cancel_message_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", NULL, (setter)_asyncio_Future__cancel_message_set, NULL},
+#  define _ASYNCIO_FUTURE__CANCEL_MESSAGE_GETSETDEF {"_cancel_message", NULL, _asyncio_Future__cancel_message_set, NULL},
 #endif
 
 static int
@@ -821,9 +821,9 @@ _asyncio_Future__cancel_message_set(PyObject *self, PyObject *value, void *Py_UN
 #endif
 #if defined(_ASYNCIO_FUTURE__STATE_GETSETDEF)
 #  undef _ASYNCIO_FUTURE__STATE_GETSETDEF
-#  define _ASYNCIO_FUTURE__STATE_GETSETDEF {"_state", (getter)_asyncio_Future__state_get, (setter)_asyncio_Future__state_set, _asyncio_Future__state_DOCSTR},
+#  define _ASYNCIO_FUTURE__STATE_GETSETDEF {"_state", _asyncio_Future__state_get, _asyncio_Future__state_set, _asyncio_Future__state_DOCSTR},
 #else
-#  define _ASYNCIO_FUTURE__STATE_GETSETDEF {"_state", (getter)_asyncio_Future__state_get, NULL, _asyncio_Future__state_DOCSTR},
+#  define _ASYNCIO_FUTURE__STATE_GETSETDEF {"_state", _asyncio_Future__state_get, NULL, _asyncio_Future__state_DOCSTR},
 #endif
 
 static PyObject *
@@ -851,7 +851,7 @@ PyDoc_STRVAR(_asyncio_Future__make_cancelled_error__doc__,
 "it erases the context exception value.");
 
 #define _ASYNCIO_FUTURE__MAKE_CANCELLED_ERROR_METHODDEF    \
-    {"_make_cancelled_error", (PyCFunction)_asyncio_Future__make_cancelled_error, METH_NOARGS, _asyncio_Future__make_cancelled_error__doc__},
+    {"_make_cancelled_error", _asyncio_Future__make_cancelled_error, METH_NOARGS, _asyncio_Future__make_cancelled_error__doc__},
 
 static PyObject *
 _asyncio_Future__make_cancelled_error_impl(FutureObj *self);
@@ -963,9 +963,9 @@ _asyncio_Task___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 #endif
 #if defined(_ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF)
 #  undef _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF
-#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", (getter)_asyncio_Task__log_destroy_pending_get, (setter)_asyncio_Task__log_destroy_pending_set, _asyncio_Task__log_destroy_pending_DOCSTR},
+#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", _asyncio_Task__log_destroy_pending_get, _asyncio_Task__log_destroy_pending_set, _asyncio_Task__log_destroy_pending_DOCSTR},
 #else
-#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", (getter)_asyncio_Task__log_destroy_pending_get, NULL, _asyncio_Task__log_destroy_pending_DOCSTR},
+#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", _asyncio_Task__log_destroy_pending_get, NULL, _asyncio_Task__log_destroy_pending_DOCSTR},
 #endif
 
 static PyObject *
@@ -988,9 +988,9 @@ _asyncio_Task__log_destroy_pending_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF)
 #  undef _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF
-#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", (getter)_asyncio_Task__log_destroy_pending_get, (setter)_asyncio_Task__log_destroy_pending_set, _asyncio_Task__log_destroy_pending_DOCSTR},
+#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", _asyncio_Task__log_destroy_pending_get, _asyncio_Task__log_destroy_pending_set, _asyncio_Task__log_destroy_pending_DOCSTR},
 #else
-#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", NULL, (setter)_asyncio_Task__log_destroy_pending_set, NULL},
+#  define _ASYNCIO_TASK__LOG_DESTROY_PENDING_GETSETDEF {"_log_destroy_pending", NULL, _asyncio_Task__log_destroy_pending_set, NULL},
 #endif
 
 static int
@@ -1013,9 +1013,9 @@ _asyncio_Task__log_destroy_pending_set(PyObject *self, PyObject *value, void *Py
 #endif
 #if defined(_ASYNCIO_TASK__MUST_CANCEL_GETSETDEF)
 #  undef _ASYNCIO_TASK__MUST_CANCEL_GETSETDEF
-#  define _ASYNCIO_TASK__MUST_CANCEL_GETSETDEF {"_must_cancel", (getter)_asyncio_Task__must_cancel_get, (setter)_asyncio_Task__must_cancel_set, _asyncio_Task__must_cancel_DOCSTR},
+#  define _ASYNCIO_TASK__MUST_CANCEL_GETSETDEF {"_must_cancel", _asyncio_Task__must_cancel_get, _asyncio_Task__must_cancel_set, _asyncio_Task__must_cancel_DOCSTR},
 #else
-#  define _ASYNCIO_TASK__MUST_CANCEL_GETSETDEF {"_must_cancel", (getter)_asyncio_Task__must_cancel_get, NULL, _asyncio_Task__must_cancel_DOCSTR},
+#  define _ASYNCIO_TASK__MUST_CANCEL_GETSETDEF {"_must_cancel", _asyncio_Task__must_cancel_get, NULL, _asyncio_Task__must_cancel_DOCSTR},
 #endif
 
 static PyObject *
@@ -1038,9 +1038,9 @@ _asyncio_Task__must_cancel_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_TASK__CORO_GETSETDEF)
 #  undef _ASYNCIO_TASK__CORO_GETSETDEF
-#  define _ASYNCIO_TASK__CORO_GETSETDEF {"_coro", (getter)_asyncio_Task__coro_get, (setter)_asyncio_Task__coro_set, _asyncio_Task__coro_DOCSTR},
+#  define _ASYNCIO_TASK__CORO_GETSETDEF {"_coro", _asyncio_Task__coro_get, _asyncio_Task__coro_set, _asyncio_Task__coro_DOCSTR},
 #else
-#  define _ASYNCIO_TASK__CORO_GETSETDEF {"_coro", (getter)_asyncio_Task__coro_get, NULL, _asyncio_Task__coro_DOCSTR},
+#  define _ASYNCIO_TASK__CORO_GETSETDEF {"_coro", _asyncio_Task__coro_get, NULL, _asyncio_Task__coro_DOCSTR},
 #endif
 
 static PyObject *
@@ -1063,9 +1063,9 @@ _asyncio_Task__coro_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_ASYNCIO_TASK__FUT_WAITER_GETSETDEF)
 #  undef _ASYNCIO_TASK__FUT_WAITER_GETSETDEF
-#  define _ASYNCIO_TASK__FUT_WAITER_GETSETDEF {"_fut_waiter", (getter)_asyncio_Task__fut_waiter_get, (setter)_asyncio_Task__fut_waiter_set, _asyncio_Task__fut_waiter_DOCSTR},
+#  define _ASYNCIO_TASK__FUT_WAITER_GETSETDEF {"_fut_waiter", _asyncio_Task__fut_waiter_get, _asyncio_Task__fut_waiter_set, _asyncio_Task__fut_waiter_DOCSTR},
 #else
-#  define _ASYNCIO_TASK__FUT_WAITER_GETSETDEF {"_fut_waiter", (getter)_asyncio_Task__fut_waiter_get, NULL, _asyncio_Task__fut_waiter_DOCSTR},
+#  define _ASYNCIO_TASK__FUT_WAITER_GETSETDEF {"_fut_waiter", _asyncio_Task__fut_waiter_get, NULL, _asyncio_Task__fut_waiter_DOCSTR},
 #endif
 
 static PyObject *
@@ -1093,7 +1093,7 @@ PyDoc_STRVAR(_asyncio_Task__make_cancelled_error__doc__,
 "it erases the context exception value.");
 
 #define _ASYNCIO_TASK__MAKE_CANCELLED_ERROR_METHODDEF    \
-    {"_make_cancelled_error", (PyCFunction)_asyncio_Task__make_cancelled_error, METH_NOARGS, _asyncio_Task__make_cancelled_error__doc__},
+    {"_make_cancelled_error", _asyncio_Task__make_cancelled_error, METH_NOARGS, _asyncio_Task__make_cancelled_error__doc__},
 
 static PyObject *
 _asyncio_Task__make_cancelled_error_impl(TaskObj *self);
@@ -1204,7 +1204,7 @@ PyDoc_STRVAR(_asyncio_Task_cancelling__doc__,
 "and may be decremented using .uncancel().");
 
 #define _ASYNCIO_TASK_CANCELLING_METHODDEF    \
-    {"cancelling", (PyCFunction)_asyncio_Task_cancelling, METH_NOARGS, _asyncio_Task_cancelling__doc__},
+    {"cancelling", _asyncio_Task_cancelling, METH_NOARGS, _asyncio_Task_cancelling__doc__},
 
 static PyObject *
 _asyncio_Task_cancelling_impl(TaskObj *self);
@@ -1233,7 +1233,7 @@ PyDoc_STRVAR(_asyncio_Task_uncancel__doc__,
 "Returns the remaining number of cancellation requests.");
 
 #define _ASYNCIO_TASK_UNCANCEL_METHODDEF    \
-    {"uncancel", (PyCFunction)_asyncio_Task_uncancel, METH_NOARGS, _asyncio_Task_uncancel__doc__},
+    {"uncancel", _asyncio_Task_uncancel, METH_NOARGS, _asyncio_Task_uncancel__doc__},
 
 static PyObject *
 _asyncio_Task_uncancel_impl(TaskObj *self);
@@ -1415,7 +1415,7 @@ PyDoc_STRVAR(_asyncio_Task_set_result__doc__,
 "\n");
 
 #define _ASYNCIO_TASK_SET_RESULT_METHODDEF    \
-    {"set_result", (PyCFunction)_asyncio_Task_set_result, METH_O, _asyncio_Task_set_result__doc__},
+    {"set_result", _asyncio_Task_set_result, METH_O, _asyncio_Task_set_result__doc__},
 
 static PyObject *
 _asyncio_Task_set_result_impl(TaskObj *self, PyObject *result);
@@ -1436,7 +1436,7 @@ PyDoc_STRVAR(_asyncio_Task_set_exception__doc__,
 "\n");
 
 #define _ASYNCIO_TASK_SET_EXCEPTION_METHODDEF    \
-    {"set_exception", (PyCFunction)_asyncio_Task_set_exception, METH_O, _asyncio_Task_set_exception__doc__},
+    {"set_exception", _asyncio_Task_set_exception, METH_O, _asyncio_Task_set_exception__doc__},
 
 static PyObject *
 _asyncio_Task_set_exception_impl(TaskObj *self, PyObject *exception);
@@ -1457,7 +1457,7 @@ PyDoc_STRVAR(_asyncio_Task_get_coro__doc__,
 "\n");
 
 #define _ASYNCIO_TASK_GET_CORO_METHODDEF    \
-    {"get_coro", (PyCFunction)_asyncio_Task_get_coro, METH_NOARGS, _asyncio_Task_get_coro__doc__},
+    {"get_coro", _asyncio_Task_get_coro, METH_NOARGS, _asyncio_Task_get_coro__doc__},
 
 static PyObject *
 _asyncio_Task_get_coro_impl(TaskObj *self);
@@ -1480,7 +1480,7 @@ PyDoc_STRVAR(_asyncio_Task_get_context__doc__,
 "\n");
 
 #define _ASYNCIO_TASK_GET_CONTEXT_METHODDEF    \
-    {"get_context", (PyCFunction)_asyncio_Task_get_context, METH_NOARGS, _asyncio_Task_get_context__doc__},
+    {"get_context", _asyncio_Task_get_context, METH_NOARGS, _asyncio_Task_get_context__doc__},
 
 static PyObject *
 _asyncio_Task_get_context_impl(TaskObj *self);
@@ -1497,7 +1497,7 @@ PyDoc_STRVAR(_asyncio_Task_get_name__doc__,
 "\n");
 
 #define _ASYNCIO_TASK_GET_NAME_METHODDEF    \
-    {"get_name", (PyCFunction)_asyncio_Task_get_name, METH_NOARGS, _asyncio_Task_get_name__doc__},
+    {"get_name", _asyncio_Task_get_name, METH_NOARGS, _asyncio_Task_get_name__doc__},
 
 static PyObject *
 _asyncio_Task_get_name_impl(TaskObj *self);
@@ -1520,7 +1520,7 @@ PyDoc_STRVAR(_asyncio_Task_set_name__doc__,
 "\n");
 
 #define _ASYNCIO_TASK_SET_NAME_METHODDEF    \
-    {"set_name", (PyCFunction)_asyncio_Task_set_name, METH_O, _asyncio_Task_set_name__doc__},
+    {"set_name", _asyncio_Task_set_name, METH_O, _asyncio_Task_set_name__doc__},
 
 static PyObject *
 _asyncio_Task_set_name_impl(TaskObj *self, PyObject *value);
@@ -1547,7 +1547,7 @@ PyDoc_STRVAR(_asyncio__get_running_loop__doc__,
 "This function is thread-specific.");
 
 #define _ASYNCIO__GET_RUNNING_LOOP_METHODDEF    \
-    {"_get_running_loop", (PyCFunction)_asyncio__get_running_loop, METH_NOARGS, _asyncio__get_running_loop__doc__},
+    {"_get_running_loop", _asyncio__get_running_loop, METH_NOARGS, _asyncio__get_running_loop__doc__},
 
 static PyObject *
 _asyncio__get_running_loop_impl(PyObject *module);
@@ -1568,7 +1568,7 @@ PyDoc_STRVAR(_asyncio__set_running_loop__doc__,
 "This function is thread-specific.");
 
 #define _ASYNCIO__SET_RUNNING_LOOP_METHODDEF    \
-    {"_set_running_loop", (PyCFunction)_asyncio__set_running_loop, METH_O, _asyncio__set_running_loop__doc__},
+    {"_set_running_loop", _asyncio__set_running_loop, METH_O, _asyncio__set_running_loop__doc__},
 
 PyDoc_STRVAR(_asyncio_get_event_loop__doc__,
 "get_event_loop($module, /)\n"
@@ -1584,7 +1584,7 @@ PyDoc_STRVAR(_asyncio_get_event_loop__doc__,
 "the result of `get_event_loop_policy().get_event_loop()` call.");
 
 #define _ASYNCIO_GET_EVENT_LOOP_METHODDEF    \
-    {"get_event_loop", (PyCFunction)_asyncio_get_event_loop, METH_NOARGS, _asyncio_get_event_loop__doc__},
+    {"get_event_loop", _asyncio_get_event_loop, METH_NOARGS, _asyncio_get_event_loop__doc__},
 
 static PyObject *
 _asyncio_get_event_loop_impl(PyObject *module);
@@ -1604,7 +1604,7 @@ PyDoc_STRVAR(_asyncio_get_running_loop__doc__,
 "This function is thread-specific.");
 
 #define _ASYNCIO_GET_RUNNING_LOOP_METHODDEF    \
-    {"get_running_loop", (PyCFunction)_asyncio_get_running_loop, METH_NOARGS, _asyncio_get_running_loop__doc__},
+    {"get_running_loop", _asyncio_get_running_loop, METH_NOARGS, _asyncio_get_running_loop__doc__},
 
 static PyObject *
 _asyncio_get_running_loop_impl(PyObject *module);
@@ -2232,4 +2232,4 @@ _asyncio_future_discard_from_awaited_by(PyObject *module, PyObject *const *args,
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b69948ed810591d9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=605a24baf6500b21 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h
index 2bc6524b6a973b..6879e0c315da2e 100644
--- a/Modules/clinic/_bz2module.c.h
+++ b/Modules/clinic/_bz2module.c.h
@@ -21,7 +21,7 @@ PyDoc_STRVAR(_bz2_BZ2Compressor_compress__doc__,
 "flush() method to finish the compression process.");
 
 #define _BZ2_BZ2COMPRESSOR_COMPRESS_METHODDEF    \
-    {"compress", (PyCFunction)_bz2_BZ2Compressor_compress, METH_O, _bz2_BZ2Compressor_compress__doc__},
+    {"compress", _bz2_BZ2Compressor_compress, METH_O, _bz2_BZ2Compressor_compress__doc__},
 
 static PyObject *
 _bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data);
@@ -57,7 +57,7 @@ PyDoc_STRVAR(_bz2_BZ2Compressor_flush__doc__,
 "The compressor object may not be used after this method is called.");
 
 #define _BZ2_BZ2COMPRESSOR_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_bz2_BZ2Compressor_flush, METH_NOARGS, _bz2_BZ2Compressor_flush__doc__},
+    {"flush", _bz2_BZ2Compressor_flush, METH_NOARGS, _bz2_BZ2Compressor_flush__doc__},
 
 static PyObject *
 _bz2_BZ2Compressor_flush_impl(BZ2Compressor *self);
@@ -237,4 +237,4 @@ _bz2_BZ2Decompressor(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=552ac6d4c5a101b7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=dc82f9a58fe708c3 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h
index b0310325759326..eb3ef3e243f81b 100644
--- a/Modules/clinic/_codecsmodule.c.h
+++ b/Modules/clinic/_codecsmodule.c.h
@@ -19,7 +19,7 @@ PyDoc_STRVAR(_codecs_register__doc__,
 "(encoder, decoder, stream_reader, stream_writer) (or a CodecInfo object).");
 
 #define _CODECS_REGISTER_METHODDEF    \
-    {"register", (PyCFunction)_codecs_register, METH_O, _codecs_register__doc__},
+    {"register", _codecs_register, METH_O, _codecs_register__doc__},
 
 PyDoc_STRVAR(_codecs_unregister__doc__,
 "unregister($module, search_function, /)\n"
@@ -30,7 +30,7 @@ PyDoc_STRVAR(_codecs_unregister__doc__,
 "If the search function is not registered, do nothing.");
 
 #define _CODECS_UNREGISTER_METHODDEF    \
-    {"unregister", (PyCFunction)_codecs_unregister, METH_O, _codecs_unregister__doc__},
+    {"unregister", _codecs_unregister, METH_O, _codecs_unregister__doc__},
 
 PyDoc_STRVAR(_codecs_lookup__doc__,
 "lookup($module, encoding, /)\n"
@@ -39,7 +39,7 @@ PyDoc_STRVAR(_codecs_lookup__doc__,
 "Looks up a codec tuple in the Python codec registry and returns a CodecInfo object.");
 
 #define _CODECS_LOOKUP_METHODDEF    \
-    {"lookup", (PyCFunction)_codecs_lookup, METH_O, _codecs_lookup__doc__},
+    {"lookup", _codecs_lookup, METH_O, _codecs_lookup__doc__},
 
 static PyObject *
 _codecs_lookup_impl(PyObject *module, const char *encoding);
@@ -2440,7 +2440,7 @@ PyDoc_STRVAR(_codecs_charmap_build__doc__,
 "\n");
 
 #define _CODECS_CHARMAP_BUILD_METHODDEF    \
-    {"charmap_build", (PyCFunction)_codecs_charmap_build, METH_O, _codecs_charmap_build__doc__},
+    {"charmap_build", _codecs_charmap_build, METH_O, _codecs_charmap_build__doc__},
 
 static PyObject *
 _codecs_charmap_build_impl(PyObject *module, PyObject *map);
@@ -2704,7 +2704,7 @@ PyDoc_STRVAR(_codecs__unregister_error__doc__,
 "handling exists.");
 
 #define _CODECS__UNREGISTER_ERROR_METHODDEF    \
-    {"_unregister_error", (PyCFunction)_codecs__unregister_error, METH_O, _codecs__unregister_error__doc__},
+    {"_unregister_error", _codecs__unregister_error, METH_O, _codecs__unregister_error__doc__},
 
 static int
 _codecs__unregister_error_impl(PyObject *module, const char *errors);
@@ -2749,7 +2749,7 @@ PyDoc_STRVAR(_codecs_lookup_error__doc__,
 "LookupError, if no handler exists under this name.");
 
 #define _CODECS_LOOKUP_ERROR_METHODDEF    \
-    {"lookup_error", (PyCFunction)_codecs_lookup_error, METH_O, _codecs_lookup_error__doc__},
+    {"lookup_error", _codecs_lookup_error, METH_O, _codecs_lookup_error__doc__},
 
 static PyObject *
 _codecs_lookup_error_impl(PyObject *module, const char *name);
@@ -2802,4 +2802,4 @@ _codecs_lookup_error(PyObject *module, PyObject *arg)
 #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF
     #define _CODECS_CODE_PAGE_ENCODE_METHODDEF
 #endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */
-/*[clinic end generated code: output=ed13f20dfb09e306 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e1a206c53d0cbe6e input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_collectionsmodule.c.h b/Modules/clinic/_collectionsmodule.c.h
index b5c315c680e782..69e93796b22f72 100644
--- a/Modules/clinic/_collectionsmodule.c.h
+++ b/Modules/clinic/_collectionsmodule.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(deque_pop__doc__,
 "Remove and return the rightmost element.");
 
 #define DEQUE_POP_METHODDEF    \
-    {"pop", (PyCFunction)deque_pop, METH_NOARGS, deque_pop__doc__},
+    {"pop", deque_pop, METH_NOARGS, deque_pop__doc__},
 
 static PyObject *
 deque_pop_impl(dequeobject *deque);
@@ -41,7 +41,7 @@ PyDoc_STRVAR(deque_popleft__doc__,
 "Remove and return the leftmost element.");
 
 #define DEQUE_POPLEFT_METHODDEF    \
-    {"popleft", (PyCFunction)deque_popleft, METH_NOARGS, deque_popleft__doc__},
+    {"popleft", deque_popleft, METH_NOARGS, deque_popleft__doc__},
 
 static PyObject *
 deque_popleft_impl(dequeobject *deque);
@@ -65,7 +65,7 @@ PyDoc_STRVAR(deque_append__doc__,
 "Add an element to the right side of the deque.");
 
 #define DEQUE_APPEND_METHODDEF    \
-    {"append", (PyCFunction)deque_append, METH_O, deque_append__doc__},
+    {"append", deque_append, METH_O, deque_append__doc__},
 
 static PyObject *
 deque_append_impl(dequeobject *deque, PyObject *item);
@@ -89,7 +89,7 @@ PyDoc_STRVAR(deque_appendleft__doc__,
 "Add an element to the left side of the deque.");
 
 #define DEQUE_APPENDLEFT_METHODDEF    \
-    {"appendleft", (PyCFunction)deque_appendleft, METH_O, deque_appendleft__doc__},
+    {"appendleft", deque_appendleft, METH_O, deque_appendleft__doc__},
 
 static PyObject *
 deque_appendleft_impl(dequeobject *deque, PyObject *item);
@@ -113,7 +113,7 @@ PyDoc_STRVAR(deque_extend__doc__,
 "Extend the right side of the deque with elements from the iterable.");
 
 #define DEQUE_EXTEND_METHODDEF    \
-    {"extend", (PyCFunction)deque_extend, METH_O, deque_extend__doc__},
+    {"extend", deque_extend, METH_O, deque_extend__doc__},
 
 static PyObject *
 deque_extend_impl(dequeobject *deque, PyObject *iterable);
@@ -137,7 +137,7 @@ PyDoc_STRVAR(deque_extendleft__doc__,
 "Extend the left side of the deque with elements from the iterable.");
 
 #define DEQUE_EXTENDLEFT_METHODDEF    \
-    {"extendleft", (PyCFunction)deque_extendleft, METH_O, deque_extendleft__doc__},
+    {"extendleft", deque_extendleft, METH_O, deque_extendleft__doc__},
 
 static PyObject *
 deque_extendleft_impl(dequeobject *deque, PyObject *iterable);
@@ -161,7 +161,7 @@ PyDoc_STRVAR(deque_copy__doc__,
 "Return a shallow copy of a deque.");
 
 #define DEQUE_COPY_METHODDEF    \
-    {"copy", (PyCFunction)deque_copy, METH_NOARGS, deque_copy__doc__},
+    {"copy", deque_copy, METH_NOARGS, deque_copy__doc__},
 
 static PyObject *
 deque_copy_impl(dequeobject *deque);
@@ -185,7 +185,7 @@ PyDoc_STRVAR(deque___copy____doc__,
 "Return a shallow copy of a deque.");
 
 #define DEQUE___COPY___METHODDEF    \
-    {"__copy__", (PyCFunction)deque___copy__, METH_NOARGS, deque___copy____doc__},
+    {"__copy__", deque___copy__, METH_NOARGS, deque___copy____doc__},
 
 static PyObject *
 deque___copy___impl(dequeobject *deque);
@@ -209,7 +209,7 @@ PyDoc_STRVAR(deque_clearmethod__doc__,
 "Remove all elements from the deque.");
 
 #define DEQUE_CLEARMETHOD_METHODDEF    \
-    {"clear", (PyCFunction)deque_clearmethod, METH_NOARGS, deque_clearmethod__doc__},
+    {"clear", deque_clearmethod, METH_NOARGS, deque_clearmethod__doc__},
 
 static PyObject *
 deque_clearmethod_impl(dequeobject *deque);
@@ -278,7 +278,7 @@ PyDoc_STRVAR(deque_reverse__doc__,
 "Reverse *IN PLACE*.");
 
 #define DEQUE_REVERSE_METHODDEF    \
-    {"reverse", (PyCFunction)deque_reverse, METH_NOARGS, deque_reverse__doc__},
+    {"reverse", deque_reverse, METH_NOARGS, deque_reverse__doc__},
 
 static PyObject *
 deque_reverse_impl(dequeobject *deque);
@@ -302,7 +302,7 @@ PyDoc_STRVAR(deque_count__doc__,
 "Return number of occurrences of value.");
 
 #define DEQUE_COUNT_METHODDEF    \
-    {"count", (PyCFunction)deque_count, METH_O, deque_count__doc__},
+    {"count", deque_count, METH_O, deque_count__doc__},
 
 static PyObject *
 deque_count_impl(dequeobject *deque, PyObject *v);
@@ -417,7 +417,7 @@ PyDoc_STRVAR(deque_remove__doc__,
 "Remove first occurrence of value.");
 
 #define DEQUE_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)deque_remove, METH_O, deque_remove__doc__},
+    {"remove", deque_remove, METH_O, deque_remove__doc__},
 
 static PyObject *
 deque_remove_impl(dequeobject *deque, PyObject *value);
@@ -441,7 +441,7 @@ PyDoc_STRVAR(deque___reduce____doc__,
 "Return state information for pickling.");
 
 #define DEQUE___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)deque___reduce__, METH_NOARGS, deque___reduce____doc__},
+    {"__reduce__", deque___reduce__, METH_NOARGS, deque___reduce____doc__},
 
 static PyObject *
 deque___reduce___impl(dequeobject *deque);
@@ -530,7 +530,7 @@ PyDoc_STRVAR(deque___sizeof____doc__,
 "Return the size of the deque in memory, in bytes.");
 
 #define DEQUE___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)deque___sizeof__, METH_NOARGS, deque___sizeof____doc__},
+    {"__sizeof__", deque___sizeof__, METH_NOARGS, deque___sizeof____doc__},
 
 static PyObject *
 deque___sizeof___impl(dequeobject *deque);
@@ -554,7 +554,7 @@ PyDoc_STRVAR(deque___reversed____doc__,
 "Return a reverse iterator over the deque.");
 
 #define DEQUE___REVERSED___METHODDEF    \
-    {"__reversed__", (PyCFunction)deque___reversed__, METH_NOARGS, deque___reversed____doc__},
+    {"__reversed__", deque___reversed__, METH_NOARGS, deque___reversed____doc__},
 
 static PyObject *
 deque___reversed___impl(dequeobject *deque);
@@ -632,4 +632,4 @@ tuplegetter_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b9d4d647c221cb9f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=396acd8259c87e34 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_csv.c.h b/Modules/clinic/_csv.c.h
index 416aeafccf917b..1df71ff5391423 100644
--- a/Modules/clinic/_csv.c.h
+++ b/Modules/clinic/_csv.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(_csv_list_dialects__doc__,
 "    names = csv.list_dialects()");
 
 #define _CSV_LIST_DIALECTS_METHODDEF    \
-    {"list_dialects", (PyCFunction)_csv_list_dialects, METH_NOARGS, _csv_list_dialects__doc__},
+    {"list_dialects", _csv_list_dialects, METH_NOARGS, _csv_list_dialects__doc__},
 
 static PyObject *
 _csv_list_dialects_impl(PyObject *module);
@@ -215,4 +215,4 @@ _csv_field_size_limit(PyObject *module, PyObject *const *args, Py_ssize_t nargs,
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=1fb09d5e7667ad0d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0588fb477d6a688b input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_curses_panel.c.h b/Modules/clinic/_curses_panel.c.h
index 6f4966825ec4bf..44f0dff2469378 100644
--- a/Modules/clinic/_curses_panel.c.h
+++ b/Modules/clinic/_curses_panel.c.h
@@ -104,7 +104,7 @@ PyDoc_STRVAR(_curses_panel_panel_above__doc__,
 "Return the panel above the current panel.");
 
 #define _CURSES_PANEL_PANEL_ABOVE_METHODDEF    \
-    {"above", (PyCFunction)_curses_panel_panel_above, METH_NOARGS, _curses_panel_panel_above__doc__},
+    {"above", _curses_panel_panel_above, METH_NOARGS, _curses_panel_panel_above__doc__},
 
 static PyObject *
 _curses_panel_panel_above_impl(PyCursesPanelObject *self);
@@ -122,7 +122,7 @@ PyDoc_STRVAR(_curses_panel_panel_below__doc__,
 "Return the panel below the current panel.");
 
 #define _CURSES_PANEL_PANEL_BELOW_METHODDEF    \
-    {"below", (PyCFunction)_curses_panel_panel_below, METH_NOARGS, _curses_panel_panel_below__doc__},
+    {"below", _curses_panel_panel_below, METH_NOARGS, _curses_panel_panel_below__doc__},
 
 static PyObject *
 _curses_panel_panel_below_impl(PyCursesPanelObject *self);
@@ -140,7 +140,7 @@ PyDoc_STRVAR(_curses_panel_panel_hidden__doc__,
 "Return True if the panel is hidden (not visible), False otherwise.");
 
 #define _CURSES_PANEL_PANEL_HIDDEN_METHODDEF    \
-    {"hidden", (PyCFunction)_curses_panel_panel_hidden, METH_NOARGS, _curses_panel_panel_hidden__doc__},
+    {"hidden", _curses_panel_panel_hidden, METH_NOARGS, _curses_panel_panel_hidden__doc__},
 
 static PyObject *
 _curses_panel_panel_hidden_impl(PyCursesPanelObject *self);
@@ -211,7 +211,7 @@ PyDoc_STRVAR(_curses_panel_panel_window__doc__,
 "Return the window object associated with the panel.");
 
 #define _CURSES_PANEL_PANEL_WINDOW_METHODDEF    \
-    {"window", (PyCFunction)_curses_panel_panel_window, METH_NOARGS, _curses_panel_panel_window__doc__},
+    {"window", _curses_panel_panel_window, METH_NOARGS, _curses_panel_panel_window__doc__},
 
 static PyObject *
 _curses_panel_panel_window_impl(PyCursesPanelObject *self);
@@ -347,7 +347,7 @@ PyDoc_STRVAR(_curses_panel_bottom_panel__doc__,
 "Return the bottom panel in the panel stack.");
 
 #define _CURSES_PANEL_BOTTOM_PANEL_METHODDEF    \
-    {"bottom_panel", (PyCFunction)_curses_panel_bottom_panel, METH_NOARGS, _curses_panel_bottom_panel__doc__},
+    {"bottom_panel", _curses_panel_bottom_panel, METH_NOARGS, _curses_panel_bottom_panel__doc__},
 
 static PyObject *
 _curses_panel_bottom_panel_impl(PyObject *module);
@@ -365,7 +365,7 @@ PyDoc_STRVAR(_curses_panel_new_panel__doc__,
 "Return a panel object, associating it with the given window win.");
 
 #define _CURSES_PANEL_NEW_PANEL_METHODDEF    \
-    {"new_panel", (PyCFunction)_curses_panel_new_panel, METH_O, _curses_panel_new_panel__doc__},
+    {"new_panel", _curses_panel_new_panel, METH_O, _curses_panel_new_panel__doc__},
 
 static PyObject *
 _curses_panel_new_panel_impl(PyObject *module, PyCursesWindowObject *win);
@@ -394,7 +394,7 @@ PyDoc_STRVAR(_curses_panel_top_panel__doc__,
 "Return the top panel in the panel stack.");
 
 #define _CURSES_PANEL_TOP_PANEL_METHODDEF    \
-    {"top_panel", (PyCFunction)_curses_panel_top_panel, METH_NOARGS, _curses_panel_top_panel__doc__},
+    {"top_panel", _curses_panel_top_panel, METH_NOARGS, _curses_panel_top_panel__doc__},
 
 static PyObject *
 _curses_panel_top_panel_impl(PyObject *module);
@@ -414,7 +414,7 @@ PyDoc_STRVAR(_curses_panel_update_panels__doc__,
 "This does not call curses.doupdate(), so you\'ll have to do this yourself.");
 
 #define _CURSES_PANEL_UPDATE_PANELS_METHODDEF    \
-    {"update_panels", (PyCFunction)_curses_panel_update_panels, METH_NOARGS, _curses_panel_update_panels__doc__},
+    {"update_panels", _curses_panel_update_panels, METH_NOARGS, _curses_panel_update_panels__doc__},
 
 static PyObject *
 _curses_panel_update_panels_impl(PyObject *module);
@@ -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=36853ecb4a979814 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7d7290f8008d8d11 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h
index 0346cc88782941..f6bd1e68ed6815 100644
--- a/Modules/clinic/_cursesmodule.c.h
+++ b/Modules/clinic/_cursesmodule.c.h
@@ -27,7 +27,7 @@ PyDoc_STRVAR(_curses_window_addch__doc__,
 "current settings for the window object.");
 
 #define _CURSES_WINDOW_ADDCH_METHODDEF    \
-    {"addch", (PyCFunction)_curses_window_addch, METH_VARARGS, _curses_window_addch__doc__},
+    {"addch", _curses_window_addch, METH_VARARGS, _curses_window_addch__doc__},
 
 static PyObject *
 _curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1,
@@ -99,7 +99,7 @@ PyDoc_STRVAR(_curses_window_addstr__doc__,
 "current settings for the window object.");
 
 #define _CURSES_WINDOW_ADDSTR_METHODDEF    \
-    {"addstr", (PyCFunction)_curses_window_addstr, METH_VARARGS, _curses_window_addstr__doc__},
+    {"addstr", _curses_window_addstr, METH_VARARGS, _curses_window_addstr__doc__},
 
 static PyObject *
 _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
@@ -173,7 +173,7 @@ PyDoc_STRVAR(_curses_window_addnstr__doc__,
 "current settings for the window object.");
 
 #define _CURSES_WINDOW_ADDNSTR_METHODDEF    \
-    {"addnstr", (PyCFunction)_curses_window_addnstr, METH_VARARGS, _curses_window_addnstr__doc__},
+    {"addnstr", _curses_window_addnstr, METH_VARARGS, _curses_window_addnstr__doc__},
 
 static PyObject *
 _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,
@@ -276,7 +276,7 @@ PyDoc_STRVAR(_curses_window_attroff__doc__,
 "Remove attribute attr from the \"background\" set.");
 
 #define _CURSES_WINDOW_ATTROFF_METHODDEF    \
-    {"attroff", (PyCFunction)_curses_window_attroff, METH_O, _curses_window_attroff__doc__},
+    {"attroff", _curses_window_attroff, METH_O, _curses_window_attroff__doc__},
 
 static PyObject *
 _curses_window_attroff_impl(PyCursesWindowObject *self, long attr);
@@ -304,7 +304,7 @@ PyDoc_STRVAR(_curses_window_attron__doc__,
 "Add attribute attr from the \"background\" set.");
 
 #define _CURSES_WINDOW_ATTRON_METHODDEF    \
-    {"attron", (PyCFunction)_curses_window_attron, METH_O, _curses_window_attron__doc__},
+    {"attron", _curses_window_attron, METH_O, _curses_window_attron__doc__},
 
 static PyObject *
 _curses_window_attron_impl(PyCursesWindowObject *self, long attr);
@@ -332,7 +332,7 @@ PyDoc_STRVAR(_curses_window_attrset__doc__,
 "Set the \"background\" set of attributes.");
 
 #define _CURSES_WINDOW_ATTRSET_METHODDEF    \
-    {"attrset", (PyCFunction)_curses_window_attrset, METH_O, _curses_window_attrset__doc__},
+    {"attrset", _curses_window_attrset, METH_O, _curses_window_attrset__doc__},
 
 static PyObject *
 _curses_window_attrset_impl(PyCursesWindowObject *self, long attr);
@@ -504,7 +504,7 @@ PyDoc_STRVAR(_curses_window_box__doc__,
 "horch.  The default corner characters are always used by this function.");
 
 #define _CURSES_WINDOW_BOX_METHODDEF    \
-    {"box", (PyCFunction)_curses_window_box, METH_VARARGS, _curses_window_box__doc__},
+    {"box", _curses_window_box, METH_VARARGS, _curses_window_box__doc__},
 
 static PyObject *
 _curses_window_box_impl(PyCursesWindowObject *self, int group_right_1,
@@ -547,7 +547,7 @@ PyDoc_STRVAR(_curses_window_delch__doc__,
 "    X-coordinate.");
 
 #define _CURSES_WINDOW_DELCH_METHODDEF    \
-    {"delch", (PyCFunction)_curses_window_delch, METH_VARARGS, _curses_window_delch__doc__},
+    {"delch", _curses_window_delch, METH_VARARGS, _curses_window_delch__doc__},
 
 static PyObject *
 _curses_window_delch_impl(PyCursesWindowObject *self, int group_right_1,
@@ -598,7 +598,7 @@ PyDoc_STRVAR(_curses_window_derwin__doc__,
 "screen.");
 
 #define _CURSES_WINDOW_DERWIN_METHODDEF    \
-    {"derwin", (PyCFunction)_curses_window_derwin, METH_VARARGS, _curses_window_derwin__doc__},
+    {"derwin", _curses_window_derwin, METH_VARARGS, _curses_window_derwin__doc__},
 
 static PyObject *
 _curses_window_derwin_impl(PyCursesWindowObject *self, int group_left_1,
@@ -731,7 +731,7 @@ PyDoc_STRVAR(_curses_window_getbkgd__doc__,
 "Return the window\'s current background character/attribute pair.");
 
 #define _CURSES_WINDOW_GETBKGD_METHODDEF    \
-    {"getbkgd", (PyCFunction)_curses_window_getbkgd, METH_NOARGS, _curses_window_getbkgd__doc__},
+    {"getbkgd", _curses_window_getbkgd, METH_NOARGS, _curses_window_getbkgd__doc__},
 
 static long
 _curses_window_getbkgd_impl(PyCursesWindowObject *self);
@@ -766,7 +766,7 @@ PyDoc_STRVAR(_curses_window_getch__doc__,
 "is returned if there is no input, else getch() waits until a key is pressed.");
 
 #define _CURSES_WINDOW_GETCH_METHODDEF    \
-    {"getch", (PyCFunction)_curses_window_getch, METH_VARARGS, _curses_window_getch__doc__},
+    {"getch", _curses_window_getch, METH_VARARGS, _curses_window_getch__doc__},
 
 static int
 _curses_window_getch_impl(PyCursesWindowObject *self, int group_right_1,
@@ -818,7 +818,7 @@ PyDoc_STRVAR(_curses_window_getkey__doc__,
 "key name.  In no-delay mode, an exception is raised if there is no input.");
 
 #define _CURSES_WINDOW_GETKEY_METHODDEF    \
-    {"getkey", (PyCFunction)_curses_window_getkey, METH_VARARGS, _curses_window_getkey__doc__},
+    {"getkey", _curses_window_getkey, METH_VARARGS, _curses_window_getkey__doc__},
 
 static PyObject *
 _curses_window_getkey_impl(PyCursesWindowObject *self, int group_right_1,
@@ -866,7 +866,7 @@ PyDoc_STRVAR(_curses_window_get_wch__doc__,
 "keypad keys, and other special keys.");
 
 #define _CURSES_WINDOW_GET_WCH_METHODDEF    \
-    {"get_wch", (PyCFunction)_curses_window_get_wch, METH_VARARGS, _curses_window_get_wch__doc__},
+    {"get_wch", _curses_window_get_wch, METH_VARARGS, _curses_window_get_wch__doc__},
 
 static PyObject *
 _curses_window_get_wch_impl(PyCursesWindowObject *self, int group_right_1,
@@ -917,7 +917,7 @@ PyDoc_STRVAR(_curses_window_hline__doc__,
 "    Attributes for the characters.");
 
 #define _CURSES_WINDOW_HLINE_METHODDEF    \
-    {"hline", (PyCFunction)_curses_window_hline, METH_VARARGS, _curses_window_hline__doc__},
+    {"hline", _curses_window_hline, METH_VARARGS, _curses_window_hline__doc__},
 
 static PyObject *
 _curses_window_hline_impl(PyCursesWindowObject *self, int group_left_1,
@@ -988,7 +988,7 @@ PyDoc_STRVAR(_curses_window_insch__doc__,
 "the rightmost characters on the line being lost.");
 
 #define _CURSES_WINDOW_INSCH_METHODDEF    \
-    {"insch", (PyCFunction)_curses_window_insch, METH_VARARGS, _curses_window_insch__doc__},
+    {"insch", _curses_window_insch, METH_VARARGS, _curses_window_insch__doc__},
 
 static PyObject *
 _curses_window_insch_impl(PyCursesWindowObject *self, int group_left_1,
@@ -1053,7 +1053,7 @@ PyDoc_STRVAR(_curses_window_inch__doc__,
 "The bottom 8 bits are the character proper, and upper bits are the attributes.");
 
 #define _CURSES_WINDOW_INCH_METHODDEF    \
-    {"inch", (PyCFunction)_curses_window_inch, METH_VARARGS, _curses_window_inch__doc__},
+    {"inch", _curses_window_inch, METH_VARARGS, _curses_window_inch__doc__},
 
 static unsigned long
 _curses_window_inch_impl(PyCursesWindowObject *self, int group_right_1,
@@ -1111,7 +1111,7 @@ PyDoc_STRVAR(_curses_window_insstr__doc__,
 "if specified).");
 
 #define _CURSES_WINDOW_INSSTR_METHODDEF    \
-    {"insstr", (PyCFunction)_curses_window_insstr, METH_VARARGS, _curses_window_insstr__doc__},
+    {"insstr", _curses_window_insstr, METH_VARARGS, _curses_window_insstr__doc__},
 
 static PyObject *
 _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,
@@ -1187,7 +1187,7 @@ PyDoc_STRVAR(_curses_window_insnstr__doc__,
 "specified).");
 
 #define _CURSES_WINDOW_INSNSTR_METHODDEF    \
-    {"insnstr", (PyCFunction)_curses_window_insnstr, METH_VARARGS, _curses_window_insnstr__doc__},
+    {"insnstr", _curses_window_insnstr, METH_VARARGS, _curses_window_insnstr__doc__},
 
 static PyObject *
 _curses_window_insnstr_impl(PyCursesWindowObject *self, int group_left_1,
@@ -1253,7 +1253,7 @@ PyDoc_STRVAR(_curses_window_is_linetouched__doc__,
 "Raise a curses.error exception if line is not valid for the given window.");
 
 #define _CURSES_WINDOW_IS_LINETOUCHED_METHODDEF    \
-    {"is_linetouched", (PyCFunction)_curses_window_is_linetouched, METH_O, _curses_window_is_linetouched__doc__},
+    {"is_linetouched", _curses_window_is_linetouched, METH_O, _curses_window_is_linetouched__doc__},
 
 static PyObject *
 _curses_window_is_linetouched_impl(PyCursesWindowObject *self, int line);
@@ -1285,7 +1285,7 @@ PyDoc_STRVAR(_curses_window_noutrefresh__doc__,
 "that, call doupdate().");
 
 #define _CURSES_WINDOW_NOUTREFRESH_METHODDEF    \
-    {"noutrefresh", (PyCFunction)_curses_window_noutrefresh, METH_VARARGS, _curses_window_noutrefresh__doc__},
+    {"noutrefresh", _curses_window_noutrefresh, METH_VARARGS, _curses_window_noutrefresh__doc__},
 
 static PyObject *
 _curses_window_noutrefresh_impl(PyCursesWindowObject *self,
@@ -1339,7 +1339,7 @@ PyDoc_STRVAR(_curses_window_noutrefresh__doc__,
 "that, call doupdate().");
 
 #define _CURSES_WINDOW_NOUTREFRESH_METHODDEF    \
-    {"noutrefresh", (PyCFunction)_curses_window_noutrefresh, METH_NOARGS, _curses_window_noutrefresh__doc__},
+    {"noutrefresh", _curses_window_noutrefresh, METH_NOARGS, _curses_window_noutrefresh__doc__},
 
 static PyObject *
 _curses_window_noutrefresh_impl(PyCursesWindowObject *self);
@@ -1366,7 +1366,7 @@ PyDoc_STRVAR(_curses_window_overlay__doc__,
 "destination window.");
 
 #define _CURSES_WINDOW_OVERLAY_METHODDEF    \
-    {"overlay", (PyCFunction)_curses_window_overlay, METH_VARARGS, _curses_window_overlay__doc__},
+    {"overlay", _curses_window_overlay, METH_VARARGS, _curses_window_overlay__doc__},
 
 static PyObject *
 _curses_window_overlay_impl(PyCursesWindowObject *self,
@@ -1424,7 +1424,7 @@ PyDoc_STRVAR(_curses_window_overwrite__doc__,
 "window.");
 
 #define _CURSES_WINDOW_OVERWRITE_METHODDEF    \
-    {"overwrite", (PyCFunction)_curses_window_overwrite, METH_VARARGS, _curses_window_overwrite__doc__},
+    {"overwrite", _curses_window_overwrite, METH_VARARGS, _curses_window_overwrite__doc__},
 
 static PyObject *
 _curses_window_overwrite_impl(PyCursesWindowObject *self,
@@ -1477,7 +1477,7 @@ PyDoc_STRVAR(_curses_window_putwin__doc__,
 "This information can be later retrieved using the getwin() function.");
 
 #define _CURSES_WINDOW_PUTWIN_METHODDEF    \
-    {"putwin", (PyCFunction)_curses_window_putwin, METH_O, _curses_window_putwin__doc__},
+    {"putwin", _curses_window_putwin, METH_O, _curses_window_putwin__doc__},
 
 static PyObject *
 _curses_window_putwin_impl(PyCursesWindowObject *self, PyObject *file);
@@ -1552,7 +1552,7 @@ PyDoc_STRVAR(_curses_window_refresh__doc__,
 "sminrow, or smincol are treated as if they were zero.");
 
 #define _CURSES_WINDOW_REFRESH_METHODDEF    \
-    {"refresh", (PyCFunction)_curses_window_refresh, METH_VARARGS, _curses_window_refresh__doc__},
+    {"refresh", _curses_window_refresh, METH_VARARGS, _curses_window_refresh__doc__},
 
 static PyObject *
 _curses_window_refresh_impl(PyCursesWindowObject *self, int group_right_1,
@@ -1651,7 +1651,7 @@ PyDoc_STRVAR(_curses_window_subwin__doc__,
 "lower right corner of the window.");
 
 #define _CURSES_WINDOW_SUBWIN_METHODDEF    \
-    {"subwin", (PyCFunction)_curses_window_subwin, METH_VARARGS, _curses_window_subwin__doc__},
+    {"subwin", _curses_window_subwin, METH_VARARGS, _curses_window_subwin__doc__},
 
 static PyObject *
 _curses_window_subwin_impl(PyCursesWindowObject *self, int group_left_1,
@@ -1699,7 +1699,7 @@ PyDoc_STRVAR(_curses_window_scroll__doc__,
 "Scroll upward if the argument is positive and downward if it is negative.");
 
 #define _CURSES_WINDOW_SCROLL_METHODDEF    \
-    {"scroll", (PyCFunction)_curses_window_scroll, METH_VARARGS, _curses_window_scroll__doc__},
+    {"scroll", _curses_window_scroll, METH_VARARGS, _curses_window_scroll__doc__},
 
 static PyObject *
 _curses_window_scroll_impl(PyCursesWindowObject *self, int group_right_1,
@@ -1739,7 +1739,7 @@ PyDoc_STRVAR(_curses_window_touchline__doc__,
 "as having been changed (changed=True) or unchanged (changed=False).");
 
 #define _CURSES_WINDOW_TOUCHLINE_METHODDEF    \
-    {"touchline", (PyCFunction)_curses_window_touchline, METH_VARARGS, _curses_window_touchline__doc__},
+    {"touchline", _curses_window_touchline, METH_VARARGS, _curses_window_touchline__doc__},
 
 static PyObject *
 _curses_window_touchline_impl(PyCursesWindowObject *self, int start,
@@ -1792,7 +1792,7 @@ PyDoc_STRVAR(_curses_window_vline__doc__,
 "    Attributes for the character.");
 
 #define _CURSES_WINDOW_VLINE_METHODDEF    \
-    {"vline", (PyCFunction)_curses_window_vline, METH_VARARGS, _curses_window_vline__doc__},
+    {"vline", _curses_window_vline, METH_VARARGS, _curses_window_vline__doc__},
 
 static PyObject *
 _curses_window_vline_impl(PyCursesWindowObject *self, int group_left_1,
@@ -1854,7 +1854,7 @@ PyDoc_STRVAR(_curses_filter__doc__,
 "\n");
 
 #define _CURSES_FILTER_METHODDEF    \
-    {"filter", (PyCFunction)_curses_filter, METH_NOARGS, _curses_filter__doc__},
+    {"filter", _curses_filter, METH_NOARGS, _curses_filter__doc__},
 
 static PyObject *
 _curses_filter_impl(PyObject *module);
@@ -1874,7 +1874,7 @@ PyDoc_STRVAR(_curses_baudrate__doc__,
 "Return the output speed of the terminal in bits per second.");
 
 #define _CURSES_BAUDRATE_METHODDEF    \
-    {"baudrate", (PyCFunction)_curses_baudrate, METH_NOARGS, _curses_baudrate__doc__},
+    {"baudrate", _curses_baudrate, METH_NOARGS, _curses_baudrate__doc__},
 
 static PyObject *
 _curses_baudrate_impl(PyObject *module);
@@ -1892,7 +1892,7 @@ PyDoc_STRVAR(_curses_beep__doc__,
 "Emit a short attention sound.");
 
 #define _CURSES_BEEP_METHODDEF    \
-    {"beep", (PyCFunction)_curses_beep, METH_NOARGS, _curses_beep__doc__},
+    {"beep", _curses_beep, METH_NOARGS, _curses_beep__doc__},
 
 static PyObject *
 _curses_beep_impl(PyObject *module);
@@ -1910,7 +1910,7 @@ PyDoc_STRVAR(_curses_can_change_color__doc__,
 "Return True if the programmer can change the colors displayed by the terminal.");
 
 #define _CURSES_CAN_CHANGE_COLOR_METHODDEF    \
-    {"can_change_color", (PyCFunction)_curses_can_change_color, METH_NOARGS, _curses_can_change_color__doc__},
+    {"can_change_color", _curses_can_change_color, METH_NOARGS, _curses_can_change_color__doc__},
 
 static PyObject *
 _curses_can_change_color_impl(PyObject *module);
@@ -1978,7 +1978,7 @@ PyDoc_STRVAR(_curses_color_content__doc__,
 "which will be between 0 (no component) and 1000 (maximum amount of component).");
 
 #define _CURSES_COLOR_CONTENT_METHODDEF    \
-    {"color_content", (PyCFunction)_curses_color_content, METH_O, _curses_color_content__doc__},
+    {"color_content", _curses_color_content, METH_O, _curses_color_content__doc__},
 
 static PyObject *
 _curses_color_content_impl(PyObject *module, int color_number);
@@ -2011,7 +2011,7 @@ PyDoc_STRVAR(_curses_color_pair__doc__,
 "other A_* attributes.  pair_number() is the counterpart to this function.");
 
 #define _CURSES_COLOR_PAIR_METHODDEF    \
-    {"color_pair", (PyCFunction)_curses_color_pair, METH_O, _curses_color_pair__doc__},
+    {"color_pair", _curses_color_pair, METH_O, _curses_color_pair__doc__},
 
 static PyObject *
 _curses_color_pair_impl(PyObject *module, int pair_number);
@@ -2047,7 +2047,7 @@ PyDoc_STRVAR(_curses_curs_set__doc__,
 "a block cursor.");
 
 #define _CURSES_CURS_SET_METHODDEF    \
-    {"curs_set", (PyCFunction)_curses_curs_set, METH_O, _curses_curs_set__doc__},
+    {"curs_set", _curses_curs_set, METH_O, _curses_curs_set__doc__},
 
 static PyObject *
 _curses_curs_set_impl(PyObject *module, int visibility);
@@ -2079,7 +2079,7 @@ PyDoc_STRVAR(_curses_def_prog_mode__doc__,
 "Subsequent calls to reset_prog_mode() will restore this mode.");
 
 #define _CURSES_DEF_PROG_MODE_METHODDEF    \
-    {"def_prog_mode", (PyCFunction)_curses_def_prog_mode, METH_NOARGS, _curses_def_prog_mode__doc__},
+    {"def_prog_mode", _curses_def_prog_mode, METH_NOARGS, _curses_def_prog_mode__doc__},
 
 static PyObject *
 _curses_def_prog_mode_impl(PyObject *module);
@@ -2101,7 +2101,7 @@ PyDoc_STRVAR(_curses_def_shell_mode__doc__,
 "Subsequent calls to reset_shell_mode() will restore this mode.");
 
 #define _CURSES_DEF_SHELL_MODE_METHODDEF    \
-    {"def_shell_mode", (PyCFunction)_curses_def_shell_mode, METH_NOARGS, _curses_def_shell_mode__doc__},
+    {"def_shell_mode", _curses_def_shell_mode, METH_NOARGS, _curses_def_shell_mode__doc__},
 
 static PyObject *
 _curses_def_shell_mode_impl(PyObject *module);
@@ -2122,7 +2122,7 @@ PyDoc_STRVAR(_curses_delay_output__doc__,
 "    Duration in milliseconds.");
 
 #define _CURSES_DELAY_OUTPUT_METHODDEF    \
-    {"delay_output", (PyCFunction)_curses_delay_output, METH_O, _curses_delay_output__doc__},
+    {"delay_output", _curses_delay_output, METH_O, _curses_delay_output__doc__},
 
 static PyObject *
 _curses_delay_output_impl(PyObject *module, int ms);
@@ -2150,7 +2150,7 @@ PyDoc_STRVAR(_curses_doupdate__doc__,
 "Update the physical screen to match the virtual screen.");
 
 #define _CURSES_DOUPDATE_METHODDEF    \
-    {"doupdate", (PyCFunction)_curses_doupdate, METH_NOARGS, _curses_doupdate__doc__},
+    {"doupdate", _curses_doupdate, METH_NOARGS, _curses_doupdate__doc__},
 
 static PyObject *
 _curses_doupdate_impl(PyObject *module);
@@ -2208,7 +2208,7 @@ PyDoc_STRVAR(_curses_endwin__doc__,
 "De-initialize the library, and return terminal to normal status.");
 
 #define _CURSES_ENDWIN_METHODDEF    \
-    {"endwin", (PyCFunction)_curses_endwin, METH_NOARGS, _curses_endwin__doc__},
+    {"endwin", _curses_endwin, METH_NOARGS, _curses_endwin__doc__},
 
 static PyObject *
 _curses_endwin_impl(PyObject *module);
@@ -2226,7 +2226,7 @@ PyDoc_STRVAR(_curses_erasechar__doc__,
 "Return the user\'s current erase character.");
 
 #define _CURSES_ERASECHAR_METHODDEF    \
-    {"erasechar", (PyCFunction)_curses_erasechar, METH_NOARGS, _curses_erasechar__doc__},
+    {"erasechar", _curses_erasechar, METH_NOARGS, _curses_erasechar__doc__},
 
 static PyObject *
 _curses_erasechar_impl(PyObject *module);
@@ -2246,7 +2246,7 @@ PyDoc_STRVAR(_curses_flash__doc__,
 "That is, change it to reverse-video and then change it back in a short interval.");
 
 #define _CURSES_FLASH_METHODDEF    \
-    {"flash", (PyCFunction)_curses_flash, METH_NOARGS, _curses_flash__doc__},
+    {"flash", _curses_flash, METH_NOARGS, _curses_flash__doc__},
 
 static PyObject *
 _curses_flash_impl(PyObject *module);
@@ -2267,7 +2267,7 @@ PyDoc_STRVAR(_curses_flushinp__doc__,
 "yet been processed by the program.");
 
 #define _CURSES_FLUSHINP_METHODDEF    \
-    {"flushinp", (PyCFunction)_curses_flushinp, METH_NOARGS, _curses_flushinp__doc__},
+    {"flushinp", _curses_flushinp, METH_NOARGS, _curses_flushinp__doc__},
 
 static PyObject *
 _curses_flushinp_impl(PyObject *module);
@@ -2289,7 +2289,7 @@ PyDoc_STRVAR(_curses_getsyx__doc__,
 "Return a (y, x) tuple.  If leaveok is currently true, return (-1, -1).");
 
 #define _CURSES_GETSYX_METHODDEF    \
-    {"getsyx", (PyCFunction)_curses_getsyx, METH_NOARGS, _curses_getsyx__doc__},
+    {"getsyx", _curses_getsyx, METH_NOARGS, _curses_getsyx__doc__},
 
 static PyObject *
 _curses_getsyx_impl(PyObject *module);
@@ -2314,7 +2314,7 @@ PyDoc_STRVAR(_curses_getmouse__doc__,
 "returns a 5-tuple (id, x, y, z, bstate).");
 
 #define _CURSES_GETMOUSE_METHODDEF    \
-    {"getmouse", (PyCFunction)_curses_getmouse, METH_NOARGS, _curses_getmouse__doc__},
+    {"getmouse", _curses_getmouse, METH_NOARGS, _curses_getmouse__doc__},
 
 static PyObject *
 _curses_getmouse_impl(PyObject *module);
@@ -2411,7 +2411,7 @@ PyDoc_STRVAR(_curses_getwin__doc__,
 "returning the new window object.");
 
 #define _CURSES_GETWIN_METHODDEF    \
-    {"getwin", (PyCFunction)_curses_getwin, METH_O, _curses_getwin__doc__},
+    {"getwin", _curses_getwin, METH_O, _curses_getwin__doc__},
 
 PyDoc_STRVAR(_curses_halfdelay__doc__,
 "halfdelay($module, tenths, /)\n"
@@ -2425,7 +2425,7 @@ PyDoc_STRVAR(_curses_halfdelay__doc__,
 "Use nocbreak() to leave half-delay mode.");
 
 #define _CURSES_HALFDELAY_METHODDEF    \
-    {"halfdelay", (PyCFunction)_curses_halfdelay, METH_O, _curses_halfdelay__doc__},
+    {"halfdelay", _curses_halfdelay, METH_O, _curses_halfdelay__doc__},
 
 static PyObject *
 _curses_halfdelay_impl(PyObject *module, unsigned char tenths);
@@ -2468,7 +2468,7 @@ PyDoc_STRVAR(_curses_has_colors__doc__,
 "Return True if the terminal can display colors; otherwise, return False.");
 
 #define _CURSES_HAS_COLORS_METHODDEF    \
-    {"has_colors", (PyCFunction)_curses_has_colors, METH_NOARGS, _curses_has_colors__doc__},
+    {"has_colors", _curses_has_colors, METH_NOARGS, _curses_has_colors__doc__},
 
 static PyObject *
 _curses_has_colors_impl(PyObject *module);
@@ -2486,7 +2486,7 @@ PyDoc_STRVAR(_curses_has_ic__doc__,
 "Return True if the terminal has insert- and delete-character capabilities.");
 
 #define _CURSES_HAS_IC_METHODDEF    \
-    {"has_ic", (PyCFunction)_curses_has_ic, METH_NOARGS, _curses_has_ic__doc__},
+    {"has_ic", _curses_has_ic, METH_NOARGS, _curses_has_ic__doc__},
 
 static PyObject *
 _curses_has_ic_impl(PyObject *module);
@@ -2504,7 +2504,7 @@ PyDoc_STRVAR(_curses_has_il__doc__,
 "Return True if the terminal has insert- and delete-line capabilities.");
 
 #define _CURSES_HAS_IL_METHODDEF    \
-    {"has_il", (PyCFunction)_curses_has_il, METH_NOARGS, _curses_has_il__doc__},
+    {"has_il", _curses_has_il, METH_NOARGS, _curses_has_il__doc__},
 
 static PyObject *
 _curses_has_il_impl(PyObject *module);
@@ -2527,7 +2527,7 @@ PyDoc_STRVAR(_curses_has_key__doc__,
 "    Key number.");
 
 #define _CURSES_HAS_KEY_METHODDEF    \
-    {"has_key", (PyCFunction)_curses_has_key, METH_O, _curses_has_key__doc__},
+    {"has_key", _curses_has_key, METH_O, _curses_has_key__doc__},
 
 static PyObject *
 _curses_has_key_impl(PyObject *module, int key);
@@ -2663,7 +2663,7 @@ PyDoc_STRVAR(_curses_initscr__doc__,
 "Return a WindowObject which represents the whole screen.");
 
 #define _CURSES_INITSCR_METHODDEF    \
-    {"initscr", (PyCFunction)_curses_initscr, METH_NOARGS, _curses_initscr__doc__},
+    {"initscr", _curses_initscr, METH_NOARGS, _curses_initscr__doc__},
 
 static PyObject *
 _curses_initscr_impl(PyObject *module);
@@ -2784,7 +2784,7 @@ PyDoc_STRVAR(_curses_get_escdelay__doc__,
 "keyboard from escape sequences sent by cursor and function keys.");
 
 #define _CURSES_GET_ESCDELAY_METHODDEF    \
-    {"get_escdelay", (PyCFunction)_curses_get_escdelay, METH_NOARGS, _curses_get_escdelay__doc__},
+    {"get_escdelay", _curses_get_escdelay, METH_NOARGS, _curses_get_escdelay__doc__},
 
 static PyObject *
 _curses_get_escdelay_impl(PyObject *module);
@@ -2813,7 +2813,7 @@ PyDoc_STRVAR(_curses_set_escdelay__doc__,
 "keyboard from escape sequences sent by cursor and function keys.");
 
 #define _CURSES_SET_ESCDELAY_METHODDEF    \
-    {"set_escdelay", (PyCFunction)_curses_set_escdelay, METH_O, _curses_set_escdelay__doc__},
+    {"set_escdelay", _curses_set_escdelay, METH_O, _curses_set_escdelay__doc__},
 
 static PyObject *
 _curses_set_escdelay_impl(PyObject *module, int ms);
@@ -2848,7 +2848,7 @@ PyDoc_STRVAR(_curses_get_tabsize__doc__,
 "character to spaces as it adds the tab to a window.");
 
 #define _CURSES_GET_TABSIZE_METHODDEF    \
-    {"get_tabsize", (PyCFunction)_curses_get_tabsize, METH_NOARGS, _curses_get_tabsize__doc__},
+    {"get_tabsize", _curses_get_tabsize, METH_NOARGS, _curses_get_tabsize__doc__},
 
 static PyObject *
 _curses_get_tabsize_impl(PyObject *module);
@@ -2876,7 +2876,7 @@ PyDoc_STRVAR(_curses_set_tabsize__doc__,
 "character to spaces as it adds the tab to a window.");
 
 #define _CURSES_SET_TABSIZE_METHODDEF    \
-    {"set_tabsize", (PyCFunction)_curses_set_tabsize, METH_O, _curses_set_tabsize__doc__},
+    {"set_tabsize", _curses_set_tabsize, METH_O, _curses_set_tabsize__doc__},
 
 static PyObject *
 _curses_set_tabsize_impl(PyObject *module, int size);
@@ -2905,7 +2905,7 @@ PyDoc_STRVAR(_curses_intrflush__doc__,
 "\n");
 
 #define _CURSES_INTRFLUSH_METHODDEF    \
-    {"intrflush", (PyCFunction)_curses_intrflush, METH_O, _curses_intrflush__doc__},
+    {"intrflush", _curses_intrflush, METH_O, _curses_intrflush__doc__},
 
 static PyObject *
 _curses_intrflush_impl(PyObject *module, int flag);
@@ -2933,7 +2933,7 @@ PyDoc_STRVAR(_curses_isendwin__doc__,
 "Return True if endwin() has been called.");
 
 #define _CURSES_ISENDWIN_METHODDEF    \
-    {"isendwin", (PyCFunction)_curses_isendwin, METH_NOARGS, _curses_isendwin__doc__},
+    {"isendwin", _curses_isendwin, METH_NOARGS, _curses_isendwin__doc__},
 
 static PyObject *
 _curses_isendwin_impl(PyObject *module);
@@ -2999,7 +2999,7 @@ PyDoc_STRVAR(_curses_keyname__doc__,
 "    Key number.");
 
 #define _CURSES_KEYNAME_METHODDEF    \
-    {"keyname", (PyCFunction)_curses_keyname, METH_O, _curses_keyname__doc__},
+    {"keyname", _curses_keyname, METH_O, _curses_keyname__doc__},
 
 static PyObject *
 _curses_keyname_impl(PyObject *module, int key);
@@ -3027,7 +3027,7 @@ PyDoc_STRVAR(_curses_killchar__doc__,
 "Return the user\'s current line kill character.");
 
 #define _CURSES_KILLCHAR_METHODDEF    \
-    {"killchar", (PyCFunction)_curses_killchar, METH_NOARGS, _curses_killchar__doc__},
+    {"killchar", _curses_killchar, METH_NOARGS, _curses_killchar__doc__},
 
 static PyObject *
 _curses_killchar_impl(PyObject *module);
@@ -3048,7 +3048,7 @@ PyDoc_STRVAR(_curses_longname__doc__,
 "only after the call to initscr().");
 
 #define _CURSES_LONGNAME_METHODDEF    \
-    {"longname", (PyCFunction)_curses_longname, METH_NOARGS, _curses_longname__doc__},
+    {"longname", _curses_longname, METH_NOARGS, _curses_longname__doc__},
 
 static PyObject *
 _curses_longname_impl(PyObject *module);
@@ -3069,7 +3069,7 @@ PyDoc_STRVAR(_curses_meta__doc__,
 "allow only 7-bit characters.");
 
 #define _CURSES_META_METHODDEF    \
-    {"meta", (PyCFunction)_curses_meta, METH_O, _curses_meta__doc__},
+    {"meta", _curses_meta, METH_O, _curses_meta__doc__},
 
 static PyObject *
 _curses_meta_impl(PyObject *module, int yes);
@@ -3106,7 +3106,7 @@ PyDoc_STRVAR(_curses_mouseinterval__doc__,
 "value.");
 
 #define _CURSES_MOUSEINTERVAL_METHODDEF    \
-    {"mouseinterval", (PyCFunction)_curses_mouseinterval, METH_O, _curses_mouseinterval__doc__},
+    {"mouseinterval", _curses_mouseinterval, METH_O, _curses_mouseinterval__doc__},
 
 static PyObject *
 _curses_mouseinterval_impl(PyObject *module, int interval);
@@ -3143,7 +3143,7 @@ PyDoc_STRVAR(_curses_mousemask__doc__,
 "If this function is never called, no mouse events are ever reported.");
 
 #define _CURSES_MOUSEMASK_METHODDEF    \
-    {"mousemask", (PyCFunction)_curses_mousemask, METH_O, _curses_mousemask__doc__},
+    {"mousemask", _curses_mousemask, METH_O, _curses_mousemask__doc__},
 
 static PyObject *
 _curses_mousemask_impl(PyObject *module, unsigned long newmask);
@@ -3177,7 +3177,7 @@ PyDoc_STRVAR(_curses_napms__doc__,
 "    Duration in milliseconds.");
 
 #define _CURSES_NAPMS_METHODDEF    \
-    {"napms", (PyCFunction)_curses_napms, METH_O, _curses_napms__doc__},
+    {"napms", _curses_napms, METH_O, _curses_napms__doc__},
 
 static int
 _curses_napms_impl(PyObject *module, int ms);
@@ -3261,7 +3261,7 @@ PyDoc_STRVAR(_curses_newwin__doc__,
 "right corner of the screen.");
 
 #define _CURSES_NEWWIN_METHODDEF    \
-    {"newwin", (PyCFunction)_curses_newwin, METH_VARARGS, _curses_newwin__doc__},
+    {"newwin", _curses_newwin, METH_VARARGS, _curses_newwin__doc__},
 
 static PyObject *
 _curses_newwin_impl(PyObject *module, int nlines, int ncols,
@@ -3349,7 +3349,7 @@ PyDoc_STRVAR(_curses_nocbreak__doc__,
 "Return to normal \"cooked\" mode with line buffering.");
 
 #define _CURSES_NOCBREAK_METHODDEF    \
-    {"nocbreak", (PyCFunction)_curses_nocbreak, METH_NOARGS, _curses_nocbreak__doc__},
+    {"nocbreak", _curses_nocbreak, METH_NOARGS, _curses_nocbreak__doc__},
 
 static PyObject *
 _curses_nocbreak_impl(PyObject *module);
@@ -3369,7 +3369,7 @@ PyDoc_STRVAR(_curses_noecho__doc__,
 "Echoing of input characters is turned off.");
 
 #define _CURSES_NOECHO_METHODDEF    \
-    {"noecho", (PyCFunction)_curses_noecho, METH_NOARGS, _curses_noecho__doc__},
+    {"noecho", _curses_noecho, METH_NOARGS, _curses_noecho__doc__},
 
 static PyObject *
 _curses_noecho_impl(PyObject *module);
@@ -3390,7 +3390,7 @@ PyDoc_STRVAR(_curses_nonl__doc__,
 "translation of newline into newline/return on output.");
 
 #define _CURSES_NONL_METHODDEF    \
-    {"nonl", (PyCFunction)_curses_nonl, METH_NOARGS, _curses_nonl__doc__},
+    {"nonl", _curses_nonl, METH_NOARGS, _curses_nonl__doc__},
 
 static PyObject *
 _curses_nonl_impl(PyObject *module);
@@ -3411,7 +3411,7 @@ PyDoc_STRVAR(_curses_noqiflush__doc__,
 "associated with the INTR, QUIT and SUSP characters will not be done.");
 
 #define _CURSES_NOQIFLUSH_METHODDEF    \
-    {"noqiflush", (PyCFunction)_curses_noqiflush, METH_NOARGS, _curses_noqiflush__doc__},
+    {"noqiflush", _curses_noqiflush, METH_NOARGS, _curses_noqiflush__doc__},
 
 static PyObject *
 _curses_noqiflush_impl(PyObject *module);
@@ -3431,7 +3431,7 @@ PyDoc_STRVAR(_curses_noraw__doc__,
 "Return to normal \"cooked\" mode with line buffering.");
 
 #define _CURSES_NORAW_METHODDEF    \
-    {"noraw", (PyCFunction)_curses_noraw, METH_NOARGS, _curses_noraw__doc__},
+    {"noraw", _curses_noraw, METH_NOARGS, _curses_noraw__doc__},
 
 static PyObject *
 _curses_noraw_impl(PyObject *module);
@@ -3452,7 +3452,7 @@ PyDoc_STRVAR(_curses_pair_content__doc__,
 "    The number of the color pair (0 - (COLOR_PAIRS-1)).");
 
 #define _CURSES_PAIR_CONTENT_METHODDEF    \
-    {"pair_content", (PyCFunction)_curses_pair_content, METH_O, _curses_pair_content__doc__},
+    {"pair_content", _curses_pair_content, METH_O, _curses_pair_content__doc__},
 
 static PyObject *
 _curses_pair_content_impl(PyObject *module, int pair_number);
@@ -3481,7 +3481,7 @@ PyDoc_STRVAR(_curses_pair_number__doc__,
 "color_pair() is the counterpart to this function.");
 
 #define _CURSES_PAIR_NUMBER_METHODDEF    \
-    {"pair_number", (PyCFunction)_curses_pair_number, METH_O, _curses_pair_number__doc__},
+    {"pair_number", _curses_pair_number, METH_O, _curses_pair_number__doc__},
 
 static PyObject *
 _curses_pair_number_impl(PyObject *module, int attr);
@@ -3511,7 +3511,7 @@ PyDoc_STRVAR(_curses_putp__doc__,
 "Note that the output of putp() always goes to standard output.");
 
 #define _CURSES_PUTP_METHODDEF    \
-    {"putp", (PyCFunction)_curses_putp, METH_O, _curses_putp__doc__},
+    {"putp", _curses_putp, METH_O, _curses_putp__doc__},
 
 static PyObject *
 _curses_putp_impl(PyObject *module, const char *string);
@@ -3580,7 +3580,7 @@ PyDoc_STRVAR(_curses_update_lines_cols__doc__,
 "\n");
 
 #define _CURSES_UPDATE_LINES_COLS_METHODDEF    \
-    {"update_lines_cols", (PyCFunction)_curses_update_lines_cols, METH_NOARGS, _curses_update_lines_cols__doc__},
+    {"update_lines_cols", _curses_update_lines_cols, METH_NOARGS, _curses_update_lines_cols__doc__},
 
 static PyObject *
 _curses_update_lines_cols_impl(PyObject *module);
@@ -3642,7 +3642,7 @@ PyDoc_STRVAR(_curses_reset_prog_mode__doc__,
 "Restore the terminal to \"program\" mode, as previously saved by def_prog_mode().");
 
 #define _CURSES_RESET_PROG_MODE_METHODDEF    \
-    {"reset_prog_mode", (PyCFunction)_curses_reset_prog_mode, METH_NOARGS, _curses_reset_prog_mode__doc__},
+    {"reset_prog_mode", _curses_reset_prog_mode, METH_NOARGS, _curses_reset_prog_mode__doc__},
 
 static PyObject *
 _curses_reset_prog_mode_impl(PyObject *module);
@@ -3660,7 +3660,7 @@ PyDoc_STRVAR(_curses_reset_shell_mode__doc__,
 "Restore the terminal to \"shell\" mode, as previously saved by def_shell_mode().");
 
 #define _CURSES_RESET_SHELL_MODE_METHODDEF    \
-    {"reset_shell_mode", (PyCFunction)_curses_reset_shell_mode, METH_NOARGS, _curses_reset_shell_mode__doc__},
+    {"reset_shell_mode", _curses_reset_shell_mode, METH_NOARGS, _curses_reset_shell_mode__doc__},
 
 static PyObject *
 _curses_reset_shell_mode_impl(PyObject *module);
@@ -3678,7 +3678,7 @@ PyDoc_STRVAR(_curses_resetty__doc__,
 "Restore terminal mode.");
 
 #define _CURSES_RESETTY_METHODDEF    \
-    {"resetty", (PyCFunction)_curses_resetty, METH_NOARGS, _curses_resetty__doc__},
+    {"resetty", _curses_resetty, METH_NOARGS, _curses_resetty__doc__},
 
 static PyObject *
 _curses_resetty_impl(PyObject *module);
@@ -3855,7 +3855,7 @@ PyDoc_STRVAR(_curses_savetty__doc__,
 "Save terminal mode.");
 
 #define _CURSES_SAVETTY_METHODDEF    \
-    {"savetty", (PyCFunction)_curses_savetty, METH_NOARGS, _curses_savetty__doc__},
+    {"savetty", _curses_savetty, METH_NOARGS, _curses_savetty__doc__},
 
 static PyObject *
 _curses_savetty_impl(PyObject *module);
@@ -3927,7 +3927,7 @@ PyDoc_STRVAR(_curses_start_color__doc__,
 "terminal was just turned on.");
 
 #define _CURSES_START_COLOR_METHODDEF    \
-    {"start_color", (PyCFunction)_curses_start_color, METH_NOARGS, _curses_start_color__doc__},
+    {"start_color", _curses_start_color, METH_NOARGS, _curses_start_color__doc__},
 
 static PyObject *
 _curses_start_color_impl(PyObject *module);
@@ -3945,7 +3945,7 @@ PyDoc_STRVAR(_curses_termattrs__doc__,
 "Return a logical OR of all video attributes supported by the terminal.");
 
 #define _CURSES_TERMATTRS_METHODDEF    \
-    {"termattrs", (PyCFunction)_curses_termattrs, METH_NOARGS, _curses_termattrs__doc__},
+    {"termattrs", _curses_termattrs, METH_NOARGS, _curses_termattrs__doc__},
 
 static PyObject *
 _curses_termattrs_impl(PyObject *module);
@@ -3963,7 +3963,7 @@ PyDoc_STRVAR(_curses_termname__doc__,
 "Return the value of the environment variable TERM, truncated to 14 characters.");
 
 #define _CURSES_TERMNAME_METHODDEF    \
-    {"termname", (PyCFunction)_curses_termname, METH_NOARGS, _curses_termname__doc__},
+    {"termname", _curses_termname, METH_NOARGS, _curses_termname__doc__},
 
 static PyObject *
 _curses_termname_impl(PyObject *module);
@@ -3987,7 +3987,7 @@ PyDoc_STRVAR(_curses_tigetflag__doc__,
 "it is canceled or absent from the terminal description.");
 
 #define _CURSES_TIGETFLAG_METHODDEF    \
-    {"tigetflag", (PyCFunction)_curses_tigetflag, METH_O, _curses_tigetflag__doc__},
+    {"tigetflag", _curses_tigetflag, METH_O, _curses_tigetflag__doc__},
 
 static PyObject *
 _curses_tigetflag_impl(PyObject *module, const char *capname);
@@ -4030,7 +4030,7 @@ PyDoc_STRVAR(_curses_tigetnum__doc__,
 "it is canceled or absent from the terminal description.");
 
 #define _CURSES_TIGETNUM_METHODDEF    \
-    {"tigetnum", (PyCFunction)_curses_tigetnum, METH_O, _curses_tigetnum__doc__},
+    {"tigetnum", _curses_tigetnum, METH_O, _curses_tigetnum__doc__},
 
 static PyObject *
 _curses_tigetnum_impl(PyObject *module, const char *capname);
@@ -4073,7 +4073,7 @@ PyDoc_STRVAR(_curses_tigetstr__doc__,
 "absent from the terminal description.");
 
 #define _CURSES_TIGETSTR_METHODDEF    \
-    {"tigetstr", (PyCFunction)_curses_tigetstr, METH_O, _curses_tigetstr__doc__},
+    {"tigetstr", _curses_tigetstr, METH_O, _curses_tigetstr__doc__},
 
 static PyObject *
 _curses_tigetstr_impl(PyObject *module, const char *capname);
@@ -4159,7 +4159,7 @@ PyDoc_STRVAR(_curses_typeahead__doc__,
 "If fd is -1, then no typeahead checking is done.");
 
 #define _CURSES_TYPEAHEAD_METHODDEF    \
-    {"typeahead", (PyCFunction)_curses_typeahead, METH_O, _curses_typeahead__doc__},
+    {"typeahead", _curses_typeahead, METH_O, _curses_typeahead__doc__},
 
 static PyObject *
 _curses_typeahead_impl(PyObject *module, int fd);
@@ -4192,7 +4192,7 @@ PyDoc_STRVAR(_curses_unctrl__doc__,
 "for example as ^C.  Printing characters are left as they are.");
 
 #define _CURSES_UNCTRL_METHODDEF    \
-    {"unctrl", (PyCFunction)_curses_unctrl, METH_O, _curses_unctrl__doc__},
+    {"unctrl", _curses_unctrl, METH_O, _curses_unctrl__doc__},
 
 PyDoc_STRVAR(_curses_ungetch__doc__,
 "ungetch($module, ch, /)\n"
@@ -4201,7 +4201,7 @@ PyDoc_STRVAR(_curses_ungetch__doc__,
 "Push ch so the next getch() will return it.");
 
 #define _CURSES_UNGETCH_METHODDEF    \
-    {"ungetch", (PyCFunction)_curses_ungetch, METH_O, _curses_ungetch__doc__},
+    {"ungetch", _curses_ungetch, METH_O, _curses_ungetch__doc__},
 
 #if defined(HAVE_NCURSESW)
 
@@ -4212,7 +4212,7 @@ PyDoc_STRVAR(_curses_unget_wch__doc__,
 "Push ch so the next get_wch() will return it.");
 
 #define _CURSES_UNGET_WCH_METHODDEF    \
-    {"unget_wch", (PyCFunction)_curses_unget_wch, METH_O, _curses_unget_wch__doc__},
+    {"unget_wch", _curses_unget_wch, METH_O, _curses_unget_wch__doc__},
 
 #endif /* defined(HAVE_NCURSESW) */
 
@@ -4234,7 +4234,7 @@ PyDoc_STRVAR(_curses_use_env__doc__,
 "not set).");
 
 #define _CURSES_USE_ENV_METHODDEF    \
-    {"use_env", (PyCFunction)_curses_use_env, METH_O, _curses_use_env__doc__},
+    {"use_env", _curses_use_env, METH_O, _curses_use_env__doc__},
 
 static PyObject *
 _curses_use_env_impl(PyObject *module, int flag);
@@ -4269,7 +4269,7 @@ PyDoc_STRVAR(_curses_use_default_colors__doc__,
 "is assigned to the color number -1.");
 
 #define _CURSES_USE_DEFAULT_COLORS_METHODDEF    \
-    {"use_default_colors", (PyCFunction)_curses_use_default_colors, METH_NOARGS, _curses_use_default_colors__doc__},
+    {"use_default_colors", _curses_use_default_colors, METH_NOARGS, _curses_use_default_colors__doc__},
 
 static PyObject *
 _curses_use_default_colors_impl(PyObject *module);
@@ -4292,7 +4292,7 @@ PyDoc_STRVAR(_curses_has_extended_color_support__doc__,
 "that support more than 16 colors (e.g. xterm-256color).");
 
 #define _CURSES_HAS_EXTENDED_COLOR_SUPPORT_METHODDEF    \
-    {"has_extended_color_support", (PyCFunction)_curses_has_extended_color_support, METH_NOARGS, _curses_has_extended_color_support__doc__},
+    {"has_extended_color_support", _curses_has_extended_color_support, METH_NOARGS, _curses_has_extended_color_support__doc__},
 
 static PyObject *
 _curses_has_extended_color_support_impl(PyObject *module);
@@ -4394,4 +4394,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=acae2eb9cf75e76d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=108535fddc4db864 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_datetimemodule.c.h b/Modules/clinic/_datetimemodule.c.h
index 18e6129fad8a89..23f5e5b87335cb 100644
--- a/Modules/clinic/_datetimemodule.c.h
+++ b/Modules/clinic/_datetimemodule.c.h
@@ -18,7 +18,7 @@ PyDoc_STRVAR(datetime_date_fromtimestamp__doc__,
 "as local time.");
 
 #define DATETIME_DATE_FROMTIMESTAMP_METHODDEF    \
-    {"fromtimestamp", (PyCFunction)datetime_date_fromtimestamp, METH_O|METH_CLASS, datetime_date_fromtimestamp__doc__},
+    {"fromtimestamp", datetime_date_fromtimestamp, METH_O|METH_CLASS, datetime_date_fromtimestamp__doc__},
 
 static PyObject *
 datetime_date_fromtimestamp_impl(PyTypeObject *type, PyObject *timestamp);
@@ -524,4 +524,4 @@ datetime_datetime_replace(PyObject *self, PyObject *const *args, Py_ssize_t narg
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=809640e747529c72 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d6636f4b4c0e1286 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h
index 5e503194408776..4b13df326b2b9c 100644
--- a/Modules/clinic/_dbmmodule.c.h
+++ b/Modules/clinic/_dbmmodule.c.h
@@ -14,7 +14,7 @@ PyDoc_STRVAR(_dbm_dbm_close__doc__,
 "Close the database.");
 
 #define _DBM_DBM_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_dbm_dbm_close, METH_NOARGS, _dbm_dbm_close__doc__},
+    {"close", _dbm_dbm_close, METH_NOARGS, _dbm_dbm_close__doc__},
 
 static PyObject *
 _dbm_dbm_close_impl(dbmobject *self);
@@ -221,4 +221,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3b456118f231b160 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=eafa31670cd71bae input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h
index c9e77a4c2b92d8..894af77b9fba57 100644
--- a/Modules/clinic/_elementtree.c.h
+++ b/Modules/clinic/_elementtree.c.h
@@ -63,7 +63,7 @@ PyDoc_STRVAR(_elementtree_Element_clear__doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)_elementtree_Element_clear, METH_NOARGS, _elementtree_Element_clear__doc__},
+    {"clear", _elementtree_Element_clear, METH_NOARGS, _elementtree_Element_clear__doc__},
 
 static PyObject *
 _elementtree_Element_clear_impl(ElementObject *self);
@@ -101,7 +101,7 @@ PyDoc_STRVAR(_elementtree_Element___deepcopy____doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT___DEEPCOPY___METHODDEF    \
-    {"__deepcopy__", (PyCFunction)_elementtree_Element___deepcopy__, METH_O, _elementtree_Element___deepcopy____doc__},
+    {"__deepcopy__", _elementtree_Element___deepcopy__, METH_O, _elementtree_Element___deepcopy____doc__},
 
 static PyObject *
 _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo);
@@ -129,7 +129,7 @@ PyDoc_STRVAR(_elementtree_Element___sizeof____doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)_elementtree_Element___sizeof__, METH_NOARGS, _elementtree_Element___sizeof____doc__},
+    {"__sizeof__", _elementtree_Element___sizeof__, METH_NOARGS, _elementtree_Element___sizeof____doc__},
 
 static size_t
 _elementtree_Element___sizeof___impl(ElementObject *self);
@@ -156,7 +156,7 @@ PyDoc_STRVAR(_elementtree_Element___getstate____doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT___GETSTATE___METHODDEF    \
-    {"__getstate__", (PyCFunction)_elementtree_Element___getstate__, METH_NOARGS, _elementtree_Element___getstate____doc__},
+    {"__getstate__", _elementtree_Element___getstate__, METH_NOARGS, _elementtree_Element___getstate____doc__},
 
 static PyObject *
 _elementtree_Element___getstate___impl(ElementObject *self);
@@ -723,7 +723,7 @@ PyDoc_STRVAR(_elementtree_Element_items__doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_ITEMS_METHODDEF    \
-    {"items", (PyCFunction)_elementtree_Element_items, METH_NOARGS, _elementtree_Element_items__doc__},
+    {"items", _elementtree_Element_items, METH_NOARGS, _elementtree_Element_items__doc__},
 
 static PyObject *
 _elementtree_Element_items_impl(ElementObject *self);
@@ -740,7 +740,7 @@ PyDoc_STRVAR(_elementtree_Element_keys__doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_KEYS_METHODDEF    \
-    {"keys", (PyCFunction)_elementtree_Element_keys, METH_NOARGS, _elementtree_Element_keys__doc__},
+    {"keys", _elementtree_Element_keys, METH_NOARGS, _elementtree_Element_keys__doc__},
 
 static PyObject *
 _elementtree_Element_keys_impl(ElementObject *self);
@@ -807,7 +807,7 @@ PyDoc_STRVAR(_elementtree_Element_remove__doc__,
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)_elementtree_Element_remove, METH_O, _elementtree_Element_remove__doc__},
+    {"remove", _elementtree_Element_remove, METH_O, _elementtree_Element_remove__doc__},
 
 static PyObject *
 _elementtree_Element_remove_impl(ElementObject *self, PyObject *subelement);
@@ -996,7 +996,7 @@ PyDoc_STRVAR(_elementtree_TreeBuilder_data__doc__,
 "\n");
 
 #define _ELEMENTTREE_TREEBUILDER_DATA_METHODDEF    \
-    {"data", (PyCFunction)_elementtree_TreeBuilder_data, METH_O, _elementtree_TreeBuilder_data__doc__},
+    {"data", _elementtree_TreeBuilder_data, METH_O, _elementtree_TreeBuilder_data__doc__},
 
 static PyObject *
 _elementtree_TreeBuilder_data_impl(TreeBuilderObject *self, PyObject *data);
@@ -1017,7 +1017,7 @@ PyDoc_STRVAR(_elementtree_TreeBuilder_end__doc__,
 "\n");
 
 #define _ELEMENTTREE_TREEBUILDER_END_METHODDEF    \
-    {"end", (PyCFunction)_elementtree_TreeBuilder_end, METH_O, _elementtree_TreeBuilder_end__doc__},
+    {"end", _elementtree_TreeBuilder_end, METH_O, _elementtree_TreeBuilder_end__doc__},
 
 static PyObject *
 _elementtree_TreeBuilder_end_impl(TreeBuilderObject *self, PyObject *tag);
@@ -1038,7 +1038,7 @@ PyDoc_STRVAR(_elementtree_TreeBuilder_comment__doc__,
 "\n");
 
 #define _ELEMENTTREE_TREEBUILDER_COMMENT_METHODDEF    \
-    {"comment", (PyCFunction)_elementtree_TreeBuilder_comment, METH_O, _elementtree_TreeBuilder_comment__doc__},
+    {"comment", _elementtree_TreeBuilder_comment, METH_O, _elementtree_TreeBuilder_comment__doc__},
 
 static PyObject *
 _elementtree_TreeBuilder_comment_impl(TreeBuilderObject *self,
@@ -1094,7 +1094,7 @@ PyDoc_STRVAR(_elementtree_TreeBuilder_close__doc__,
 "\n");
 
 #define _ELEMENTTREE_TREEBUILDER_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_elementtree_TreeBuilder_close, METH_NOARGS, _elementtree_TreeBuilder_close__doc__},
+    {"close", _elementtree_TreeBuilder_close, METH_NOARGS, _elementtree_TreeBuilder_close__doc__},
 
 static PyObject *
 _elementtree_TreeBuilder_close_impl(TreeBuilderObject *self);
@@ -1226,7 +1226,7 @@ PyDoc_STRVAR(_elementtree_XMLParser_close__doc__,
 "\n");
 
 #define _ELEMENTTREE_XMLPARSER_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_elementtree_XMLParser_close, METH_NOARGS, _elementtree_XMLParser_close__doc__},
+    {"close", _elementtree_XMLParser_close, METH_NOARGS, _elementtree_XMLParser_close__doc__},
 
 static PyObject *
 _elementtree_XMLParser_close_impl(XMLParserObject *self);
@@ -1243,7 +1243,7 @@ PyDoc_STRVAR(_elementtree_XMLParser_flush__doc__,
 "\n");
 
 #define _ELEMENTTREE_XMLPARSER_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_elementtree_XMLParser_flush, METH_NOARGS, _elementtree_XMLParser_flush__doc__},
+    {"flush", _elementtree_XMLParser_flush, METH_NOARGS, _elementtree_XMLParser_flush__doc__},
 
 static PyObject *
 _elementtree_XMLParser_flush_impl(XMLParserObject *self);
@@ -1260,7 +1260,7 @@ PyDoc_STRVAR(_elementtree_XMLParser_feed__doc__,
 "\n");
 
 #define _ELEMENTTREE_XMLPARSER_FEED_METHODDEF    \
-    {"feed", (PyCFunction)_elementtree_XMLParser_feed, METH_O, _elementtree_XMLParser_feed__doc__},
+    {"feed", _elementtree_XMLParser_feed, METH_O, _elementtree_XMLParser_feed__doc__},
 
 static PyObject *
 _elementtree_XMLParser_feed_impl(XMLParserObject *self, PyObject *data);
@@ -1281,7 +1281,7 @@ PyDoc_STRVAR(_elementtree_XMLParser__parse_whole__doc__,
 "\n");
 
 #define _ELEMENTTREE_XMLPARSER__PARSE_WHOLE_METHODDEF    \
-    {"_parse_whole", (PyCFunction)_elementtree_XMLParser__parse_whole, METH_O, _elementtree_XMLParser__parse_whole__doc__},
+    {"_parse_whole", _elementtree_XMLParser__parse_whole, METH_O, _elementtree_XMLParser__parse_whole__doc__},
 
 static PyObject *
 _elementtree_XMLParser__parse_whole_impl(XMLParserObject *self,
@@ -1331,4 +1331,4 @@ _elementtree_XMLParser__setevents(PyObject *self, PyObject *const *args, Py_ssiz
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=c863ce16d8566291 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fe3731db34d336cb input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h
index 23f66631085031..c99c1e93af31e4 100644
--- a/Modules/clinic/_functoolsmodule.c.h
+++ b/Modules/clinic/_functoolsmodule.c.h
@@ -152,7 +152,7 @@ PyDoc_STRVAR(_functools__lru_cache_wrapper_cache_info__doc__,
 "Report cache statistics");
 
 #define _FUNCTOOLS__LRU_CACHE_WRAPPER_CACHE_INFO_METHODDEF    \
-    {"cache_info", (PyCFunction)_functools__lru_cache_wrapper_cache_info, METH_NOARGS, _functools__lru_cache_wrapper_cache_info__doc__},
+    {"cache_info", _functools__lru_cache_wrapper_cache_info, METH_NOARGS, _functools__lru_cache_wrapper_cache_info__doc__},
 
 static PyObject *
 _functools__lru_cache_wrapper_cache_info_impl(PyObject *self);
@@ -176,7 +176,7 @@ PyDoc_STRVAR(_functools__lru_cache_wrapper_cache_clear__doc__,
 "Clear the cache and cache statistics");
 
 #define _FUNCTOOLS__LRU_CACHE_WRAPPER_CACHE_CLEAR_METHODDEF    \
-    {"cache_clear", (PyCFunction)_functools__lru_cache_wrapper_cache_clear, METH_NOARGS, _functools__lru_cache_wrapper_cache_clear__doc__},
+    {"cache_clear", _functools__lru_cache_wrapper_cache_clear, METH_NOARGS, _functools__lru_cache_wrapper_cache_clear__doc__},
 
 static PyObject *
 _functools__lru_cache_wrapper_cache_clear_impl(PyObject *self);
@@ -192,4 +192,4 @@ _functools__lru_cache_wrapper_cache_clear(PyObject *self, PyObject *Py_UNUSED(ig
 
     return return_value;
 }
-/*[clinic end generated code: output=7f2abc718fcc35d5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4e0e917306d608da input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h
index 00950f18e53541..f2d604ab02e327 100644
--- a/Modules/clinic/_gdbmmodule.c.h
+++ b/Modules/clinic/_gdbmmodule.c.h
@@ -83,7 +83,7 @@ PyDoc_STRVAR(_gdbm_gdbm_close__doc__,
 "Close the database.");
 
 #define _GDBM_GDBM_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_gdbm_gdbm_close, METH_NOARGS, _gdbm_gdbm_close__doc__},
+    {"close", _gdbm_gdbm_close, METH_NOARGS, _gdbm_gdbm_close__doc__},
 
 static PyObject *
 _gdbm_gdbm_close_impl(gdbmobject *self);
@@ -343,4 +343,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=d974cb39e4ee5d67 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=54dc05a2b1a17c4b input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h
index bfb2d9afc870a1..ad50dfce6f3737 100644
--- a/Modules/clinic/_hashopenssl.c.h
+++ b/Modules/clinic/_hashopenssl.c.h
@@ -16,7 +16,7 @@ PyDoc_STRVAR(EVP_copy__doc__,
 "Return a copy of the hash object.");
 
 #define EVP_COPY_METHODDEF    \
-    {"copy", (PyCFunction)EVP_copy, METH_NOARGS, EVP_copy__doc__},
+    {"copy", EVP_copy, METH_NOARGS, EVP_copy__doc__},
 
 static PyObject *
 EVP_copy_impl(EVPobject *self);
@@ -34,7 +34,7 @@ PyDoc_STRVAR(EVP_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define EVP_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)EVP_digest, METH_NOARGS, EVP_digest__doc__},
+    {"digest", EVP_digest, METH_NOARGS, EVP_digest__doc__},
 
 static PyObject *
 EVP_digest_impl(EVPobject *self);
@@ -52,7 +52,7 @@ PyDoc_STRVAR(EVP_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define EVP_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)EVP_hexdigest, METH_NOARGS, EVP_hexdigest__doc__},
+    {"hexdigest", EVP_hexdigest, METH_NOARGS, EVP_hexdigest__doc__},
 
 static PyObject *
 EVP_hexdigest_impl(EVPobject *self);
@@ -70,7 +70,7 @@ PyDoc_STRVAR(EVP_update__doc__,
 "Update this hash object\'s state with the provided string.");
 
 #define EVP_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)EVP_update, METH_O, EVP_update__doc__},
+    {"update", EVP_update, METH_O, EVP_update__doc__},
 
 static PyObject *
 EVP_update_impl(EVPobject *self, PyObject *obj);
@@ -1679,7 +1679,7 @@ PyDoc_STRVAR(_hashlib_HMAC_copy__doc__,
 "Return a copy (\"clone\") of the HMAC object.");
 
 #define _HASHLIB_HMAC_COPY_METHODDEF    \
-    {"copy", (PyCFunction)_hashlib_HMAC_copy, METH_NOARGS, _hashlib_HMAC_copy__doc__},
+    {"copy", _hashlib_HMAC_copy, METH_NOARGS, _hashlib_HMAC_copy__doc__},
 
 static PyObject *
 _hashlib_HMAC_copy_impl(HMACobject *self);
@@ -1755,7 +1755,7 @@ PyDoc_STRVAR(_hashlib_HMAC_digest__doc__,
 "Return the digest of the bytes passed to the update() method so far.");
 
 #define _HASHLIB_HMAC_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)_hashlib_HMAC_digest, METH_NOARGS, _hashlib_HMAC_digest__doc__},
+    {"digest", _hashlib_HMAC_digest, METH_NOARGS, _hashlib_HMAC_digest__doc__},
 
 static PyObject *
 _hashlib_HMAC_digest_impl(HMACobject *self);
@@ -1776,7 +1776,7 @@ PyDoc_STRVAR(_hashlib_HMAC_hexdigest__doc__,
 "environments.");
 
 #define _HASHLIB_HMAC_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)_hashlib_HMAC_hexdigest, METH_NOARGS, _hashlib_HMAC_hexdigest__doc__},
+    {"hexdigest", _hashlib_HMAC_hexdigest, METH_NOARGS, _hashlib_HMAC_hexdigest__doc__},
 
 static PyObject *
 _hashlib_HMAC_hexdigest_impl(HMACobject *self);
@@ -1801,7 +1801,7 @@ PyDoc_STRVAR(_hashlib_get_fips_mode__doc__,
 "values other than 1 may have additional significance.");
 
 #define _HASHLIB_GET_FIPS_MODE_METHODDEF    \
-    {"get_fips_mode", (PyCFunction)_hashlib_get_fips_mode, METH_NOARGS, _hashlib_get_fips_mode__doc__},
+    {"get_fips_mode", _hashlib_get_fips_mode, METH_NOARGS, _hashlib_get_fips_mode__doc__},
 
 static int
 _hashlib_get_fips_mode_impl(PyObject *module);
@@ -1897,4 +1897,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=d908fa85e0251426 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d4ea5537e16fc076 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_heapqmodule.c.h b/Modules/clinic/_heapqmodule.c.h
index 9046307990773b..eec5c6c918322b 100644
--- a/Modules/clinic/_heapqmodule.c.h
+++ b/Modules/clinic/_heapqmodule.c.h
@@ -45,7 +45,7 @@ PyDoc_STRVAR(_heapq_heappop__doc__,
 "Pop the smallest item off the heap, maintaining the heap invariant.");
 
 #define _HEAPQ_HEAPPOP_METHODDEF    \
-    {"heappop", (PyCFunction)_heapq_heappop, METH_O, _heapq_heappop__doc__},
+    {"heappop", _heapq_heappop, METH_O, _heapq_heappop__doc__},
 
 static PyObject *
 _heapq_heappop_impl(PyObject *module, PyObject *heap);
@@ -153,7 +153,7 @@ PyDoc_STRVAR(_heapq_heapify__doc__,
 "Transform list into a heap, in-place, in O(len(heap)) time.");
 
 #define _HEAPQ_HEAPIFY_METHODDEF    \
-    {"heapify", (PyCFunction)_heapq_heapify, METH_O, _heapq_heapify__doc__},
+    {"heapify", _heapq_heapify, METH_O, _heapq_heapify__doc__},
 
 static PyObject *
 _heapq_heapify_impl(PyObject *module, PyObject *heap);
@@ -182,7 +182,7 @@ PyDoc_STRVAR(_heapq__heappop_max__doc__,
 "Maxheap variant of heappop.");
 
 #define _HEAPQ__HEAPPOP_MAX_METHODDEF    \
-    {"_heappop_max", (PyCFunction)_heapq__heappop_max, METH_O, _heapq__heappop_max__doc__},
+    {"_heappop_max", _heapq__heappop_max, METH_O, _heapq__heappop_max__doc__},
 
 static PyObject *
 _heapq__heappop_max_impl(PyObject *module, PyObject *heap);
@@ -246,7 +246,7 @@ PyDoc_STRVAR(_heapq__heapify_max__doc__,
 "Maxheap variant of heapify.");
 
 #define _HEAPQ__HEAPIFY_MAX_METHODDEF    \
-    {"_heapify_max", (PyCFunction)_heapq__heapify_max, METH_O, _heapq__heapify_max__doc__},
+    {"_heapify_max", _heapq__heapify_max, METH_O, _heapq__heapify_max__doc__},
 
 static PyObject *
 _heapq__heapify_max_impl(PyObject *module, PyObject *heap);
@@ -267,4 +267,4 @@ _heapq__heapify_max(PyObject *module, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=05f2afdf3bc54c9d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=06ad2cf6ef705d99 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_localemodule.c.h b/Modules/clinic/_localemodule.c.h
index 5e0880b0d0bb4c..73ac47aaf0b45c 100644
--- a/Modules/clinic/_localemodule.c.h
+++ b/Modules/clinic/_localemodule.c.h
@@ -65,7 +65,7 @@ PyDoc_STRVAR(_locale_localeconv__doc__,
 "Returns numeric and monetary locale-specific parameters.");
 
 #define _LOCALE_LOCALECONV_METHODDEF    \
-    {"localeconv", (PyCFunction)_locale_localeconv, METH_NOARGS, _locale_localeconv__doc__},
+    {"localeconv", _locale_localeconv, METH_NOARGS, _locale_localeconv__doc__},
 
 static PyObject *
 _locale_localeconv_impl(PyObject *module);
@@ -127,7 +127,7 @@ PyDoc_STRVAR(_locale_strxfrm__doc__,
 "Return a string that can be used as a key for locale-aware comparisons.");
 
 #define _LOCALE_STRXFRM_METHODDEF    \
-    {"strxfrm", (PyCFunction)_locale_strxfrm, METH_O, _locale_strxfrm__doc__},
+    {"strxfrm", _locale_strxfrm, METH_O, _locale_strxfrm__doc__},
 
 static PyObject *
 _locale_strxfrm_impl(PyObject *module, PyObject *str);
@@ -159,7 +159,7 @@ PyDoc_STRVAR(_locale__getdefaultlocale__doc__,
 "\n");
 
 #define _LOCALE__GETDEFAULTLOCALE_METHODDEF    \
-    {"_getdefaultlocale", (PyCFunction)_locale__getdefaultlocale, METH_NOARGS, _locale__getdefaultlocale__doc__},
+    {"_getdefaultlocale", _locale__getdefaultlocale, METH_NOARGS, _locale__getdefaultlocale__doc__},
 
 static PyObject *
 _locale__getdefaultlocale_impl(PyObject *module);
@@ -181,7 +181,7 @@ PyDoc_STRVAR(_locale_nl_langinfo__doc__,
 "Return the value for the locale information associated with key.");
 
 #define _LOCALE_NL_LANGINFO_METHODDEF    \
-    {"nl_langinfo", (PyCFunction)_locale_nl_langinfo, METH_O, _locale_nl_langinfo__doc__},
+    {"nl_langinfo", _locale_nl_langinfo, METH_O, _locale_nl_langinfo__doc__},
 
 static PyObject *
 _locale_nl_langinfo_impl(PyObject *module, int item);
@@ -215,7 +215,7 @@ PyDoc_STRVAR(_locale_gettext__doc__,
 "Return translation of msg.");
 
 #define _LOCALE_GETTEXT_METHODDEF    \
-    {"gettext", (PyCFunction)_locale_gettext, METH_O, _locale_gettext__doc__},
+    {"gettext", _locale_gettext, METH_O, _locale_gettext__doc__},
 
 static PyObject *
 _locale_gettext_impl(PyObject *module, const char *in);
@@ -390,7 +390,7 @@ PyDoc_STRVAR(_locale_textdomain__doc__,
 "Set the C library\'s textdmain to domain, returning the new domain.");
 
 #define _LOCALE_TEXTDOMAIN_METHODDEF    \
-    {"textdomain", (PyCFunction)_locale_textdomain, METH_O, _locale_textdomain__doc__},
+    {"textdomain", _locale_textdomain, METH_O, _locale_textdomain__doc__},
 
 static PyObject *
 _locale_textdomain_impl(PyObject *module, const char *domain);
@@ -545,7 +545,7 @@ PyDoc_STRVAR(_locale_getencoding__doc__,
 "Get the current locale encoding.");
 
 #define _LOCALE_GETENCODING_METHODDEF    \
-    {"getencoding", (PyCFunction)_locale_getencoding, METH_NOARGS, _locale_getencoding__doc__},
+    {"getencoding", _locale_getencoding, METH_NOARGS, _locale_getencoding__doc__},
 
 static PyObject *
 _locale_getencoding_impl(PyObject *module);
@@ -595,4 +595,4 @@ _locale_getencoding(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef _LOCALE_BIND_TEXTDOMAIN_CODESET_METHODDEF
     #define _LOCALE_BIND_TEXTDOMAIN_CODESET_METHODDEF
 #endif /* !defined(_LOCALE_BIND_TEXTDOMAIN_CODESET_METHODDEF) */
-/*[clinic end generated code: output=034a3c219466d207 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ec091fccbb896f06 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_lsprof.c.h b/Modules/clinic/_lsprof.c.h
index 2918a6bc7abe74..958fb77d3da799 100644
--- a/Modules/clinic/_lsprof.c.h
+++ b/Modules/clinic/_lsprof.c.h
@@ -279,7 +279,7 @@ PyDoc_STRVAR(_lsprof_Profiler_disable__doc__,
 "Stop collecting profiling information.");
 
 #define _LSPROF_PROFILER_DISABLE_METHODDEF    \
-    {"disable", (PyCFunction)_lsprof_Profiler_disable, METH_NOARGS, _lsprof_Profiler_disable__doc__},
+    {"disable", _lsprof_Profiler_disable, METH_NOARGS, _lsprof_Profiler_disable__doc__},
 
 static PyObject *
 _lsprof_Profiler_disable_impl(ProfilerObject *self);
@@ -297,7 +297,7 @@ PyDoc_STRVAR(_lsprof_Profiler_clear__doc__,
 "Clear all profiling information collected so far.");
 
 #define _LSPROF_PROFILER_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)_lsprof_Profiler_clear, METH_NOARGS, _lsprof_Profiler_clear__doc__},
+    {"clear", _lsprof_Profiler_clear, METH_NOARGS, _lsprof_Profiler_clear__doc__},
 
 static PyObject *
 _lsprof_Profiler_clear_impl(ProfilerObject *self);
@@ -411,4 +411,4 @@ profiler_init(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=fe231309776df7a7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=44a0bcdd816d0c03 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_lzmamodule.c.h b/Modules/clinic/_lzmamodule.c.h
index ebdc81a0dac2f0..644ec82d5a02b1 100644
--- a/Modules/clinic/_lzmamodule.c.h
+++ b/Modules/clinic/_lzmamodule.c.h
@@ -21,7 +21,7 @@ PyDoc_STRVAR(_lzma_LZMACompressor_compress__doc__,
 "flush() method to finish the compression process.");
 
 #define _LZMA_LZMACOMPRESSOR_COMPRESS_METHODDEF    \
-    {"compress", (PyCFunction)_lzma_LZMACompressor_compress, METH_O, _lzma_LZMACompressor_compress__doc__},
+    {"compress", _lzma_LZMACompressor_compress, METH_O, _lzma_LZMACompressor_compress__doc__},
 
 static PyObject *
 _lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data);
@@ -57,7 +57,7 @@ PyDoc_STRVAR(_lzma_LZMACompressor_flush__doc__,
 "The compressor object may not be used after this method is called.");
 
 #define _LZMA_LZMACOMPRESSOR_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)_lzma_LZMACompressor_flush, METH_NOARGS, _lzma_LZMACompressor_flush__doc__},
+    {"flush", _lzma_LZMACompressor_flush, METH_NOARGS, _lzma_LZMACompressor_flush__doc__},
 
 static PyObject *
 _lzma_LZMACompressor_flush_impl(Compressor *self);
@@ -271,7 +271,7 @@ PyDoc_STRVAR(_lzma_is_check_supported__doc__,
 "Always returns True for CHECK_NONE and CHECK_CRC32.");
 
 #define _LZMA_IS_CHECK_SUPPORTED_METHODDEF    \
-    {"is_check_supported", (PyCFunction)_lzma_is_check_supported, METH_O, _lzma_is_check_supported__doc__},
+    {"is_check_supported", _lzma_is_check_supported, METH_O, _lzma_is_check_supported__doc__},
 
 static PyObject *
 _lzma_is_check_supported_impl(PyObject *module, int check_id);
@@ -333,4 +333,4 @@ _lzma__decode_filter_properties(PyObject *module, PyObject *const *args, Py_ssiz
 
     return return_value;
 }
-/*[clinic end generated code: output=6386084cb43d2533 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f839b34e83bd870d input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_opcode.c.h b/Modules/clinic/_opcode.c.h
index fb8d814241bd5e..532f9c7b28abf0 100644
--- a/Modules/clinic/_opcode.c.h
+++ b/Modules/clinic/_opcode.c.h
@@ -629,7 +629,7 @@ PyDoc_STRVAR(_opcode_get_specialization_stats__doc__,
 "Return the specialization stats");
 
 #define _OPCODE_GET_SPECIALIZATION_STATS_METHODDEF    \
-    {"get_specialization_stats", (PyCFunction)_opcode_get_specialization_stats, METH_NOARGS, _opcode_get_specialization_stats__doc__},
+    {"get_specialization_stats", _opcode_get_specialization_stats, METH_NOARGS, _opcode_get_specialization_stats__doc__},
 
 static PyObject *
 _opcode_get_specialization_stats_impl(PyObject *module);
@@ -649,7 +649,7 @@ PyDoc_STRVAR(_opcode_get_nb_ops__doc__,
 "Indexed by the BINARY_OP oparg value.");
 
 #define _OPCODE_GET_NB_OPS_METHODDEF    \
-    {"get_nb_ops", (PyCFunction)_opcode_get_nb_ops, METH_NOARGS, _opcode_get_nb_ops__doc__},
+    {"get_nb_ops", _opcode_get_nb_ops, METH_NOARGS, _opcode_get_nb_ops__doc__},
 
 static PyObject *
 _opcode_get_nb_ops_impl(PyObject *module);
@@ -667,7 +667,7 @@ PyDoc_STRVAR(_opcode_get_intrinsic1_descs__doc__,
 "Return a list of names of the unary intrinsics.");
 
 #define _OPCODE_GET_INTRINSIC1_DESCS_METHODDEF    \
-    {"get_intrinsic1_descs", (PyCFunction)_opcode_get_intrinsic1_descs, METH_NOARGS, _opcode_get_intrinsic1_descs__doc__},
+    {"get_intrinsic1_descs", _opcode_get_intrinsic1_descs, METH_NOARGS, _opcode_get_intrinsic1_descs__doc__},
 
 static PyObject *
 _opcode_get_intrinsic1_descs_impl(PyObject *module);
@@ -685,7 +685,7 @@ PyDoc_STRVAR(_opcode_get_intrinsic2_descs__doc__,
 "Return a list of names of the binary intrinsics.");
 
 #define _OPCODE_GET_INTRINSIC2_DESCS_METHODDEF    \
-    {"get_intrinsic2_descs", (PyCFunction)_opcode_get_intrinsic2_descs, METH_NOARGS, _opcode_get_intrinsic2_descs__doc__},
+    {"get_intrinsic2_descs", _opcode_get_intrinsic2_descs, METH_NOARGS, _opcode_get_intrinsic2_descs__doc__},
 
 static PyObject *
 _opcode_get_intrinsic2_descs_impl(PyObject *module);
@@ -703,7 +703,7 @@ PyDoc_STRVAR(_opcode_get_special_method_names__doc__,
 "Return a list of special method names.");
 
 #define _OPCODE_GET_SPECIAL_METHOD_NAMES_METHODDEF    \
-    {"get_special_method_names", (PyCFunction)_opcode_get_special_method_names, METH_NOARGS, _opcode_get_special_method_names__doc__},
+    {"get_special_method_names", _opcode_get_special_method_names, METH_NOARGS, _opcode_get_special_method_names__doc__},
 
 static PyObject *
 _opcode_get_special_method_names_impl(PyObject *module);
@@ -776,4 +776,4 @@ _opcode_get_executor(PyObject *module, PyObject *const *args, Py_ssize_t nargs,
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=a11f02989c3175d7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5cb68d6663dd80a0 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_operator.c.h b/Modules/clinic/_operator.c.h
index 48a8ea8c3379ab..9b5f4b03737a9f 100644
--- a/Modules/clinic/_operator.c.h
+++ b/Modules/clinic/_operator.c.h
@@ -12,7 +12,7 @@ PyDoc_STRVAR(_operator_truth__doc__,
 "Return True if a is true, False otherwise.");
 
 #define _OPERATOR_TRUTH_METHODDEF    \
-    {"truth", (PyCFunction)_operator_truth, METH_O, _operator_truth__doc__},
+    {"truth", _operator_truth, METH_O, _operator_truth__doc__},
 
 static int
 _operator_truth_impl(PyObject *module, PyObject *a);
@@ -250,7 +250,7 @@ PyDoc_STRVAR(_operator_neg__doc__,
 "Same as -a.");
 
 #define _OPERATOR_NEG_METHODDEF    \
-    {"neg", (PyCFunction)_operator_neg, METH_O, _operator_neg__doc__},
+    {"neg", _operator_neg, METH_O, _operator_neg__doc__},
 
 PyDoc_STRVAR(_operator_pos__doc__,
 "pos($module, a, /)\n"
@@ -259,7 +259,7 @@ PyDoc_STRVAR(_operator_pos__doc__,
 "Same as +a.");
 
 #define _OPERATOR_POS_METHODDEF    \
-    {"pos", (PyCFunction)_operator_pos, METH_O, _operator_pos__doc__},
+    {"pos", _operator_pos, METH_O, _operator_pos__doc__},
 
 PyDoc_STRVAR(_operator_abs__doc__,
 "abs($module, a, /)\n"
@@ -268,7 +268,7 @@ PyDoc_STRVAR(_operator_abs__doc__,
 "Same as abs(a).");
 
 #define _OPERATOR_ABS_METHODDEF    \
-    {"abs", (PyCFunction)_operator_abs, METH_O, _operator_abs__doc__},
+    {"abs", _operator_abs, METH_O, _operator_abs__doc__},
 
 PyDoc_STRVAR(_operator_inv__doc__,
 "inv($module, a, /)\n"
@@ -277,7 +277,7 @@ PyDoc_STRVAR(_operator_inv__doc__,
 "Same as ~a.");
 
 #define _OPERATOR_INV_METHODDEF    \
-    {"inv", (PyCFunction)_operator_inv, METH_O, _operator_inv__doc__},
+    {"inv", _operator_inv, METH_O, _operator_inv__doc__},
 
 PyDoc_STRVAR(_operator_invert__doc__,
 "invert($module, a, /)\n"
@@ -286,7 +286,7 @@ PyDoc_STRVAR(_operator_invert__doc__,
 "Same as ~a.");
 
 #define _OPERATOR_INVERT_METHODDEF    \
-    {"invert", (PyCFunction)_operator_invert, METH_O, _operator_invert__doc__},
+    {"invert", _operator_invert, METH_O, _operator_invert__doc__},
 
 PyDoc_STRVAR(_operator_lshift__doc__,
 "lshift($module, a, b, /)\n"
@@ -355,7 +355,7 @@ PyDoc_STRVAR(_operator_not___doc__,
 "Same as not a.");
 
 #define _OPERATOR_NOT__METHODDEF    \
-    {"not_", (PyCFunction)_operator_not_, METH_O, _operator_not___doc__},
+    {"not_", _operator_not_, METH_O, _operator_not___doc__},
 
 static int
 _operator_not__impl(PyObject *module, PyObject *a);
@@ -1331,7 +1331,7 @@ PyDoc_STRVAR(_operator_index__doc__,
 "Same as a.__index__()");
 
 #define _OPERATOR_INDEX_METHODDEF    \
-    {"index", (PyCFunction)_operator_index, METH_O, _operator_index__doc__},
+    {"index", _operator_index, METH_O, _operator_index__doc__},
 
 PyDoc_STRVAR(_operator_is___doc__,
 "is_($module, a, b, /)\n"
@@ -1400,7 +1400,7 @@ PyDoc_STRVAR(_operator_is_none__doc__,
 "Same as a is None.");
 
 #define _OPERATOR_IS_NONE_METHODDEF    \
-    {"is_none", (PyCFunction)_operator_is_none, METH_O, _operator_is_none__doc__},
+    {"is_none", _operator_is_none, METH_O, _operator_is_none__doc__},
 
 PyDoc_STRVAR(_operator_is_not_none__doc__,
 "is_not_none($module, a, /)\n"
@@ -1409,7 +1409,7 @@ PyDoc_STRVAR(_operator_is_not_none__doc__,
 "Same as a is not None.");
 
 #define _OPERATOR_IS_NOT_NONE_METHODDEF    \
-    {"is_not_none", (PyCFunction)_operator_is_not_none, METH_O, _operator_is_not_none__doc__},
+    {"is_not_none", _operator_is_not_none, METH_O, _operator_is_not_none__doc__},
 
 PyDoc_STRVAR(_operator_length_hint__doc__,
 "length_hint($module, obj, default=0, /)\n"
@@ -1507,4 +1507,4 @@ _operator__compare_digest(PyObject *module, PyObject *const *args, Py_ssize_t na
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=972e2543c4fcf1ba input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5b58ed7c1fee66b5 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h
index 213e817a50a287..ebf637600b8d72 100644
--- a/Modules/clinic/_pickle.c.h
+++ b/Modules/clinic/_pickle.c.h
@@ -20,7 +20,7 @@ PyDoc_STRVAR(_pickle_Pickler_clear_memo__doc__,
 "re-using picklers.");
 
 #define _PICKLE_PICKLER_CLEAR_MEMO_METHODDEF    \
-    {"clear_memo", (PyCFunction)_pickle_Pickler_clear_memo, METH_NOARGS, _pickle_Pickler_clear_memo__doc__},
+    {"clear_memo", _pickle_Pickler_clear_memo, METH_NOARGS, _pickle_Pickler_clear_memo__doc__},
 
 static PyObject *
 _pickle_Pickler_clear_memo_impl(PicklerObject *self);
@@ -83,7 +83,7 @@ PyDoc_STRVAR(_pickle_Pickler___sizeof____doc__,
 "Returns size in memory, in bytes.");
 
 #define _PICKLE_PICKLER___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)_pickle_Pickler___sizeof__, METH_NOARGS, _pickle_Pickler___sizeof____doc__},
+    {"__sizeof__", _pickle_Pickler___sizeof__, METH_NOARGS, _pickle_Pickler___sizeof____doc__},
 
 static size_t
 _pickle_Pickler___sizeof___impl(PicklerObject *self);
@@ -223,7 +223,7 @@ PyDoc_STRVAR(_pickle_PicklerMemoProxy_clear__doc__,
 "Remove all items from memo.");
 
 #define _PICKLE_PICKLERMEMOPROXY_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)_pickle_PicklerMemoProxy_clear, METH_NOARGS, _pickle_PicklerMemoProxy_clear__doc__},
+    {"clear", _pickle_PicklerMemoProxy_clear, METH_NOARGS, _pickle_PicklerMemoProxy_clear__doc__},
 
 static PyObject *
 _pickle_PicklerMemoProxy_clear_impl(PicklerMemoProxyObject *self);
@@ -241,7 +241,7 @@ PyDoc_STRVAR(_pickle_PicklerMemoProxy_copy__doc__,
 "Copy the memo to a new object.");
 
 #define _PICKLE_PICKLERMEMOPROXY_COPY_METHODDEF    \
-    {"copy", (PyCFunction)_pickle_PicklerMemoProxy_copy, METH_NOARGS, _pickle_PicklerMemoProxy_copy__doc__},
+    {"copy", _pickle_PicklerMemoProxy_copy, METH_NOARGS, _pickle_PicklerMemoProxy_copy__doc__},
 
 static PyObject *
 _pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self);
@@ -259,7 +259,7 @@ PyDoc_STRVAR(_pickle_PicklerMemoProxy___reduce____doc__,
 "Implement pickle support.");
 
 #define _PICKLE_PICKLERMEMOPROXY___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)_pickle_PicklerMemoProxy___reduce__, METH_NOARGS, _pickle_PicklerMemoProxy___reduce____doc__},
+    {"__reduce__", _pickle_PicklerMemoProxy___reduce__, METH_NOARGS, _pickle_PicklerMemoProxy___reduce____doc__},
 
 static PyObject *
 _pickle_PicklerMemoProxy___reduce___impl(PicklerMemoProxyObject *self);
@@ -402,7 +402,7 @@ PyDoc_STRVAR(_pickle_Unpickler___sizeof____doc__,
 "Returns size in memory, in bytes.");
 
 #define _PICKLE_UNPICKLER___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)_pickle_Unpickler___sizeof__, METH_NOARGS, _pickle_Unpickler___sizeof____doc__},
+    {"__sizeof__", _pickle_Unpickler___sizeof__, METH_NOARGS, _pickle_Unpickler___sizeof____doc__},
 
 static size_t
 _pickle_Unpickler___sizeof___impl(UnpicklerObject *self);
@@ -564,7 +564,7 @@ PyDoc_STRVAR(_pickle_UnpicklerMemoProxy_clear__doc__,
 "Remove all items from memo.");
 
 #define _PICKLE_UNPICKLERMEMOPROXY_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)_pickle_UnpicklerMemoProxy_clear, METH_NOARGS, _pickle_UnpicklerMemoProxy_clear__doc__},
+    {"clear", _pickle_UnpicklerMemoProxy_clear, METH_NOARGS, _pickle_UnpicklerMemoProxy_clear__doc__},
 
 static PyObject *
 _pickle_UnpicklerMemoProxy_clear_impl(UnpicklerMemoProxyObject *self);
@@ -582,7 +582,7 @@ PyDoc_STRVAR(_pickle_UnpicklerMemoProxy_copy__doc__,
 "Copy the memo to a new object.");
 
 #define _PICKLE_UNPICKLERMEMOPROXY_COPY_METHODDEF    \
-    {"copy", (PyCFunction)_pickle_UnpicklerMemoProxy_copy, METH_NOARGS, _pickle_UnpicklerMemoProxy_copy__doc__},
+    {"copy", _pickle_UnpicklerMemoProxy_copy, METH_NOARGS, _pickle_UnpicklerMemoProxy_copy__doc__},
 
 static PyObject *
 _pickle_UnpicklerMemoProxy_copy_impl(UnpicklerMemoProxyObject *self);
@@ -600,7 +600,7 @@ PyDoc_STRVAR(_pickle_UnpicklerMemoProxy___reduce____doc__,
 "Implement pickling support.");
 
 #define _PICKLE_UNPICKLERMEMOPROXY___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)_pickle_UnpicklerMemoProxy___reduce__, METH_NOARGS, _pickle_UnpicklerMemoProxy___reduce____doc__},
+    {"__reduce__", _pickle_UnpicklerMemoProxy___reduce__, METH_NOARGS, _pickle_UnpicklerMemoProxy___reduce____doc__},
 
 static PyObject *
 _pickle_UnpicklerMemoProxy___reduce___impl(UnpicklerMemoProxyObject *self);
@@ -1098,4 +1098,4 @@ _pickle_loads(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=6331c72b3c427f63 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=64d5ac3cf2e6fc93 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_queuemodule.c.h b/Modules/clinic/_queuemodule.c.h
index 1751d68716ba5f..423f8f67bece27 100644
--- a/Modules/clinic/_queuemodule.c.h
+++ b/Modules/clinic/_queuemodule.c.h
@@ -306,7 +306,7 @@ PyDoc_STRVAR(_queue_SimpleQueue_empty__doc__,
 "Return True if the queue is empty, False otherwise (not reliable!).");
 
 #define _QUEUE_SIMPLEQUEUE_EMPTY_METHODDEF    \
-    {"empty", (PyCFunction)_queue_SimpleQueue_empty, METH_NOARGS, _queue_SimpleQueue_empty__doc__},
+    {"empty", _queue_SimpleQueue_empty, METH_NOARGS, _queue_SimpleQueue_empty__doc__},
 
 static int
 _queue_SimpleQueue_empty_impl(simplequeueobject *self);
@@ -336,7 +336,7 @@ PyDoc_STRVAR(_queue_SimpleQueue_qsize__doc__,
 "Return the approximate size of the queue (not reliable!).");
 
 #define _QUEUE_SIMPLEQUEUE_QSIZE_METHODDEF    \
-    {"qsize", (PyCFunction)_queue_SimpleQueue_qsize, METH_NOARGS, _queue_SimpleQueue_qsize__doc__},
+    {"qsize", _queue_SimpleQueue_qsize, METH_NOARGS, _queue_SimpleQueue_qsize__doc__},
 
 static Py_ssize_t
 _queue_SimpleQueue_qsize_impl(simplequeueobject *self);
@@ -358,4 +358,4 @@ _queue_SimpleQueue_qsize(PyObject *self, PyObject *Py_UNUSED(ignored))
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=1d3efe9df89997cf input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2cb817a025acce31 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_randommodule.c.h b/Modules/clinic/_randommodule.c.h
index 1e989e970c9de5..67b927d4546540 100644
--- a/Modules/clinic/_randommodule.c.h
+++ b/Modules/clinic/_randommodule.c.h
@@ -12,7 +12,7 @@ PyDoc_STRVAR(_random_Random_random__doc__,
 "random() -> x in the interval [0, 1).");
 
 #define _RANDOM_RANDOM_RANDOM_METHODDEF    \
-    {"random", (PyCFunction)_random_Random_random, METH_NOARGS, _random_Random_random__doc__},
+    {"random", _random_Random_random, METH_NOARGS, _random_Random_random__doc__},
 
 static PyObject *
 _random_Random_random_impl(RandomObject *self);
@@ -73,7 +73,7 @@ PyDoc_STRVAR(_random_Random_getstate__doc__,
 "getstate() -> tuple containing the current state.");
 
 #define _RANDOM_RANDOM_GETSTATE_METHODDEF    \
-    {"getstate", (PyCFunction)_random_Random_getstate, METH_NOARGS, _random_Random_getstate__doc__},
+    {"getstate", _random_Random_getstate, METH_NOARGS, _random_Random_getstate__doc__},
 
 static PyObject *
 _random_Random_getstate_impl(RandomObject *self);
@@ -97,7 +97,7 @@ PyDoc_STRVAR(_random_Random_setstate__doc__,
 "setstate(state) -> None.  Restores generator state.");
 
 #define _RANDOM_RANDOM_SETSTATE_METHODDEF    \
-    {"setstate", (PyCFunction)_random_Random_setstate, METH_O, _random_Random_setstate__doc__},
+    {"setstate", _random_Random_setstate, METH_O, _random_Random_setstate__doc__},
 
 static PyObject *
 _random_Random_setstate_impl(RandomObject *self, PyObject *state);
@@ -121,7 +121,7 @@ PyDoc_STRVAR(_random_Random_getrandbits__doc__,
 "getrandbits(k) -> x.  Generates an int with k random bits.");
 
 #define _RANDOM_RANDOM_GETRANDBITS_METHODDEF    \
-    {"getrandbits", (PyCFunction)_random_Random_getrandbits, METH_O, _random_Random_getrandbits__doc__},
+    {"getrandbits", _random_Random_getrandbits, METH_O, _random_Random_getrandbits__doc__},
 
 static PyObject *
 _random_Random_getrandbits_impl(RandomObject *self, int k);
@@ -143,4 +143,4 @@ _random_Random_getrandbits(PyObject *self, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=4458b5a69201ebea input=a9049054013a1b77]*/
+/*[clinic end generated code: output=46631c9da5aacd1d input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h
index c6e2abd4d93474..e3e9cba47eeef2 100644
--- a/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_do_handshake__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_DO_HANDSHAKE_METHODDEF    \
-    {"do_handshake", (PyCFunction)_ssl__SSLSocket_do_handshake, METH_NOARGS, _ssl__SSLSocket_do_handshake__doc__},
+    {"do_handshake", _ssl__SSLSocket_do_handshake, METH_NOARGS, _ssl__SSLSocket_do_handshake__doc__},
 
 static PyObject *
 _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self);
@@ -38,7 +38,7 @@ PyDoc_STRVAR(_ssl__test_decode_cert__doc__,
 "\n");
 
 #define _SSL__TEST_DECODE_CERT_METHODDEF    \
-    {"_test_decode_cert", (PyCFunction)_ssl__test_decode_cert, METH_O, _ssl__test_decode_cert__doc__},
+    {"_test_decode_cert", _ssl__test_decode_cert, METH_O, _ssl__test_decode_cert__doc__},
 
 static PyObject *
 _ssl__test_decode_cert_impl(PyObject *module, PyObject *path);
@@ -109,7 +109,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_get_verified_chain__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_GET_VERIFIED_CHAIN_METHODDEF    \
-    {"get_verified_chain", (PyCFunction)_ssl__SSLSocket_get_verified_chain, METH_NOARGS, _ssl__SSLSocket_get_verified_chain__doc__},
+    {"get_verified_chain", _ssl__SSLSocket_get_verified_chain, METH_NOARGS, _ssl__SSLSocket_get_verified_chain__doc__},
 
 static PyObject *
 _ssl__SSLSocket_get_verified_chain_impl(PySSLSocket *self);
@@ -132,7 +132,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_get_unverified_chain__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_GET_UNVERIFIED_CHAIN_METHODDEF    \
-    {"get_unverified_chain", (PyCFunction)_ssl__SSLSocket_get_unverified_chain, METH_NOARGS, _ssl__SSLSocket_get_unverified_chain__doc__},
+    {"get_unverified_chain", _ssl__SSLSocket_get_unverified_chain, METH_NOARGS, _ssl__SSLSocket_get_unverified_chain__doc__},
 
 static PyObject *
 _ssl__SSLSocket_get_unverified_chain_impl(PySSLSocket *self);
@@ -155,7 +155,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_shared_ciphers__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_SHARED_CIPHERS_METHODDEF    \
-    {"shared_ciphers", (PyCFunction)_ssl__SSLSocket_shared_ciphers, METH_NOARGS, _ssl__SSLSocket_shared_ciphers__doc__},
+    {"shared_ciphers", _ssl__SSLSocket_shared_ciphers, METH_NOARGS, _ssl__SSLSocket_shared_ciphers__doc__},
 
 static PyObject *
 _ssl__SSLSocket_shared_ciphers_impl(PySSLSocket *self);
@@ -178,7 +178,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_cipher__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_CIPHER_METHODDEF    \
-    {"cipher", (PyCFunction)_ssl__SSLSocket_cipher, METH_NOARGS, _ssl__SSLSocket_cipher__doc__},
+    {"cipher", _ssl__SSLSocket_cipher, METH_NOARGS, _ssl__SSLSocket_cipher__doc__},
 
 static PyObject *
 _ssl__SSLSocket_cipher_impl(PySSLSocket *self);
@@ -201,7 +201,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_version__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_VERSION_METHODDEF    \
-    {"version", (PyCFunction)_ssl__SSLSocket_version, METH_NOARGS, _ssl__SSLSocket_version__doc__},
+    {"version", _ssl__SSLSocket_version, METH_NOARGS, _ssl__SSLSocket_version__doc__},
 
 static PyObject *
 _ssl__SSLSocket_version_impl(PySSLSocket *self);
@@ -224,7 +224,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_selected_alpn_protocol__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF    \
-    {"selected_alpn_protocol", (PyCFunction)_ssl__SSLSocket_selected_alpn_protocol, METH_NOARGS, _ssl__SSLSocket_selected_alpn_protocol__doc__},
+    {"selected_alpn_protocol", _ssl__SSLSocket_selected_alpn_protocol, METH_NOARGS, _ssl__SSLSocket_selected_alpn_protocol__doc__},
 
 static PyObject *
 _ssl__SSLSocket_selected_alpn_protocol_impl(PySSLSocket *self);
@@ -247,7 +247,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_compression__doc__,
 "\n");
 
 #define _SSL__SSLSOCKET_COMPRESSION_METHODDEF    \
-    {"compression", (PyCFunction)_ssl__SSLSocket_compression, METH_NOARGS, _ssl__SSLSocket_compression__doc__},
+    {"compression", _ssl__SSLSocket_compression, METH_NOARGS, _ssl__SSLSocket_compression__doc__},
 
 static PyObject *
 _ssl__SSLSocket_compression_impl(PySSLSocket *self);
@@ -274,9 +274,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_context__doc__,
 #endif
 #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF)
 #  undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF
-#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", (getter)_ssl__SSLSocket_context_get, (setter)_ssl__SSLSocket_context_set, _ssl__SSLSocket_context_DOCSTR},
+#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", _ssl__SSLSocket_context_get, _ssl__SSLSocket_context_set, _ssl__SSLSocket_context_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", (getter)_ssl__SSLSocket_context_get, NULL, _ssl__SSLSocket_context_DOCSTR},
+#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", _ssl__SSLSocket_context_get, NULL, _ssl__SSLSocket_context_DOCSTR},
 #endif
 
 static PyObject *
@@ -299,9 +299,9 @@ _ssl__SSLSocket_context_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF)
 #  undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF
-#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", (getter)_ssl__SSLSocket_context_get, (setter)_ssl__SSLSocket_context_set, _ssl__SSLSocket_context_DOCSTR},
+#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", _ssl__SSLSocket_context_get, _ssl__SSLSocket_context_set, _ssl__SSLSocket_context_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", NULL, (setter)_ssl__SSLSocket_context_set, NULL},
+#  define _SSL__SSLSOCKET_CONTEXT_GETSETDEF {"context", NULL, _ssl__SSLSocket_context_set, NULL},
 #endif
 
 static int
@@ -331,9 +331,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_side__doc__,
 #endif
 #if defined(_SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF)
 #  undef _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF
-#  define _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF {"server_side", (getter)_ssl__SSLSocket_server_side_get, (setter)_ssl__SSLSocket_server_side_set, _ssl__SSLSocket_server_side_DOCSTR},
+#  define _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF {"server_side", _ssl__SSLSocket_server_side_get, _ssl__SSLSocket_server_side_set, _ssl__SSLSocket_server_side_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF {"server_side", (getter)_ssl__SSLSocket_server_side_get, NULL, _ssl__SSLSocket_server_side_DOCSTR},
+#  define _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF {"server_side", _ssl__SSLSocket_server_side_get, NULL, _ssl__SSLSocket_server_side_DOCSTR},
 #endif
 
 static PyObject *
@@ -363,9 +363,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_hostname__doc__,
 #endif
 #if defined(_SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF)
 #  undef _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF
-#  define _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF {"server_hostname", (getter)_ssl__SSLSocket_server_hostname_get, (setter)_ssl__SSLSocket_server_hostname_set, _ssl__SSLSocket_server_hostname_DOCSTR},
+#  define _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF {"server_hostname", _ssl__SSLSocket_server_hostname_get, _ssl__SSLSocket_server_hostname_set, _ssl__SSLSocket_server_hostname_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF {"server_hostname", (getter)_ssl__SSLSocket_server_hostname_get, NULL, _ssl__SSLSocket_server_hostname_DOCSTR},
+#  define _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF {"server_hostname", _ssl__SSLSocket_server_hostname_get, NULL, _ssl__SSLSocket_server_hostname_DOCSTR},
 #endif
 
 static PyObject *
@@ -397,9 +397,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_owner__doc__,
 #endif
 #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF)
 #  undef _SSL__SSLSOCKET_OWNER_GETSETDEF
-#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", (getter)_ssl__SSLSocket_owner_get, (setter)_ssl__SSLSocket_owner_set, _ssl__SSLSocket_owner_DOCSTR},
+#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", _ssl__SSLSocket_owner_get, _ssl__SSLSocket_owner_set, _ssl__SSLSocket_owner_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", (getter)_ssl__SSLSocket_owner_get, NULL, _ssl__SSLSocket_owner_DOCSTR},
+#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", _ssl__SSLSocket_owner_get, NULL, _ssl__SSLSocket_owner_DOCSTR},
 #endif
 
 static PyObject *
@@ -422,9 +422,9 @@ _ssl__SSLSocket_owner_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF)
 #  undef _SSL__SSLSOCKET_OWNER_GETSETDEF
-#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", (getter)_ssl__SSLSocket_owner_get, (setter)_ssl__SSLSocket_owner_set, _ssl__SSLSocket_owner_DOCSTR},
+#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", _ssl__SSLSocket_owner_get, _ssl__SSLSocket_owner_set, _ssl__SSLSocket_owner_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", NULL, (setter)_ssl__SSLSocket_owner_set, NULL},
+#  define _SSL__SSLSOCKET_OWNER_GETSETDEF {"owner", NULL, _ssl__SSLSocket_owner_set, NULL},
 #endif
 
 static int
@@ -451,7 +451,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_write__doc__,
 "Returns the number of bytes written.");
 
 #define _SSL__SSLSOCKET_WRITE_METHODDEF    \
-    {"write", (PyCFunction)_ssl__SSLSocket_write, METH_O, _ssl__SSLSocket_write__doc__},
+    {"write", _ssl__SSLSocket_write, METH_O, _ssl__SSLSocket_write__doc__},
 
 static PyObject *
 _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b);
@@ -485,7 +485,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_pending__doc__,
 "Returns the number of already decrypted bytes available for read, pending on the connection.");
 
 #define _SSL__SSLSOCKET_PENDING_METHODDEF    \
-    {"pending", (PyCFunction)_ssl__SSLSocket_pending, METH_NOARGS, _ssl__SSLSocket_pending__doc__},
+    {"pending", _ssl__SSLSocket_pending, METH_NOARGS, _ssl__SSLSocket_pending__doc__},
 
 static PyObject *
 _ssl__SSLSocket_pending_impl(PySSLSocket *self);
@@ -507,7 +507,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_read__doc__,
 "Read up to size bytes from the SSL socket.");
 
 #define _SSL__SSLSOCKET_READ_METHODDEF    \
-    {"read", (PyCFunction)_ssl__SSLSocket_read, METH_VARARGS, _ssl__SSLSocket_read__doc__},
+    {"read", _ssl__SSLSocket_read, METH_VARARGS, _ssl__SSLSocket_read__doc__},
 
 static PyObject *
 _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
@@ -557,7 +557,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_shutdown__doc__,
 "Does the SSL shutdown handshake with the remote end.");
 
 #define _SSL__SSLSOCKET_SHUTDOWN_METHODDEF    \
-    {"shutdown", (PyCFunction)_ssl__SSLSocket_shutdown, METH_NOARGS, _ssl__SSLSocket_shutdown__doc__},
+    {"shutdown", _ssl__SSLSocket_shutdown, METH_NOARGS, _ssl__SSLSocket_shutdown__doc__},
 
 static PyObject *
 _ssl__SSLSocket_shutdown_impl(PySSLSocket *self);
@@ -663,7 +663,7 @@ PyDoc_STRVAR(_ssl__SSLSocket_verify_client_post_handshake__doc__,
 "Initiate TLS 1.3 post-handshake authentication");
 
 #define _SSL__SSLSOCKET_VERIFY_CLIENT_POST_HANDSHAKE_METHODDEF    \
-    {"verify_client_post_handshake", (PyCFunction)_ssl__SSLSocket_verify_client_post_handshake, METH_NOARGS, _ssl__SSLSocket_verify_client_post_handshake__doc__},
+    {"verify_client_post_handshake", _ssl__SSLSocket_verify_client_post_handshake, METH_NOARGS, _ssl__SSLSocket_verify_client_post_handshake__doc__},
 
 static PyObject *
 _ssl__SSLSocket_verify_client_post_handshake_impl(PySSLSocket *self);
@@ -692,9 +692,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_session__doc__,
 #endif
 #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF)
 #  undef _SSL__SSLSOCKET_SESSION_GETSETDEF
-#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", (getter)_ssl__SSLSocket_session_get, (setter)_ssl__SSLSocket_session_set, _ssl__SSLSocket_session_DOCSTR},
+#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", _ssl__SSLSocket_session_get, _ssl__SSLSocket_session_set, _ssl__SSLSocket_session_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", (getter)_ssl__SSLSocket_session_get, NULL, _ssl__SSLSocket_session_DOCSTR},
+#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", _ssl__SSLSocket_session_get, NULL, _ssl__SSLSocket_session_DOCSTR},
 #endif
 
 static PyObject *
@@ -717,9 +717,9 @@ _ssl__SSLSocket_session_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF)
 #  undef _SSL__SSLSOCKET_SESSION_GETSETDEF
-#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", (getter)_ssl__SSLSocket_session_get, (setter)_ssl__SSLSocket_session_set, _ssl__SSLSocket_session_DOCSTR},
+#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", _ssl__SSLSocket_session_get, _ssl__SSLSocket_session_set, _ssl__SSLSocket_session_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", NULL, (setter)_ssl__SSLSocket_session_set, NULL},
+#  define _SSL__SSLSOCKET_SESSION_GETSETDEF {"session", NULL, _ssl__SSLSocket_session_set, NULL},
 #endif
 
 static int
@@ -749,9 +749,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_session_reused__doc__,
 #endif
 #if defined(_SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF)
 #  undef _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF
-#  define _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF {"session_reused", (getter)_ssl__SSLSocket_session_reused_get, (setter)_ssl__SSLSocket_session_reused_set, _ssl__SSLSocket_session_reused_DOCSTR},
+#  define _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF {"session_reused", _ssl__SSLSocket_session_reused_get, _ssl__SSLSocket_session_reused_set, _ssl__SSLSocket_session_reused_DOCSTR},
 #else
-#  define _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF {"session_reused", (getter)_ssl__SSLSocket_session_reused_get, NULL, _ssl__SSLSocket_session_reused_DOCSTR},
+#  define _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF {"session_reused", _ssl__SSLSocket_session_reused_get, NULL, _ssl__SSLSocket_session_reused_DOCSTR},
 #endif
 
 static PyObject *
@@ -804,7 +804,7 @@ PyDoc_STRVAR(_ssl__SSLContext_set_ciphers__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT_SET_CIPHERS_METHODDEF    \
-    {"set_ciphers", (PyCFunction)_ssl__SSLContext_set_ciphers, METH_O, _ssl__SSLContext_set_ciphers__doc__},
+    {"set_ciphers", _ssl__SSLContext_set_ciphers, METH_O, _ssl__SSLContext_set_ciphers__doc__},
 
 static PyObject *
 _ssl__SSLContext_set_ciphers_impl(PySSLContext *self, const char *cipherlist);
@@ -842,7 +842,7 @@ PyDoc_STRVAR(_ssl__SSLContext_get_ciphers__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF    \
-    {"get_ciphers", (PyCFunction)_ssl__SSLContext_get_ciphers, METH_NOARGS, _ssl__SSLContext_get_ciphers__doc__},
+    {"get_ciphers", _ssl__SSLContext_get_ciphers, METH_NOARGS, _ssl__SSLContext_get_ciphers__doc__},
 
 static PyObject *
 _ssl__SSLContext_get_ciphers_impl(PySSLContext *self);
@@ -865,7 +865,7 @@ PyDoc_STRVAR(_ssl__SSLContext__set_alpn_protocols__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT__SET_ALPN_PROTOCOLS_METHODDEF    \
-    {"_set_alpn_protocols", (PyCFunction)_ssl__SSLContext__set_alpn_protocols, METH_O, _ssl__SSLContext__set_alpn_protocols__doc__},
+    {"_set_alpn_protocols", _ssl__SSLContext__set_alpn_protocols, METH_O, _ssl__SSLContext__set_alpn_protocols__doc__},
 
 static PyObject *
 _ssl__SSLContext__set_alpn_protocols_impl(PySSLContext *self,
@@ -898,9 +898,9 @@ _ssl__SSLContext__set_alpn_protocols(PyObject *self, PyObject *arg)
 #endif
 #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF
-#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", (getter)_ssl__SSLContext_verify_mode_get, (setter)_ssl__SSLContext_verify_mode_set, _ssl__SSLContext_verify_mode_DOCSTR},
+#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", _ssl__SSLContext_verify_mode_get, _ssl__SSLContext_verify_mode_set, _ssl__SSLContext_verify_mode_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", (getter)_ssl__SSLContext_verify_mode_get, NULL, _ssl__SSLContext_verify_mode_DOCSTR},
+#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", _ssl__SSLContext_verify_mode_get, NULL, _ssl__SSLContext_verify_mode_DOCSTR},
 #endif
 
 static PyObject *
@@ -923,9 +923,9 @@ _ssl__SSLContext_verify_mode_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF
-#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", (getter)_ssl__SSLContext_verify_mode_get, (setter)_ssl__SSLContext_verify_mode_set, _ssl__SSLContext_verify_mode_DOCSTR},
+#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", _ssl__SSLContext_verify_mode_get, _ssl__SSLContext_verify_mode_set, _ssl__SSLContext_verify_mode_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", NULL, (setter)_ssl__SSLContext_verify_mode_set, NULL},
+#  define _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF {"verify_mode", NULL, _ssl__SSLContext_verify_mode_set, NULL},
 #endif
 
 static int
@@ -948,9 +948,9 @@ _ssl__SSLContext_verify_mode_set(PyObject *self, PyObject *value, void *Py_UNUSE
 #endif
 #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF
-#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", (getter)_ssl__SSLContext_verify_flags_get, (setter)_ssl__SSLContext_verify_flags_set, _ssl__SSLContext_verify_flags_DOCSTR},
+#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", _ssl__SSLContext_verify_flags_get, _ssl__SSLContext_verify_flags_set, _ssl__SSLContext_verify_flags_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", (getter)_ssl__SSLContext_verify_flags_get, NULL, _ssl__SSLContext_verify_flags_DOCSTR},
+#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", _ssl__SSLContext_verify_flags_get, NULL, _ssl__SSLContext_verify_flags_DOCSTR},
 #endif
 
 static PyObject *
@@ -973,9 +973,9 @@ _ssl__SSLContext_verify_flags_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF
-#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", (getter)_ssl__SSLContext_verify_flags_get, (setter)_ssl__SSLContext_verify_flags_set, _ssl__SSLContext_verify_flags_DOCSTR},
+#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", _ssl__SSLContext_verify_flags_get, _ssl__SSLContext_verify_flags_set, _ssl__SSLContext_verify_flags_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", NULL, (setter)_ssl__SSLContext_verify_flags_set, NULL},
+#  define _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF {"verify_flags", NULL, _ssl__SSLContext_verify_flags_set, NULL},
 #endif
 
 static int
@@ -998,9 +998,9 @@ _ssl__SSLContext_verify_flags_set(PyObject *self, PyObject *value, void *Py_UNUS
 #endif
 #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF
-#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", (getter)_ssl__SSLContext_minimum_version_get, (setter)_ssl__SSLContext_minimum_version_set, _ssl__SSLContext_minimum_version_DOCSTR},
+#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", _ssl__SSLContext_minimum_version_get, _ssl__SSLContext_minimum_version_set, _ssl__SSLContext_minimum_version_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", (getter)_ssl__SSLContext_minimum_version_get, NULL, _ssl__SSLContext_minimum_version_DOCSTR},
+#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", _ssl__SSLContext_minimum_version_get, NULL, _ssl__SSLContext_minimum_version_DOCSTR},
 #endif
 
 static PyObject *
@@ -1023,9 +1023,9 @@ _ssl__SSLContext_minimum_version_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF
-#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", (getter)_ssl__SSLContext_minimum_version_get, (setter)_ssl__SSLContext_minimum_version_set, _ssl__SSLContext_minimum_version_DOCSTR},
+#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", _ssl__SSLContext_minimum_version_get, _ssl__SSLContext_minimum_version_set, _ssl__SSLContext_minimum_version_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", NULL, (setter)_ssl__SSLContext_minimum_version_set, NULL},
+#  define _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF {"minimum_version", NULL, _ssl__SSLContext_minimum_version_set, NULL},
 #endif
 
 static int
@@ -1049,9 +1049,9 @@ _ssl__SSLContext_minimum_version_set(PyObject *self, PyObject *value, void *Py_U
 #endif
 #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF
-#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", (getter)_ssl__SSLContext_maximum_version_get, (setter)_ssl__SSLContext_maximum_version_set, _ssl__SSLContext_maximum_version_DOCSTR},
+#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", _ssl__SSLContext_maximum_version_get, _ssl__SSLContext_maximum_version_set, _ssl__SSLContext_maximum_version_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", (getter)_ssl__SSLContext_maximum_version_get, NULL, _ssl__SSLContext_maximum_version_DOCSTR},
+#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", _ssl__SSLContext_maximum_version_get, NULL, _ssl__SSLContext_maximum_version_DOCSTR},
 #endif
 
 static PyObject *
@@ -1074,9 +1074,9 @@ _ssl__SSLContext_maximum_version_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF
-#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", (getter)_ssl__SSLContext_maximum_version_get, (setter)_ssl__SSLContext_maximum_version_set, _ssl__SSLContext_maximum_version_DOCSTR},
+#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", _ssl__SSLContext_maximum_version_get, _ssl__SSLContext_maximum_version_set, _ssl__SSLContext_maximum_version_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", NULL, (setter)_ssl__SSLContext_maximum_version_set, NULL},
+#  define _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF {"maximum_version", NULL, _ssl__SSLContext_maximum_version_set, NULL},
 #endif
 
 static int
@@ -1107,9 +1107,9 @@ PyDoc_STRVAR(_ssl__SSLContext_num_tickets__doc__,
 #endif
 #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF
-#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", (getter)_ssl__SSLContext_num_tickets_get, (setter)_ssl__SSLContext_num_tickets_set, _ssl__SSLContext_num_tickets_DOCSTR},
+#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", _ssl__SSLContext_num_tickets_get, _ssl__SSLContext_num_tickets_set, _ssl__SSLContext_num_tickets_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", (getter)_ssl__SSLContext_num_tickets_get, NULL, _ssl__SSLContext_num_tickets_DOCSTR},
+#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", _ssl__SSLContext_num_tickets_get, NULL, _ssl__SSLContext_num_tickets_DOCSTR},
 #endif
 
 static PyObject *
@@ -1132,9 +1132,9 @@ _ssl__SSLContext_num_tickets_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF
-#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", (getter)_ssl__SSLContext_num_tickets_get, (setter)_ssl__SSLContext_num_tickets_set, _ssl__SSLContext_num_tickets_DOCSTR},
+#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", _ssl__SSLContext_num_tickets_get, _ssl__SSLContext_num_tickets_set, _ssl__SSLContext_num_tickets_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", NULL, (setter)_ssl__SSLContext_num_tickets_set, NULL},
+#  define _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF {"num_tickets", NULL, _ssl__SSLContext_num_tickets_set, NULL},
 #endif
 
 static int
@@ -1164,9 +1164,9 @@ PyDoc_STRVAR(_ssl__SSLContext_security_level__doc__,
 #endif
 #if defined(_SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF
-#  define _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF {"security_level", (getter)_ssl__SSLContext_security_level_get, (setter)_ssl__SSLContext_security_level_set, _ssl__SSLContext_security_level_DOCSTR},
+#  define _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF {"security_level", _ssl__SSLContext_security_level_get, _ssl__SSLContext_security_level_set, _ssl__SSLContext_security_level_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF {"security_level", (getter)_ssl__SSLContext_security_level_get, NULL, _ssl__SSLContext_security_level_DOCSTR},
+#  define _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF {"security_level", _ssl__SSLContext_security_level_get, NULL, _ssl__SSLContext_security_level_DOCSTR},
 #endif
 
 static PyObject *
@@ -1189,9 +1189,9 @@ _ssl__SSLContext_security_level_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF
-#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", (getter)_ssl__SSLContext_options_get, (setter)_ssl__SSLContext_options_set, _ssl__SSLContext_options_DOCSTR},
+#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", _ssl__SSLContext_options_get, _ssl__SSLContext_options_set, _ssl__SSLContext_options_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", (getter)_ssl__SSLContext_options_get, NULL, _ssl__SSLContext_options_DOCSTR},
+#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", _ssl__SSLContext_options_get, NULL, _ssl__SSLContext_options_DOCSTR},
 #endif
 
 static PyObject *
@@ -1214,9 +1214,9 @@ _ssl__SSLContext_options_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF
-#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", (getter)_ssl__SSLContext_options_get, (setter)_ssl__SSLContext_options_set, _ssl__SSLContext_options_DOCSTR},
+#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", _ssl__SSLContext_options_get, _ssl__SSLContext_options_set, _ssl__SSLContext_options_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", NULL, (setter)_ssl__SSLContext_options_set, NULL},
+#  define _SSL__SSLCONTEXT_OPTIONS_GETSETDEF {"options", NULL, _ssl__SSLContext_options_set, NULL},
 #endif
 
 static int
@@ -1239,9 +1239,9 @@ _ssl__SSLContext_options_set(PyObject *self, PyObject *value, void *Py_UNUSED(co
 #endif
 #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF
-#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", (getter)_ssl__SSLContext__host_flags_get, (setter)_ssl__SSLContext__host_flags_set, _ssl__SSLContext__host_flags_DOCSTR},
+#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", _ssl__SSLContext__host_flags_get, _ssl__SSLContext__host_flags_set, _ssl__SSLContext__host_flags_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", (getter)_ssl__SSLContext__host_flags_get, NULL, _ssl__SSLContext__host_flags_DOCSTR},
+#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", _ssl__SSLContext__host_flags_get, NULL, _ssl__SSLContext__host_flags_DOCSTR},
 #endif
 
 static PyObject *
@@ -1264,9 +1264,9 @@ _ssl__SSLContext__host_flags_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF)
 #  undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF
-#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", (getter)_ssl__SSLContext__host_flags_get, (setter)_ssl__SSLContext__host_flags_set, _ssl__SSLContext__host_flags_DOCSTR},
+#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", _ssl__SSLContext__host_flags_get, _ssl__SSLContext__host_flags_set, _ssl__SSLContext__host_flags_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", NULL, (setter)_ssl__SSLContext__host_flags_set, NULL},
+#  define _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF {"_host_flags", NULL, _ssl__SSLContext__host_flags_set, NULL},
 #endif
 
 static int
@@ -1289,9 +1289,9 @@ _ssl__SSLContext__host_flags_set(PyObject *self, PyObject *value, void *Py_UNUSE
 #endif
 #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF
-#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", (getter)_ssl__SSLContext_check_hostname_get, (setter)_ssl__SSLContext_check_hostname_set, _ssl__SSLContext_check_hostname_DOCSTR},
+#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", _ssl__SSLContext_check_hostname_get, _ssl__SSLContext_check_hostname_set, _ssl__SSLContext_check_hostname_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", (getter)_ssl__SSLContext_check_hostname_get, NULL, _ssl__SSLContext_check_hostname_DOCSTR},
+#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", _ssl__SSLContext_check_hostname_get, NULL, _ssl__SSLContext_check_hostname_DOCSTR},
 #endif
 
 static PyObject *
@@ -1314,9 +1314,9 @@ _ssl__SSLContext_check_hostname_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF
-#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", (getter)_ssl__SSLContext_check_hostname_get, (setter)_ssl__SSLContext_check_hostname_set, _ssl__SSLContext_check_hostname_DOCSTR},
+#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", _ssl__SSLContext_check_hostname_get, _ssl__SSLContext_check_hostname_set, _ssl__SSLContext_check_hostname_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", NULL, (setter)_ssl__SSLContext_check_hostname_set, NULL},
+#  define _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF {"check_hostname", NULL, _ssl__SSLContext_check_hostname_set, NULL},
 #endif
 
 static int
@@ -1339,9 +1339,9 @@ _ssl__SSLContext_check_hostname_set(PyObject *self, PyObject *value, void *Py_UN
 #endif
 #if defined(_SSL__SSLCONTEXT_PROTOCOL_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF
-#  define _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF {"protocol", (getter)_ssl__SSLContext_protocol_get, (setter)_ssl__SSLContext_protocol_set, _ssl__SSLContext_protocol_DOCSTR},
+#  define _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF {"protocol", _ssl__SSLContext_protocol_get, _ssl__SSLContext_protocol_set, _ssl__SSLContext_protocol_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF {"protocol", (getter)_ssl__SSLContext_protocol_get, NULL, _ssl__SSLContext_protocol_DOCSTR},
+#  define _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF {"protocol", _ssl__SSLContext_protocol_get, NULL, _ssl__SSLContext_protocol_DOCSTR},
 #endif
 
 static PyObject *
@@ -1520,7 +1520,7 @@ PyDoc_STRVAR(_ssl__SSLContext_load_dh_params__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT_LOAD_DH_PARAMS_METHODDEF    \
-    {"load_dh_params", (PyCFunction)_ssl__SSLContext_load_dh_params, METH_O, _ssl__SSLContext_load_dh_params__doc__},
+    {"load_dh_params", _ssl__SSLContext_load_dh_params, METH_O, _ssl__SSLContext_load_dh_params__doc__},
 
 static PyObject *
 _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath);
@@ -1742,7 +1742,7 @@ PyDoc_STRVAR(_ssl__SSLContext_session_stats__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT_SESSION_STATS_METHODDEF    \
-    {"session_stats", (PyCFunction)_ssl__SSLContext_session_stats, METH_NOARGS, _ssl__SSLContext_session_stats__doc__},
+    {"session_stats", _ssl__SSLContext_session_stats, METH_NOARGS, _ssl__SSLContext_session_stats__doc__},
 
 static PyObject *
 _ssl__SSLContext_session_stats_impl(PySSLContext *self);
@@ -1765,7 +1765,7 @@ PyDoc_STRVAR(_ssl__SSLContext_set_default_verify_paths__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT_SET_DEFAULT_VERIFY_PATHS_METHODDEF    \
-    {"set_default_verify_paths", (PyCFunction)_ssl__SSLContext_set_default_verify_paths, METH_NOARGS, _ssl__SSLContext_set_default_verify_paths__doc__},
+    {"set_default_verify_paths", _ssl__SSLContext_set_default_verify_paths, METH_NOARGS, _ssl__SSLContext_set_default_verify_paths__doc__},
 
 static PyObject *
 _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self);
@@ -1788,7 +1788,7 @@ PyDoc_STRVAR(_ssl__SSLContext_set_ecdh_curve__doc__,
 "\n");
 
 #define _SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF    \
-    {"set_ecdh_curve", (PyCFunction)_ssl__SSLContext_set_ecdh_curve, METH_O, _ssl__SSLContext_set_ecdh_curve__doc__},
+    {"set_ecdh_curve", _ssl__SSLContext_set_ecdh_curve, METH_O, _ssl__SSLContext_set_ecdh_curve__doc__},
 
 static PyObject *
 _ssl__SSLContext_set_ecdh_curve_impl(PySSLContext *self, PyObject *name);
@@ -1822,9 +1822,9 @@ PyDoc_STRVAR(_ssl__SSLContext_sni_callback__doc__,
 #endif
 #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF
-#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", (getter)_ssl__SSLContext_sni_callback_get, (setter)_ssl__SSLContext_sni_callback_set, _ssl__SSLContext_sni_callback_DOCSTR},
+#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", _ssl__SSLContext_sni_callback_get, _ssl__SSLContext_sni_callback_set, _ssl__SSLContext_sni_callback_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", (getter)_ssl__SSLContext_sni_callback_get, NULL, _ssl__SSLContext_sni_callback_DOCSTR},
+#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", _ssl__SSLContext_sni_callback_get, NULL, _ssl__SSLContext_sni_callback_DOCSTR},
 #endif
 
 static PyObject *
@@ -1847,9 +1847,9 @@ _ssl__SSLContext_sni_callback_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF)
 #  undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF
-#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", (getter)_ssl__SSLContext_sni_callback_get, (setter)_ssl__SSLContext_sni_callback_set, _ssl__SSLContext_sni_callback_DOCSTR},
+#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", _ssl__SSLContext_sni_callback_get, _ssl__SSLContext_sni_callback_set, _ssl__SSLContext_sni_callback_DOCSTR},
 #else
-#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", NULL, (setter)_ssl__SSLContext_sni_callback_set, NULL},
+#  define _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF {"sni_callback", NULL, _ssl__SSLContext_sni_callback_set, NULL},
 #endif
 
 static int
@@ -1880,7 +1880,7 @@ PyDoc_STRVAR(_ssl__SSLContext_cert_store_stats__doc__,
 "been used at least once.");
 
 #define _SSL__SSLCONTEXT_CERT_STORE_STATS_METHODDEF    \
-    {"cert_store_stats", (PyCFunction)_ssl__SSLContext_cert_store_stats, METH_NOARGS, _ssl__SSLContext_cert_store_stats__doc__},
+    {"cert_store_stats", _ssl__SSLContext_cert_store_stats, METH_NOARGS, _ssl__SSLContext_cert_store_stats__doc__},
 
 static PyObject *
 _ssl__SSLContext_cert_store_stats_impl(PySSLContext *self);
@@ -2153,9 +2153,9 @@ PyDoc_STRVAR(_ssl_MemoryBIO_pending__doc__,
 #endif
 #if defined(_SSL_MEMORYBIO_PENDING_GETSETDEF)
 #  undef _SSL_MEMORYBIO_PENDING_GETSETDEF
-#  define _SSL_MEMORYBIO_PENDING_GETSETDEF {"pending", (getter)_ssl_MemoryBIO_pending_get, (setter)_ssl_MemoryBIO_pending_set, _ssl_MemoryBIO_pending_DOCSTR},
+#  define _SSL_MEMORYBIO_PENDING_GETSETDEF {"pending", _ssl_MemoryBIO_pending_get, _ssl_MemoryBIO_pending_set, _ssl_MemoryBIO_pending_DOCSTR},
 #else
-#  define _SSL_MEMORYBIO_PENDING_GETSETDEF {"pending", (getter)_ssl_MemoryBIO_pending_get, NULL, _ssl_MemoryBIO_pending_DOCSTR},
+#  define _SSL_MEMORYBIO_PENDING_GETSETDEF {"pending", _ssl_MemoryBIO_pending_get, NULL, _ssl_MemoryBIO_pending_DOCSTR},
 #endif
 
 static PyObject *
@@ -2185,9 +2185,9 @@ PyDoc_STRVAR(_ssl_MemoryBIO_eof__doc__,
 #endif
 #if defined(_SSL_MEMORYBIO_EOF_GETSETDEF)
 #  undef _SSL_MEMORYBIO_EOF_GETSETDEF
-#  define _SSL_MEMORYBIO_EOF_GETSETDEF {"eof", (getter)_ssl_MemoryBIO_eof_get, (setter)_ssl_MemoryBIO_eof_set, _ssl_MemoryBIO_eof_DOCSTR},
+#  define _SSL_MEMORYBIO_EOF_GETSETDEF {"eof", _ssl_MemoryBIO_eof_get, _ssl_MemoryBIO_eof_set, _ssl_MemoryBIO_eof_DOCSTR},
 #else
-#  define _SSL_MEMORYBIO_EOF_GETSETDEF {"eof", (getter)_ssl_MemoryBIO_eof_get, NULL, _ssl_MemoryBIO_eof_DOCSTR},
+#  define _SSL_MEMORYBIO_EOF_GETSETDEF {"eof", _ssl_MemoryBIO_eof_get, NULL, _ssl_MemoryBIO_eof_DOCSTR},
 #endif
 
 static PyObject *
@@ -2256,7 +2256,7 @@ PyDoc_STRVAR(_ssl_MemoryBIO_write__doc__,
 "Returns the number of bytes written.");
 
 #define _SSL_MEMORYBIO_WRITE_METHODDEF    \
-    {"write", (PyCFunction)_ssl_MemoryBIO_write, METH_O, _ssl_MemoryBIO_write__doc__},
+    {"write", _ssl_MemoryBIO_write, METH_O, _ssl_MemoryBIO_write__doc__},
 
 static PyObject *
 _ssl_MemoryBIO_write_impl(PySSLMemoryBIO *self, Py_buffer *b);
@@ -2292,7 +2292,7 @@ PyDoc_STRVAR(_ssl_MemoryBIO_write_eof__doc__,
 "When all data has been read, the \"eof\" property will be True.");
 
 #define _SSL_MEMORYBIO_WRITE_EOF_METHODDEF    \
-    {"write_eof", (PyCFunction)_ssl_MemoryBIO_write_eof, METH_NOARGS, _ssl_MemoryBIO_write_eof__doc__},
+    {"write_eof", _ssl_MemoryBIO_write_eof, METH_NOARGS, _ssl_MemoryBIO_write_eof__doc__},
 
 static PyObject *
 _ssl_MemoryBIO_write_eof_impl(PySSLMemoryBIO *self);
@@ -2321,9 +2321,9 @@ PyDoc_STRVAR(_ssl_SSLSession_time__doc__,
 #endif
 #if defined(_SSL_SSLSESSION_TIME_GETSETDEF)
 #  undef _SSL_SSLSESSION_TIME_GETSETDEF
-#  define _SSL_SSLSESSION_TIME_GETSETDEF {"time", (getter)_ssl_SSLSession_time_get, (setter)_ssl_SSLSession_time_set, _ssl_SSLSession_time_DOCSTR},
+#  define _SSL_SSLSESSION_TIME_GETSETDEF {"time", _ssl_SSLSession_time_get, _ssl_SSLSession_time_set, _ssl_SSLSession_time_DOCSTR},
 #else
-#  define _SSL_SSLSESSION_TIME_GETSETDEF {"time", (getter)_ssl_SSLSession_time_get, NULL, _ssl_SSLSession_time_DOCSTR},
+#  define _SSL_SSLSESSION_TIME_GETSETDEF {"time", _ssl_SSLSession_time_get, NULL, _ssl_SSLSession_time_DOCSTR},
 #endif
 
 static PyObject *
@@ -2353,9 +2353,9 @@ PyDoc_STRVAR(_ssl_SSLSession_timeout__doc__,
 #endif
 #if defined(_SSL_SSLSESSION_TIMEOUT_GETSETDEF)
 #  undef _SSL_SSLSESSION_TIMEOUT_GETSETDEF
-#  define _SSL_SSLSESSION_TIMEOUT_GETSETDEF {"timeout", (getter)_ssl_SSLSession_timeout_get, (setter)_ssl_SSLSession_timeout_set, _ssl_SSLSession_timeout_DOCSTR},
+#  define _SSL_SSLSESSION_TIMEOUT_GETSETDEF {"timeout", _ssl_SSLSession_timeout_get, _ssl_SSLSession_timeout_set, _ssl_SSLSession_timeout_DOCSTR},
 #else
-#  define _SSL_SSLSESSION_TIMEOUT_GETSETDEF {"timeout", (getter)_ssl_SSLSession_timeout_get, NULL, _ssl_SSLSession_timeout_DOCSTR},
+#  define _SSL_SSLSESSION_TIMEOUT_GETSETDEF {"timeout", _ssl_SSLSession_timeout_get, NULL, _ssl_SSLSession_timeout_DOCSTR},
 #endif
 
 static PyObject *
@@ -2385,9 +2385,9 @@ PyDoc_STRVAR(_ssl_SSLSession_ticket_lifetime_hint__doc__,
 #endif
 #if defined(_SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF)
 #  undef _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF
-#  define _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF {"ticket_lifetime_hint", (getter)_ssl_SSLSession_ticket_lifetime_hint_get, (setter)_ssl_SSLSession_ticket_lifetime_hint_set, _ssl_SSLSession_ticket_lifetime_hint_DOCSTR},
+#  define _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF {"ticket_lifetime_hint", _ssl_SSLSession_ticket_lifetime_hint_get, _ssl_SSLSession_ticket_lifetime_hint_set, _ssl_SSLSession_ticket_lifetime_hint_DOCSTR},
 #else
-#  define _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF {"ticket_lifetime_hint", (getter)_ssl_SSLSession_ticket_lifetime_hint_get, NULL, _ssl_SSLSession_ticket_lifetime_hint_DOCSTR},
+#  define _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF {"ticket_lifetime_hint", _ssl_SSLSession_ticket_lifetime_hint_get, NULL, _ssl_SSLSession_ticket_lifetime_hint_DOCSTR},
 #endif
 
 static PyObject *
@@ -2417,9 +2417,9 @@ PyDoc_STRVAR(_ssl_SSLSession_id__doc__,
 #endif
 #if defined(_SSL_SSLSESSION_ID_GETSETDEF)
 #  undef _SSL_SSLSESSION_ID_GETSETDEF
-#  define _SSL_SSLSESSION_ID_GETSETDEF {"id", (getter)_ssl_SSLSession_id_get, (setter)_ssl_SSLSession_id_set, _ssl_SSLSession_id_DOCSTR},
+#  define _SSL_SSLSESSION_ID_GETSETDEF {"id", _ssl_SSLSession_id_get, _ssl_SSLSession_id_set, _ssl_SSLSession_id_DOCSTR},
 #else
-#  define _SSL_SSLSESSION_ID_GETSETDEF {"id", (getter)_ssl_SSLSession_id_get, NULL, _ssl_SSLSession_id_DOCSTR},
+#  define _SSL_SSLSESSION_ID_GETSETDEF {"id", _ssl_SSLSession_id_get, NULL, _ssl_SSLSession_id_DOCSTR},
 #endif
 
 static PyObject *
@@ -2449,9 +2449,9 @@ PyDoc_STRVAR(_ssl_SSLSession_has_ticket__doc__,
 #endif
 #if defined(_SSL_SSLSESSION_HAS_TICKET_GETSETDEF)
 #  undef _SSL_SSLSESSION_HAS_TICKET_GETSETDEF
-#  define _SSL_SSLSESSION_HAS_TICKET_GETSETDEF {"has_ticket", (getter)_ssl_SSLSession_has_ticket_get, (setter)_ssl_SSLSession_has_ticket_set, _ssl_SSLSession_has_ticket_DOCSTR},
+#  define _SSL_SSLSESSION_HAS_TICKET_GETSETDEF {"has_ticket", _ssl_SSLSession_has_ticket_get, _ssl_SSLSession_has_ticket_set, _ssl_SSLSession_has_ticket_DOCSTR},
 #else
-#  define _SSL_SSLSESSION_HAS_TICKET_GETSETDEF {"has_ticket", (getter)_ssl_SSLSession_has_ticket_get, NULL, _ssl_SSLSession_has_ticket_DOCSTR},
+#  define _SSL_SSLSESSION_HAS_TICKET_GETSETDEF {"has_ticket", _ssl_SSLSession_has_ticket_get, NULL, _ssl_SSLSession_has_ticket_DOCSTR},
 #endif
 
 static PyObject *
@@ -2539,7 +2539,7 @@ PyDoc_STRVAR(_ssl_RAND_bytes__doc__,
 "Generate n cryptographically strong pseudo-random bytes.");
 
 #define _SSL_RAND_BYTES_METHODDEF    \
-    {"RAND_bytes", (PyCFunction)_ssl_RAND_bytes, METH_O, _ssl_RAND_bytes__doc__},
+    {"RAND_bytes", _ssl_RAND_bytes, METH_O, _ssl_RAND_bytes__doc__},
 
 static PyObject *
 _ssl_RAND_bytes_impl(PyObject *module, int n);
@@ -2572,7 +2572,7 @@ PyDoc_STRVAR(_ssl_RAND_status__doc__,
 "using the ssl() function.");
 
 #define _SSL_RAND_STATUS_METHODDEF    \
-    {"RAND_status", (PyCFunction)_ssl_RAND_status, METH_NOARGS, _ssl_RAND_status__doc__},
+    {"RAND_status", _ssl_RAND_status, METH_NOARGS, _ssl_RAND_status__doc__},
 
 static PyObject *
 _ssl_RAND_status_impl(PyObject *module);
@@ -2598,7 +2598,7 @@ PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__,
 "The values are \'cert_file_env\', \'cert_file\', \'cert_dir_env\', \'cert_dir\'.");
 
 #define _SSL_GET_DEFAULT_VERIFY_PATHS_METHODDEF    \
-    {"get_default_verify_paths", (PyCFunction)_ssl_get_default_verify_paths, METH_NOARGS, _ssl_get_default_verify_paths__doc__},
+    {"get_default_verify_paths", _ssl_get_default_verify_paths, METH_NOARGS, _ssl_get_default_verify_paths__doc__},
 
 static PyObject *
 _ssl_get_default_verify_paths_impl(PyObject *module);
@@ -2707,7 +2707,7 @@ PyDoc_STRVAR(_ssl_nid2obj__doc__,
 "Lookup NID, short name, long name and OID of an ASN1_OBJECT by NID.");
 
 #define _SSL_NID2OBJ_METHODDEF    \
-    {"nid2obj", (PyCFunction)_ssl_nid2obj, METH_O, _ssl_nid2obj__doc__},
+    {"nid2obj", _ssl_nid2obj, METH_O, _ssl_nid2obj__doc__},
 
 static PyObject *
 _ssl_nid2obj_impl(PyObject *module, int nid);
@@ -2900,4 +2900,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=748650909fec8906 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=36d1b09b6d459009 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h
index e4eaadb91eb231..e4ebe29da1fae1 100644
--- a/Modules/clinic/_struct.c.h
+++ b/Modules/clinic/_struct.c.h
@@ -83,7 +83,7 @@ PyDoc_STRVAR(Struct_unpack__doc__,
 "See help(struct) for more on format strings.");
 
 #define STRUCT_UNPACK_METHODDEF    \
-    {"unpack", (PyCFunction)Struct_unpack, METH_O, Struct_unpack__doc__},
+    {"unpack", Struct_unpack, METH_O, Struct_unpack__doc__},
 
 static PyObject *
 Struct_unpack_impl(PyStructObject *self, Py_buffer *buffer);
@@ -211,7 +211,7 @@ PyDoc_STRVAR(Struct_iter_unpack__doc__,
 "Requires that the bytes length be a multiple of the struct size.");
 
 #define STRUCT_ITER_UNPACK_METHODDEF    \
-    {"iter_unpack", (PyCFunction)Struct_iter_unpack, METH_O, Struct_iter_unpack__doc__},
+    {"iter_unpack", Struct_iter_unpack, METH_O, Struct_iter_unpack__doc__},
 
 static PyObject *
 Struct_iter_unpack_impl(PyStructObject *self, PyObject *buffer);
@@ -233,7 +233,7 @@ PyDoc_STRVAR(_clearcache__doc__,
 "Clear the internal cache.");
 
 #define _CLEARCACHE_METHODDEF    \
-    {"_clearcache", (PyCFunction)_clearcache, METH_NOARGS, _clearcache__doc__},
+    {"_clearcache", _clearcache, METH_NOARGS, _clearcache__doc__},
 
 static PyObject *
 _clearcache_impl(PyObject *module);
@@ -251,7 +251,7 @@ PyDoc_STRVAR(calcsize__doc__,
 "Return size in bytes of the struct described by the format string.");
 
 #define CALCSIZE_METHODDEF    \
-    {"calcsize", (PyCFunction)calcsize, METH_O, calcsize__doc__},
+    {"calcsize", calcsize, METH_O, calcsize__doc__},
 
 static Py_ssize_t
 calcsize_impl(PyObject *module, PyStructObject *s_object);
@@ -458,4 +458,4 @@ iter_unpack(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 
     return return_value;
 }
-/*[clinic end generated code: output=caa7f36443e91cb9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=dc1f534edff25307 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_sysconfig.c.h b/Modules/clinic/_sysconfig.c.h
index eb3d396298bb21..5ceddd925ae30a 100644
--- a/Modules/clinic/_sysconfig.c.h
+++ b/Modules/clinic/_sysconfig.c.h
@@ -9,7 +9,7 @@ PyDoc_STRVAR(_sysconfig_config_vars__doc__,
 "Returns a dictionary containing build variables intended to be exposed by sysconfig.");
 
 #define _SYSCONFIG_CONFIG_VARS_METHODDEF    \
-    {"config_vars", (PyCFunction)_sysconfig_config_vars, METH_NOARGS, _sysconfig_config_vars__doc__},
+    {"config_vars", _sysconfig_config_vars, METH_NOARGS, _sysconfig_config_vars__doc__},
 
 static PyObject *
 _sysconfig_config_vars_impl(PyObject *module);
@@ -19,4 +19,4 @@ _sysconfig_config_vars(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return _sysconfig_config_vars_impl(module);
 }
-/*[clinic end generated code: output=25d395cf02eced1f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=63b2681222d333d9 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h
index 56b0ca316d4952..1c3ce81b43f204 100644
--- a/Modules/clinic/_testclinic.c.h
+++ b/Modules/clinic/_testclinic.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(test_empty_function__doc__,
 "\n");
 
 #define TEST_EMPTY_FUNCTION_METHODDEF    \
-    {"test_empty_function", (PyCFunction)test_empty_function, METH_NOARGS, test_empty_function__doc__},
+    {"test_empty_function", test_empty_function, METH_NOARGS, test_empty_function__doc__},
 
 static PyObject *
 test_empty_function_impl(PyObject *module);
@@ -67,7 +67,7 @@ PyDoc_STRVAR(bytes_object_converter__doc__,
 "\n");
 
 #define BYTES_OBJECT_CONVERTER_METHODDEF    \
-    {"bytes_object_converter", (PyCFunction)bytes_object_converter, METH_O, bytes_object_converter__doc__},
+    {"bytes_object_converter", bytes_object_converter, METH_O, bytes_object_converter__doc__},
 
 static PyObject *
 bytes_object_converter_impl(PyObject *module, PyBytesObject *a);
@@ -95,7 +95,7 @@ PyDoc_STRVAR(byte_array_object_converter__doc__,
 "\n");
 
 #define BYTE_ARRAY_OBJECT_CONVERTER_METHODDEF    \
-    {"byte_array_object_converter", (PyCFunction)byte_array_object_converter, METH_O, byte_array_object_converter__doc__},
+    {"byte_array_object_converter", byte_array_object_converter, METH_O, byte_array_object_converter__doc__},
 
 static PyObject *
 byte_array_object_converter_impl(PyObject *module, PyByteArrayObject *a);
@@ -123,7 +123,7 @@ PyDoc_STRVAR(unicode_converter__doc__,
 "\n");
 
 #define UNICODE_CONVERTER_METHODDEF    \
-    {"unicode_converter", (PyCFunction)unicode_converter, METH_O, unicode_converter__doc__},
+    {"unicode_converter", unicode_converter, METH_O, unicode_converter__doc__},
 
 static PyObject *
 unicode_converter_impl(PyObject *module, PyObject *a);
@@ -1309,7 +1309,7 @@ PyDoc_STRVAR(py_complex_converter__doc__,
 "\n");
 
 #define PY_COMPLEX_CONVERTER_METHODDEF    \
-    {"py_complex_converter", (PyCFunction)py_complex_converter, METH_O, py_complex_converter__doc__},
+    {"py_complex_converter", py_complex_converter, METH_O, py_complex_converter__doc__},
 
 static PyObject *
 py_complex_converter_impl(PyObject *module, Py_complex a);
@@ -4073,7 +4073,7 @@ PyDoc_STRVAR(_testclinic_TestClass_varpos_no_fastcall__doc__,
 "\n");
 
 #define _TESTCLINIC_TESTCLASS_VARPOS_NO_FASTCALL_METHODDEF    \
-    {"varpos_no_fastcall", (PyCFunction)_testclinic_TestClass_varpos_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_varpos_no_fastcall__doc__},
+    {"varpos_no_fastcall", _testclinic_TestClass_varpos_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_varpos_no_fastcall__doc__},
 
 static PyObject *
 _testclinic_TestClass_varpos_no_fastcall_impl(PyTypeObject *type,
@@ -4100,7 +4100,7 @@ PyDoc_STRVAR(_testclinic_TestClass_posonly_varpos_no_fastcall__doc__,
 "\n");
 
 #define _TESTCLINIC_TESTCLASS_POSONLY_VARPOS_NO_FASTCALL_METHODDEF    \
-    {"posonly_varpos_no_fastcall", (PyCFunction)_testclinic_TestClass_posonly_varpos_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_varpos_no_fastcall__doc__},
+    {"posonly_varpos_no_fastcall", _testclinic_TestClass_posonly_varpos_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_varpos_no_fastcall__doc__},
 
 static PyObject *
 _testclinic_TestClass_posonly_varpos_no_fastcall_impl(PyTypeObject *type,
@@ -4140,7 +4140,7 @@ PyDoc_STRVAR(_testclinic_TestClass_posonly_req_opt_varpos_no_fastcall__doc__,
 "\n");
 
 #define _TESTCLINIC_TESTCLASS_POSONLY_REQ_OPT_VARPOS_NO_FASTCALL_METHODDEF    \
-    {"posonly_req_opt_varpos_no_fastcall", (PyCFunction)_testclinic_TestClass_posonly_req_opt_varpos_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_req_opt_varpos_no_fastcall__doc__},
+    {"posonly_req_opt_varpos_no_fastcall", _testclinic_TestClass_posonly_req_opt_varpos_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_req_opt_varpos_no_fastcall__doc__},
 
 static PyObject *
 _testclinic_TestClass_posonly_req_opt_varpos_no_fastcall_impl(PyTypeObject *type,
@@ -4256,7 +4256,7 @@ PyDoc_STRVAR(_testclinic_TestClass_varpos_array_no_fastcall__doc__,
 "\n");
 
 #define _TESTCLINIC_TESTCLASS_VARPOS_ARRAY_NO_FASTCALL_METHODDEF    \
-    {"varpos_array_no_fastcall", (PyCFunction)_testclinic_TestClass_varpos_array_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_varpos_array_no_fastcall__doc__},
+    {"varpos_array_no_fastcall", _testclinic_TestClass_varpos_array_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_varpos_array_no_fastcall__doc__},
 
 static PyObject *
 _testclinic_TestClass_varpos_array_no_fastcall_impl(PyTypeObject *type,
@@ -4283,7 +4283,7 @@ PyDoc_STRVAR(_testclinic_TestClass_posonly_varpos_array_no_fastcall__doc__,
 "\n");
 
 #define _TESTCLINIC_TESTCLASS_POSONLY_VARPOS_ARRAY_NO_FASTCALL_METHODDEF    \
-    {"posonly_varpos_array_no_fastcall", (PyCFunction)_testclinic_TestClass_posonly_varpos_array_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_varpos_array_no_fastcall__doc__},
+    {"posonly_varpos_array_no_fastcall", _testclinic_TestClass_posonly_varpos_array_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_varpos_array_no_fastcall__doc__},
 
 static PyObject *
 _testclinic_TestClass_posonly_varpos_array_no_fastcall_impl(PyTypeObject *type,
@@ -4320,7 +4320,7 @@ PyDoc_STRVAR(_testclinic_TestClass_posonly_req_opt_varpos_array_no_fastcall__doc
 "\n");
 
 #define _TESTCLINIC_TESTCLASS_POSONLY_REQ_OPT_VARPOS_ARRAY_NO_FASTCALL_METHODDEF    \
-    {"posonly_req_opt_varpos_array_no_fastcall", (PyCFunction)_testclinic_TestClass_posonly_req_opt_varpos_array_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_req_opt_varpos_array_no_fastcall__doc__},
+    {"posonly_req_opt_varpos_array_no_fastcall", _testclinic_TestClass_posonly_req_opt_varpos_array_no_fastcall, METH_VARARGS|METH_CLASS, _testclinic_TestClass_posonly_req_opt_varpos_array_no_fastcall__doc__},
 
 static PyObject *
 _testclinic_TestClass_posonly_req_opt_varpos_array_no_fastcall_impl(PyTypeObject *type,
@@ -4423,4 +4423,4 @@ _testclinic_TestClass_posonly_poskw_varpos_array_no_fastcall(PyObject *type, PyO
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=ea0b8fb0949fa49f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a60fd5e23ace0d3a input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_testclinic_limited.c.h b/Modules/clinic/_testclinic_limited.c.h
index 94897f4c6dc427..5cf0a8e8868eca 100644
--- a/Modules/clinic/_testclinic_limited.c.h
+++ b/Modules/clinic/_testclinic_limited.c.h
@@ -8,7 +8,7 @@ PyDoc_STRVAR(test_empty_function__doc__,
 "\n");
 
 #define TEST_EMPTY_FUNCTION_METHODDEF    \
-    {"test_empty_function", (PyCFunction)test_empty_function, METH_NOARGS, test_empty_function__doc__},
+    {"test_empty_function", test_empty_function, METH_NOARGS, test_empty_function__doc__},
 
 static PyObject *
 test_empty_function_impl(PyObject *module);
@@ -25,7 +25,7 @@ PyDoc_STRVAR(my_int_func__doc__,
 "\n");
 
 #define MY_INT_FUNC_METHODDEF    \
-    {"my_int_func", (PyCFunction)my_int_func, METH_O, my_int_func__doc__},
+    {"my_int_func", my_int_func, METH_O, my_int_func__doc__},
 
 static int
 my_int_func_impl(PyObject *module, int arg);
@@ -181,7 +181,7 @@ PyDoc_STRVAR(get_file_descriptor__doc__,
 "Get a file descriptor.");
 
 #define GET_FILE_DESCRIPTOR_METHODDEF    \
-    {"get_file_descriptor", (PyCFunction)get_file_descriptor, METH_O, get_file_descriptor__doc__},
+    {"get_file_descriptor", get_file_descriptor, METH_O, get_file_descriptor__doc__},
 
 static int
 get_file_descriptor_impl(PyObject *module, int fd);
@@ -206,4 +206,4 @@ get_file_descriptor(PyObject *module, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=03fd7811c056dc74 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bc954e4e8b99154d input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_testinternalcapi.c.h b/Modules/clinic/_testinternalcapi.c.h
index 7dfc16965cc0d8..3d28806e1f48a2 100644
--- a/Modules/clinic/_testinternalcapi.c.h
+++ b/Modules/clinic/_testinternalcapi.c.h
@@ -77,7 +77,7 @@ PyDoc_STRVAR(_testinternalcapi_new_instruction_sequence__doc__,
 "Return a new, empty InstructionSequence.");
 
 #define _TESTINTERNALCAPI_NEW_INSTRUCTION_SEQUENCE_METHODDEF    \
-    {"new_instruction_sequence", (PyCFunction)_testinternalcapi_new_instruction_sequence, METH_NOARGS, _testinternalcapi_new_instruction_sequence__doc__},
+    {"new_instruction_sequence", _testinternalcapi_new_instruction_sequence, METH_NOARGS, _testinternalcapi_new_instruction_sequence__doc__},
 
 static PyObject *
 _testinternalcapi_new_instruction_sequence_impl(PyObject *module);
@@ -302,7 +302,7 @@ PyDoc_STRVAR(_testinternalcapi_test_long_numbits__doc__,
 "\n");
 
 #define _TESTINTERNALCAPI_TEST_LONG_NUMBITS_METHODDEF    \
-    {"test_long_numbits", (PyCFunction)_testinternalcapi_test_long_numbits, METH_NOARGS, _testinternalcapi_test_long_numbits__doc__},
+    {"test_long_numbits", _testinternalcapi_test_long_numbits, METH_NOARGS, _testinternalcapi_test_long_numbits__doc__},
 
 static PyObject *
 _testinternalcapi_test_long_numbits_impl(PyObject *module);
@@ -375,4 +375,4 @@ gh_119213_getargs(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=da34166d2c147e7a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5689e81fe3e9a358 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_threadmodule.c.h b/Modules/clinic/_threadmodule.c.h
index 8930e54170caf4..5644b51c59ad44 100644
--- a/Modules/clinic/_threadmodule.c.h
+++ b/Modules/clinic/_threadmodule.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(_thread__get_name__doc__,
 "Get the name of the current thread.");
 
 #define _THREAD__GET_NAME_METHODDEF    \
-    {"_get_name", (PyCFunction)_thread__get_name, METH_NOARGS, _thread__get_name__doc__},
+    {"_get_name", _thread__get_name, METH_NOARGS, _thread__get_name__doc__},
 
 static PyObject *
 _thread__get_name_impl(PyObject *module);
@@ -103,4 +103,4 @@ _thread_set_name(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
 #ifndef _THREAD_SET_NAME_METHODDEF
     #define _THREAD_SET_NAME_METHODDEF
 #endif /* !defined(_THREAD_SET_NAME_METHODDEF) */
-/*[clinic end generated code: output=e978dc4615b9bc35 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=78069b8c5c887063 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_tkinter.c.h b/Modules/clinic/_tkinter.c.h
index 352c2b9e3d410c..1c08e2036379f8 100644
--- a/Modules/clinic/_tkinter.c.h
+++ b/Modules/clinic/_tkinter.c.h
@@ -10,7 +10,7 @@ PyDoc_STRVAR(_tkinter_tkapp_eval__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_EVAL_METHODDEF    \
-    {"eval", (PyCFunction)_tkinter_tkapp_eval, METH_O, _tkinter_tkapp_eval__doc__},
+    {"eval", _tkinter_tkapp_eval, METH_O, _tkinter_tkapp_eval__doc__},
 
 static PyObject *
 _tkinter_tkapp_eval_impl(TkappObject *self, const char *script);
@@ -46,7 +46,7 @@ PyDoc_STRVAR(_tkinter_tkapp_evalfile__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_EVALFILE_METHODDEF    \
-    {"evalfile", (PyCFunction)_tkinter_tkapp_evalfile, METH_O, _tkinter_tkapp_evalfile__doc__},
+    {"evalfile", _tkinter_tkapp_evalfile, METH_O, _tkinter_tkapp_evalfile__doc__},
 
 static PyObject *
 _tkinter_tkapp_evalfile_impl(TkappObject *self, const char *fileName);
@@ -82,7 +82,7 @@ PyDoc_STRVAR(_tkinter_tkapp_record__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_RECORD_METHODDEF    \
-    {"record", (PyCFunction)_tkinter_tkapp_record, METH_O, _tkinter_tkapp_record__doc__},
+    {"record", _tkinter_tkapp_record, METH_O, _tkinter_tkapp_record__doc__},
 
 static PyObject *
 _tkinter_tkapp_record_impl(TkappObject *self, const char *script);
@@ -118,7 +118,7 @@ PyDoc_STRVAR(_tkinter_tkapp_adderrorinfo__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_ADDERRORINFO_METHODDEF    \
-    {"adderrorinfo", (PyCFunction)_tkinter_tkapp_adderrorinfo, METH_O, _tkinter_tkapp_adderrorinfo__doc__},
+    {"adderrorinfo", _tkinter_tkapp_adderrorinfo, METH_O, _tkinter_tkapp_adderrorinfo__doc__},
 
 static PyObject *
 _tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg);
@@ -154,7 +154,7 @@ PyDoc_STRVAR(_tkinter_tkapp_getint__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_GETINT_METHODDEF    \
-    {"getint", (PyCFunction)_tkinter_tkapp_getint, METH_O, _tkinter_tkapp_getint__doc__},
+    {"getint", _tkinter_tkapp_getint, METH_O, _tkinter_tkapp_getint__doc__},
 
 static PyObject *
 _tkinter_tkapp_getint_impl(TkappObject *self, PyObject *arg);
@@ -175,7 +175,7 @@ PyDoc_STRVAR(_tkinter_tkapp_getdouble__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_GETDOUBLE_METHODDEF    \
-    {"getdouble", (PyCFunction)_tkinter_tkapp_getdouble, METH_O, _tkinter_tkapp_getdouble__doc__},
+    {"getdouble", _tkinter_tkapp_getdouble, METH_O, _tkinter_tkapp_getdouble__doc__},
 
 static PyObject *
 _tkinter_tkapp_getdouble_impl(TkappObject *self, PyObject *arg);
@@ -196,7 +196,7 @@ PyDoc_STRVAR(_tkinter_tkapp_getboolean__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_GETBOOLEAN_METHODDEF    \
-    {"getboolean", (PyCFunction)_tkinter_tkapp_getboolean, METH_O, _tkinter_tkapp_getboolean__doc__},
+    {"getboolean", _tkinter_tkapp_getboolean, METH_O, _tkinter_tkapp_getboolean__doc__},
 
 static PyObject *
 _tkinter_tkapp_getboolean_impl(TkappObject *self, PyObject *arg);
@@ -217,7 +217,7 @@ PyDoc_STRVAR(_tkinter_tkapp_exprstring__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_EXPRSTRING_METHODDEF    \
-    {"exprstring", (PyCFunction)_tkinter_tkapp_exprstring, METH_O, _tkinter_tkapp_exprstring__doc__},
+    {"exprstring", _tkinter_tkapp_exprstring, METH_O, _tkinter_tkapp_exprstring__doc__},
 
 static PyObject *
 _tkinter_tkapp_exprstring_impl(TkappObject *self, const char *s);
@@ -253,7 +253,7 @@ PyDoc_STRVAR(_tkinter_tkapp_exprlong__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_EXPRLONG_METHODDEF    \
-    {"exprlong", (PyCFunction)_tkinter_tkapp_exprlong, METH_O, _tkinter_tkapp_exprlong__doc__},
+    {"exprlong", _tkinter_tkapp_exprlong, METH_O, _tkinter_tkapp_exprlong__doc__},
 
 static PyObject *
 _tkinter_tkapp_exprlong_impl(TkappObject *self, const char *s);
@@ -289,7 +289,7 @@ PyDoc_STRVAR(_tkinter_tkapp_exprdouble__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_EXPRDOUBLE_METHODDEF    \
-    {"exprdouble", (PyCFunction)_tkinter_tkapp_exprdouble, METH_O, _tkinter_tkapp_exprdouble__doc__},
+    {"exprdouble", _tkinter_tkapp_exprdouble, METH_O, _tkinter_tkapp_exprdouble__doc__},
 
 static PyObject *
 _tkinter_tkapp_exprdouble_impl(TkappObject *self, const char *s);
@@ -325,7 +325,7 @@ PyDoc_STRVAR(_tkinter_tkapp_exprboolean__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_EXPRBOOLEAN_METHODDEF    \
-    {"exprboolean", (PyCFunction)_tkinter_tkapp_exprboolean, METH_O, _tkinter_tkapp_exprboolean__doc__},
+    {"exprboolean", _tkinter_tkapp_exprboolean, METH_O, _tkinter_tkapp_exprboolean__doc__},
 
 static PyObject *
 _tkinter_tkapp_exprboolean_impl(TkappObject *self, const char *s);
@@ -361,7 +361,7 @@ PyDoc_STRVAR(_tkinter_tkapp_splitlist__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_SPLITLIST_METHODDEF    \
-    {"splitlist", (PyCFunction)_tkinter_tkapp_splitlist, METH_O, _tkinter_tkapp_splitlist__doc__},
+    {"splitlist", _tkinter_tkapp_splitlist, METH_O, _tkinter_tkapp_splitlist__doc__},
 
 static PyObject *
 _tkinter_tkapp_splitlist_impl(TkappObject *self, PyObject *arg);
@@ -424,7 +424,7 @@ PyDoc_STRVAR(_tkinter_tkapp_deletecommand__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_DELETECOMMAND_METHODDEF    \
-    {"deletecommand", (PyCFunction)_tkinter_tkapp_deletecommand, METH_O, _tkinter_tkapp_deletecommand__doc__},
+    {"deletecommand", _tkinter_tkapp_deletecommand, METH_O, _tkinter_tkapp_deletecommand__doc__},
 
 static PyObject *
 _tkinter_tkapp_deletecommand_impl(TkappObject *self, const char *name);
@@ -501,7 +501,7 @@ PyDoc_STRVAR(_tkinter_tkapp_deletefilehandler__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF    \
-    {"deletefilehandler", (PyCFunction)_tkinter_tkapp_deletefilehandler, METH_O, _tkinter_tkapp_deletefilehandler__doc__},
+    {"deletefilehandler", _tkinter_tkapp_deletefilehandler, METH_O, _tkinter_tkapp_deletefilehandler__doc__},
 
 static PyObject *
 _tkinter_tkapp_deletefilehandler_impl(TkappObject *self, PyObject *file);
@@ -524,7 +524,7 @@ PyDoc_STRVAR(_tkinter_tktimertoken_deletetimerhandler__doc__,
 "\n");
 
 #define _TKINTER_TKTIMERTOKEN_DELETETIMERHANDLER_METHODDEF    \
-    {"deletetimerhandler", (PyCFunction)_tkinter_tktimertoken_deletetimerhandler, METH_NOARGS, _tkinter_tktimertoken_deletetimerhandler__doc__},
+    {"deletetimerhandler", _tkinter_tktimertoken_deletetimerhandler, METH_NOARGS, _tkinter_tktimertoken_deletetimerhandler__doc__},
 
 static PyObject *
 _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self);
@@ -642,7 +642,7 @@ PyDoc_STRVAR(_tkinter_tkapp_quit__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_QUIT_METHODDEF    \
-    {"quit", (PyCFunction)_tkinter_tkapp_quit, METH_NOARGS, _tkinter_tkapp_quit__doc__},
+    {"quit", _tkinter_tkapp_quit, METH_NOARGS, _tkinter_tkapp_quit__doc__},
 
 static PyObject *
 _tkinter_tkapp_quit_impl(TkappObject *self);
@@ -659,7 +659,7 @@ PyDoc_STRVAR(_tkinter_tkapp_interpaddr__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_INTERPADDR_METHODDEF    \
-    {"interpaddr", (PyCFunction)_tkinter_tkapp_interpaddr, METH_NOARGS, _tkinter_tkapp_interpaddr__doc__},
+    {"interpaddr", _tkinter_tkapp_interpaddr, METH_NOARGS, _tkinter_tkapp_interpaddr__doc__},
 
 static PyObject *
 _tkinter_tkapp_interpaddr_impl(TkappObject *self);
@@ -676,7 +676,7 @@ PyDoc_STRVAR(_tkinter_tkapp_loadtk__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_LOADTK_METHODDEF    \
-    {"loadtk", (PyCFunction)_tkinter_tkapp_loadtk, METH_NOARGS, _tkinter_tkapp_loadtk__doc__},
+    {"loadtk", _tkinter_tkapp_loadtk, METH_NOARGS, _tkinter_tkapp_loadtk__doc__},
 
 static PyObject *
 _tkinter_tkapp_loadtk_impl(TkappObject *self);
@@ -694,7 +694,7 @@ PyDoc_STRVAR(_tkinter_tkapp_settrace__doc__,
 "Set the tracing function.");
 
 #define _TKINTER_TKAPP_SETTRACE_METHODDEF    \
-    {"settrace", (PyCFunction)_tkinter_tkapp_settrace, METH_O, _tkinter_tkapp_settrace__doc__},
+    {"settrace", _tkinter_tkapp_settrace, METH_O, _tkinter_tkapp_settrace__doc__},
 
 static PyObject *
 _tkinter_tkapp_settrace_impl(TkappObject *self, PyObject *func);
@@ -716,7 +716,7 @@ PyDoc_STRVAR(_tkinter_tkapp_gettrace__doc__,
 "Get the tracing function.");
 
 #define _TKINTER_TKAPP_GETTRACE_METHODDEF    \
-    {"gettrace", (PyCFunction)_tkinter_tkapp_gettrace, METH_NOARGS, _tkinter_tkapp_gettrace__doc__},
+    {"gettrace", _tkinter_tkapp_gettrace, METH_NOARGS, _tkinter_tkapp_gettrace__doc__},
 
 static PyObject *
 _tkinter_tkapp_gettrace_impl(TkappObject *self);
@@ -733,7 +733,7 @@ PyDoc_STRVAR(_tkinter_tkapp_willdispatch__doc__,
 "\n");
 
 #define _TKINTER_TKAPP_WILLDISPATCH_METHODDEF    \
-    {"willdispatch", (PyCFunction)_tkinter_tkapp_willdispatch, METH_NOARGS, _tkinter_tkapp_willdispatch__doc__},
+    {"willdispatch", _tkinter_tkapp_willdispatch, METH_NOARGS, _tkinter_tkapp_willdispatch__doc__},
 
 static PyObject *
 _tkinter_tkapp_willdispatch_impl(TkappObject *self);
@@ -750,7 +750,7 @@ PyDoc_STRVAR(_tkinter__flatten__doc__,
 "\n");
 
 #define _TKINTER__FLATTEN_METHODDEF    \
-    {"_flatten", (PyCFunction)_tkinter__flatten, METH_O, _tkinter__flatten__doc__},
+    {"_flatten", _tkinter__flatten, METH_O, _tkinter__flatten__doc__},
 
 PyDoc_STRVAR(_tkinter_create__doc__,
 "create($module, screenName=None, baseName=\'\', className=\'Tk\',\n"
@@ -910,7 +910,7 @@ PyDoc_STRVAR(_tkinter_setbusywaitinterval__doc__,
 "It should be set to a divisor of the maximum time between frames in an animation.");
 
 #define _TKINTER_SETBUSYWAITINTERVAL_METHODDEF    \
-    {"setbusywaitinterval", (PyCFunction)_tkinter_setbusywaitinterval, METH_O, _tkinter_setbusywaitinterval__doc__},
+    {"setbusywaitinterval", _tkinter_setbusywaitinterval, METH_O, _tkinter_setbusywaitinterval__doc__},
 
 static PyObject *
 _tkinter_setbusywaitinterval_impl(PyObject *module, int new_val);
@@ -938,7 +938,7 @@ PyDoc_STRVAR(_tkinter_getbusywaitinterval__doc__,
 "Return the current busy-wait interval between successive calls to Tcl_DoOneEvent in a threaded Python interpreter.");
 
 #define _TKINTER_GETBUSYWAITINTERVAL_METHODDEF    \
-    {"getbusywaitinterval", (PyCFunction)_tkinter_getbusywaitinterval, METH_NOARGS, _tkinter_getbusywaitinterval__doc__},
+    {"getbusywaitinterval", _tkinter_getbusywaitinterval, METH_NOARGS, _tkinter_getbusywaitinterval__doc__},
 
 static int
 _tkinter_getbusywaitinterval_impl(PyObject *module);
@@ -966,4 +966,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=052c067aa69237be input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9643e57d76763b5a input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_tracemalloc.c.h b/Modules/clinic/_tracemalloc.c.h
index 1d100247423991..8dc2fe46d73ed3 100644
--- a/Modules/clinic/_tracemalloc.c.h
+++ b/Modules/clinic/_tracemalloc.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(_tracemalloc_is_tracing__doc__,
 "Return True if the tracemalloc module is tracing Python memory allocations.");
 
 #define _TRACEMALLOC_IS_TRACING_METHODDEF    \
-    {"is_tracing", (PyCFunction)_tracemalloc_is_tracing, METH_NOARGS, _tracemalloc_is_tracing__doc__},
+    {"is_tracing", _tracemalloc_is_tracing, METH_NOARGS, _tracemalloc_is_tracing__doc__},
 
 static PyObject *
 _tracemalloc_is_tracing_impl(PyObject *module);
@@ -29,7 +29,7 @@ PyDoc_STRVAR(_tracemalloc_clear_traces__doc__,
 "Clear traces of memory blocks allocated by Python.");
 
 #define _TRACEMALLOC_CLEAR_TRACES_METHODDEF    \
-    {"clear_traces", (PyCFunction)_tracemalloc_clear_traces, METH_NOARGS, _tracemalloc_clear_traces__doc__},
+    {"clear_traces", _tracemalloc_clear_traces, METH_NOARGS, _tracemalloc_clear_traces__doc__},
 
 static PyObject *
 _tracemalloc_clear_traces_impl(PyObject *module);
@@ -52,7 +52,7 @@ PyDoc_STRVAR(_tracemalloc__get_traces__doc__,
 "Return an empty list if the tracemalloc module is disabled.");
 
 #define _TRACEMALLOC__GET_TRACES_METHODDEF    \
-    {"_get_traces", (PyCFunction)_tracemalloc__get_traces, METH_NOARGS, _tracemalloc__get_traces__doc__},
+    {"_get_traces", _tracemalloc__get_traces, METH_NOARGS, _tracemalloc__get_traces__doc__},
 
 static PyObject *
 _tracemalloc__get_traces_impl(PyObject *module);
@@ -74,7 +74,7 @@ PyDoc_STRVAR(_tracemalloc__get_object_traceback__doc__,
 "trace the allocation of the object.");
 
 #define _TRACEMALLOC__GET_OBJECT_TRACEBACK_METHODDEF    \
-    {"_get_object_traceback", (PyCFunction)_tracemalloc__get_object_traceback, METH_O, _tracemalloc__get_object_traceback__doc__},
+    {"_get_object_traceback", _tracemalloc__get_object_traceback, METH_O, _tracemalloc__get_object_traceback__doc__},
 
 PyDoc_STRVAR(_tracemalloc_start__doc__,
 "start($module, nframe=1, /)\n"
@@ -123,7 +123,7 @@ PyDoc_STRVAR(_tracemalloc_stop__doc__,
 "Also clear traces of memory blocks allocated by Python.");
 
 #define _TRACEMALLOC_STOP_METHODDEF    \
-    {"stop", (PyCFunction)_tracemalloc_stop, METH_NOARGS, _tracemalloc_stop__doc__},
+    {"stop", _tracemalloc_stop, METH_NOARGS, _tracemalloc_stop__doc__},
 
 static PyObject *
 _tracemalloc_stop_impl(PyObject *module);
@@ -144,7 +144,7 @@ PyDoc_STRVAR(_tracemalloc_get_traceback_limit__doc__,
 "the most recent frame: the limit is 1.");
 
 #define _TRACEMALLOC_GET_TRACEBACK_LIMIT_METHODDEF    \
-    {"get_traceback_limit", (PyCFunction)_tracemalloc_get_traceback_limit, METH_NOARGS, _tracemalloc_get_traceback_limit__doc__},
+    {"get_traceback_limit", _tracemalloc_get_traceback_limit, METH_NOARGS, _tracemalloc_get_traceback_limit__doc__},
 
 static PyObject *
 _tracemalloc_get_traceback_limit_impl(PyObject *module);
@@ -164,7 +164,7 @@ PyDoc_STRVAR(_tracemalloc_get_tracemalloc_memory__doc__,
 "This memory is used internally to trace memory allocations.");
 
 #define _TRACEMALLOC_GET_TRACEMALLOC_MEMORY_METHODDEF    \
-    {"get_tracemalloc_memory", (PyCFunction)_tracemalloc_get_tracemalloc_memory, METH_NOARGS, _tracemalloc_get_tracemalloc_memory__doc__},
+    {"get_tracemalloc_memory", _tracemalloc_get_tracemalloc_memory, METH_NOARGS, _tracemalloc_get_tracemalloc_memory__doc__},
 
 static PyObject *
 _tracemalloc_get_tracemalloc_memory_impl(PyObject *module);
@@ -184,7 +184,7 @@ PyDoc_STRVAR(_tracemalloc_get_traced_memory__doc__,
 "Returns a tuple: (current: int, peak: int).");
 
 #define _TRACEMALLOC_GET_TRACED_MEMORY_METHODDEF    \
-    {"get_traced_memory", (PyCFunction)_tracemalloc_get_traced_memory, METH_NOARGS, _tracemalloc_get_traced_memory__doc__},
+    {"get_traced_memory", _tracemalloc_get_traced_memory, METH_NOARGS, _tracemalloc_get_traced_memory__doc__},
 
 static PyObject *
 _tracemalloc_get_traced_memory_impl(PyObject *module);
@@ -204,7 +204,7 @@ PyDoc_STRVAR(_tracemalloc_reset_peak__doc__,
 "Do nothing if the tracemalloc module is not tracing memory allocations.");
 
 #define _TRACEMALLOC_RESET_PEAK_METHODDEF    \
-    {"reset_peak", (PyCFunction)_tracemalloc_reset_peak, METH_NOARGS, _tracemalloc_reset_peak__doc__},
+    {"reset_peak", _tracemalloc_reset_peak, METH_NOARGS, _tracemalloc_reset_peak__doc__},
 
 static PyObject *
 _tracemalloc_reset_peak_impl(PyObject *module);
@@ -214,4 +214,4 @@ _tracemalloc_reset_peak(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return _tracemalloc_reset_peak_impl(module);
 }
-/*[clinic end generated code: output=9d4d884b156c2ddb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=abdeb5c5c5274c70 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_typingmodule.c.h b/Modules/clinic/_typingmodule.c.h
index ea415e67153ed8..ddae332e43867a 100644
--- a/Modules/clinic/_typingmodule.c.h
+++ b/Modules/clinic/_typingmodule.c.h
@@ -8,5 +8,5 @@ PyDoc_STRVAR(_typing__idfunc__doc__,
 "\n");
 
 #define _TYPING__IDFUNC_METHODDEF    \
-    {"_idfunc", (PyCFunction)_typing__idfunc, METH_O, _typing__idfunc__doc__},
-/*[clinic end generated code: output=e7ea2a3cb7ab301a input=a9049054013a1b77]*/
+    {"_idfunc", _typing__idfunc, METH_O, _typing__idfunc__doc__},
+/*[clinic end generated code: output=c740c67df8c70130 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_weakref.c.h b/Modules/clinic/_weakref.c.h
index 8d7bc5dc936610..83b34fb004c092 100644
--- a/Modules/clinic/_weakref.c.h
+++ b/Modules/clinic/_weakref.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(_weakref_getweakrefcount__doc__,
 "Return the number of weak references to \'object\'.");
 
 #define _WEAKREF_GETWEAKREFCOUNT_METHODDEF    \
-    {"getweakrefcount", (PyCFunction)_weakref_getweakrefcount, METH_O, _weakref_getweakrefcount__doc__},
+    {"getweakrefcount", _weakref_getweakrefcount, METH_O, _weakref_getweakrefcount__doc__},
 
 static Py_ssize_t
 _weakref_getweakrefcount_impl(PyObject *module, PyObject *object);
@@ -74,7 +74,7 @@ PyDoc_STRVAR(_weakref_getweakrefs__doc__,
 "Return a list of all weak reference objects pointing to \'object\'.");
 
 #define _WEAKREF_GETWEAKREFS_METHODDEF    \
-    {"getweakrefs", (PyCFunction)_weakref_getweakrefs, METH_O, _weakref_getweakrefs__doc__},
+    {"getweakrefs", _weakref_getweakrefs, METH_O, _weakref_getweakrefs__doc__},
 
 PyDoc_STRVAR(_weakref_proxy__doc__,
 "proxy($module, object, callback=None, /)\n"
@@ -112,4 +112,4 @@ _weakref_proxy(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=60f59adc1dc9eab8 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=eae8e52dc631b4fd input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h
index f8b623fca082d2..d70d83c02a496d 100644
--- a/Modules/clinic/_winapi.c.h
+++ b/Modules/clinic/_winapi.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(_winapi_Overlapped_GetOverlappedResult__doc__,
 "\n");
 
 #define _WINAPI_OVERLAPPED_GETOVERLAPPEDRESULT_METHODDEF    \
-    {"GetOverlappedResult", (PyCFunction)_winapi_Overlapped_GetOverlappedResult, METH_O, _winapi_Overlapped_GetOverlappedResult__doc__},
+    {"GetOverlappedResult", _winapi_Overlapped_GetOverlappedResult, METH_O, _winapi_Overlapped_GetOverlappedResult__doc__},
 
 static PyObject *
 _winapi_Overlapped_GetOverlappedResult_impl(OverlappedObject *self, int wait);
@@ -42,7 +42,7 @@ PyDoc_STRVAR(_winapi_Overlapped_getbuffer__doc__,
 "\n");
 
 #define _WINAPI_OVERLAPPED_GETBUFFER_METHODDEF    \
-    {"getbuffer", (PyCFunction)_winapi_Overlapped_getbuffer, METH_NOARGS, _winapi_Overlapped_getbuffer__doc__},
+    {"getbuffer", _winapi_Overlapped_getbuffer, METH_NOARGS, _winapi_Overlapped_getbuffer__doc__},
 
 static PyObject *
 _winapi_Overlapped_getbuffer_impl(OverlappedObject *self);
@@ -59,7 +59,7 @@ PyDoc_STRVAR(_winapi_Overlapped_cancel__doc__,
 "\n");
 
 #define _WINAPI_OVERLAPPED_CANCEL_METHODDEF    \
-    {"cancel", (PyCFunction)_winapi_Overlapped_cancel, METH_NOARGS, _winapi_Overlapped_cancel__doc__},
+    {"cancel", _winapi_Overlapped_cancel, METH_NOARGS, _winapi_Overlapped_cancel__doc__},
 
 static PyObject *
 _winapi_Overlapped_cancel_impl(OverlappedObject *self);
@@ -77,7 +77,7 @@ PyDoc_STRVAR(_winapi_CloseHandle__doc__,
 "Close handle.");
 
 #define _WINAPI_CLOSEHANDLE_METHODDEF    \
-    {"CloseHandle", (PyCFunction)_winapi_CloseHandle, METH_O, _winapi_CloseHandle__doc__},
+    {"CloseHandle", _winapi_CloseHandle, METH_O, _winapi_CloseHandle__doc__},
 
 static PyObject *
 _winapi_CloseHandle_impl(PyObject *module, HANDLE handle);
@@ -640,7 +640,7 @@ PyDoc_STRVAR(_winapi_ExitProcess__doc__,
 "\n");
 
 #define _WINAPI_EXITPROCESS_METHODDEF    \
-    {"ExitProcess", (PyCFunction)_winapi_ExitProcess, METH_O, _winapi_ExitProcess__doc__},
+    {"ExitProcess", _winapi_ExitProcess, METH_O, _winapi_ExitProcess__doc__},
 
 static PyObject *
 _winapi_ExitProcess_impl(PyObject *module, UINT ExitCode);
@@ -667,7 +667,7 @@ PyDoc_STRVAR(_winapi_GetCurrentProcess__doc__,
 "Return a handle object for the current process.");
 
 #define _WINAPI_GETCURRENTPROCESS_METHODDEF    \
-    {"GetCurrentProcess", (PyCFunction)_winapi_GetCurrentProcess, METH_NOARGS, _winapi_GetCurrentProcess__doc__},
+    {"GetCurrentProcess", _winapi_GetCurrentProcess, METH_NOARGS, _winapi_GetCurrentProcess__doc__},
 
 static HANDLE
 _winapi_GetCurrentProcess_impl(PyObject *module);
@@ -698,7 +698,7 @@ PyDoc_STRVAR(_winapi_GetExitCodeProcess__doc__,
 "Return the termination status of the specified process.");
 
 #define _WINAPI_GETEXITCODEPROCESS_METHODDEF    \
-    {"GetExitCodeProcess", (PyCFunction)_winapi_GetExitCodeProcess, METH_O, _winapi_GetExitCodeProcess__doc__},
+    {"GetExitCodeProcess", _winapi_GetExitCodeProcess, METH_O, _winapi_GetExitCodeProcess__doc__},
 
 static DWORD
 _winapi_GetExitCodeProcess_impl(PyObject *module, HANDLE process);
@@ -729,7 +729,7 @@ PyDoc_STRVAR(_winapi_GetLastError__doc__,
 "\n");
 
 #define _WINAPI_GETLASTERROR_METHODDEF    \
-    {"GetLastError", (PyCFunction)_winapi_GetLastError, METH_NOARGS, _winapi_GetLastError__doc__},
+    {"GetLastError", _winapi_GetLastError, METH_NOARGS, _winapi_GetLastError__doc__},
 
 static DWORD
 _winapi_GetLastError_impl(PyObject *module);
@@ -837,7 +837,7 @@ PyDoc_STRVAR(_winapi_GetModuleFileName__doc__,
 "of the current process.");
 
 #define _WINAPI_GETMODULEFILENAME_METHODDEF    \
-    {"GetModuleFileName", (PyCFunction)_winapi_GetModuleFileName, METH_O, _winapi_GetModuleFileName__doc__},
+    {"GetModuleFileName", _winapi_GetModuleFileName, METH_O, _winapi_GetModuleFileName__doc__},
 
 static PyObject *
 _winapi_GetModuleFileName_impl(PyObject *module, HMODULE module_handle);
@@ -942,7 +942,7 @@ PyDoc_STRVAR(_winapi_GetStdHandle__doc__,
 "The integer associated with the handle object is returned.");
 
 #define _WINAPI_GETSTDHANDLE_METHODDEF    \
-    {"GetStdHandle", (PyCFunction)_winapi_GetStdHandle, METH_O, _winapi_GetStdHandle__doc__},
+    {"GetStdHandle", _winapi_GetStdHandle, METH_O, _winapi_GetStdHandle__doc__},
 
 static HANDLE
 _winapi_GetStdHandle_impl(PyObject *module, DWORD std_handle);
@@ -977,7 +977,7 @@ PyDoc_STRVAR(_winapi_GetVersion__doc__,
 "Return the version number of the current operating system.");
 
 #define _WINAPI_GETVERSION_METHODDEF    \
-    {"GetVersion", (PyCFunction)_winapi_GetVersion, METH_NOARGS, _winapi_GetVersion__doc__},
+    {"GetVersion", _winapi_GetVersion, METH_NOARGS, _winapi_GetVersion__doc__},
 
 static long
 _winapi_GetVersion_impl(PyObject *module);
@@ -1043,7 +1043,7 @@ PyDoc_STRVAR(_winapi_UnmapViewOfFile__doc__,
 "\n");
 
 #define _WINAPI_UNMAPVIEWOFFILE_METHODDEF    \
-    {"UnmapViewOfFile", (PyCFunction)_winapi_UnmapViewOfFile, METH_O, _winapi_UnmapViewOfFile__doc__},
+    {"UnmapViewOfFile", _winapi_UnmapViewOfFile, METH_O, _winapi_UnmapViewOfFile__doc__},
 
 static PyObject *
 _winapi_UnmapViewOfFile_impl(PyObject *module, LPCVOID address);
@@ -1655,7 +1655,7 @@ PyDoc_STRVAR(_winapi_VirtualQuerySize__doc__,
 "\n");
 
 #define _WINAPI_VIRTUALQUERYSIZE_METHODDEF    \
-    {"VirtualQuerySize", (PyCFunction)_winapi_VirtualQuerySize, METH_O, _winapi_VirtualQuerySize__doc__},
+    {"VirtualQuerySize", _winapi_VirtualQuerySize, METH_O, _winapi_VirtualQuerySize__doc__},
 
 static size_t
 _winapi_VirtualQuerySize_impl(PyObject *module, LPCVOID address);
@@ -1918,7 +1918,7 @@ PyDoc_STRVAR(_winapi_GetACP__doc__,
 "Get the current Windows ANSI code page identifier.");
 
 #define _WINAPI_GETACP_METHODDEF    \
-    {"GetACP", (PyCFunction)_winapi_GetACP, METH_NOARGS, _winapi_GetACP__doc__},
+    {"GetACP", _winapi_GetACP, METH_NOARGS, _winapi_GetACP__doc__},
 
 static PyObject *
 _winapi_GetACP_impl(PyObject *module);
@@ -2056,7 +2056,7 @@ PyDoc_STRVAR(_winapi_NeedCurrentDirectoryForExePath__doc__,
 "\n");
 
 #define _WINAPI_NEEDCURRENTDIRECTORYFOREXEPATH_METHODDEF    \
-    {"NeedCurrentDirectoryForExePath", (PyCFunction)_winapi_NeedCurrentDirectoryForExePath, METH_O, _winapi_NeedCurrentDirectoryForExePath__doc__},
+    {"NeedCurrentDirectoryForExePath", _winapi_NeedCurrentDirectoryForExePath, METH_O, _winapi_NeedCurrentDirectoryForExePath__doc__},
 
 static int
 _winapi_NeedCurrentDirectoryForExePath_impl(PyObject *module,
@@ -2161,4 +2161,4 @@ _winapi_CopyFile2(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO
 
     return return_value;
 }
-/*[clinic end generated code: output=6cd07628af447d0a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=db4260b4ad841c0b input=a9049054013a1b77]*/
diff --git a/Modules/clinic/arraymodule.c.h b/Modules/clinic/arraymodule.c.h
index 97e5ca771f3a90..0647c6365ac4ca 100644
--- a/Modules/clinic/arraymodule.c.h
+++ b/Modules/clinic/arraymodule.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(array_array_clear__doc__,
 "Remove all items from the array.");
 
 #define ARRAY_ARRAY_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)array_array_clear, METH_NOARGS, array_array_clear__doc__},
+    {"clear", array_array_clear, METH_NOARGS, array_array_clear__doc__},
 
 static PyObject *
 array_array_clear_impl(arrayobject *self);
@@ -33,7 +33,7 @@ PyDoc_STRVAR(array_array___copy____doc__,
 "Return a copy of the array.");
 
 #define ARRAY_ARRAY___COPY___METHODDEF    \
-    {"__copy__", (PyCFunction)array_array___copy__, METH_NOARGS, array_array___copy____doc__},
+    {"__copy__", array_array___copy__, METH_NOARGS, array_array___copy____doc__},
 
 static PyObject *
 array_array___copy___impl(arrayobject *self);
@@ -51,7 +51,7 @@ PyDoc_STRVAR(array_array___deepcopy____doc__,
 "Return a copy of the array.");
 
 #define ARRAY_ARRAY___DEEPCOPY___METHODDEF    \
-    {"__deepcopy__", (PyCFunction)array_array___deepcopy__, METH_O, array_array___deepcopy____doc__},
+    {"__deepcopy__", array_array___deepcopy__, METH_O, array_array___deepcopy____doc__},
 
 static PyObject *
 array_array___deepcopy___impl(arrayobject *self, PyObject *unused);
@@ -73,7 +73,7 @@ PyDoc_STRVAR(array_array_count__doc__,
 "Return number of occurrences of v in the array.");
 
 #define ARRAY_ARRAY_COUNT_METHODDEF    \
-    {"count", (PyCFunction)array_array_count, METH_O, array_array_count__doc__},
+    {"count", array_array_count, METH_O, array_array_count__doc__},
 
 static PyObject *
 array_array_count_impl(arrayobject *self, PyObject *v);
@@ -141,7 +141,7 @@ PyDoc_STRVAR(array_array_remove__doc__,
 "Remove the first occurrence of v in the array.");
 
 #define ARRAY_ARRAY_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)array_array_remove, METH_O, array_array_remove__doc__},
+    {"remove", array_array_remove, METH_O, array_array_remove__doc__},
 
 static PyObject *
 array_array_remove_impl(arrayobject *self, PyObject *v);
@@ -296,7 +296,7 @@ PyDoc_STRVAR(array_array_buffer_info__doc__,
 "the buffer length in bytes.");
 
 #define ARRAY_ARRAY_BUFFER_INFO_METHODDEF    \
-    {"buffer_info", (PyCFunction)array_array_buffer_info, METH_NOARGS, array_array_buffer_info__doc__},
+    {"buffer_info", array_array_buffer_info, METH_NOARGS, array_array_buffer_info__doc__},
 
 static PyObject *
 array_array_buffer_info_impl(arrayobject *self);
@@ -314,7 +314,7 @@ PyDoc_STRVAR(array_array_append__doc__,
 "Append new value v to the end of the array.");
 
 #define ARRAY_ARRAY_APPEND_METHODDEF    \
-    {"append", (PyCFunction)array_array_append, METH_O, array_array_append__doc__},
+    {"append", array_array_append, METH_O, array_array_append__doc__},
 
 static PyObject *
 array_array_append_impl(arrayobject *self, PyObject *v);
@@ -339,7 +339,7 @@ PyDoc_STRVAR(array_array_byteswap__doc__,
 "raised.");
 
 #define ARRAY_ARRAY_BYTESWAP_METHODDEF    \
-    {"byteswap", (PyCFunction)array_array_byteswap, METH_NOARGS, array_array_byteswap__doc__},
+    {"byteswap", array_array_byteswap, METH_NOARGS, array_array_byteswap__doc__},
 
 static PyObject *
 array_array_byteswap_impl(arrayobject *self);
@@ -357,7 +357,7 @@ PyDoc_STRVAR(array_array_reverse__doc__,
 "Reverse the order of the items in the array.");
 
 #define ARRAY_ARRAY_REVERSE_METHODDEF    \
-    {"reverse", (PyCFunction)array_array_reverse, METH_NOARGS, array_array_reverse__doc__},
+    {"reverse", array_array_reverse, METH_NOARGS, array_array_reverse__doc__},
 
 static PyObject *
 array_array_reverse_impl(arrayobject *self);
@@ -477,7 +477,7 @@ PyDoc_STRVAR(array_array_fromlist__doc__,
 "Append items to array from list.");
 
 #define ARRAY_ARRAY_FROMLIST_METHODDEF    \
-    {"fromlist", (PyCFunction)array_array_fromlist, METH_O, array_array_fromlist__doc__},
+    {"fromlist", array_array_fromlist, METH_O, array_array_fromlist__doc__},
 
 static PyObject *
 array_array_fromlist_impl(arrayobject *self, PyObject *list);
@@ -499,7 +499,7 @@ PyDoc_STRVAR(array_array_tolist__doc__,
 "Convert array to an ordinary list with the same items.");
 
 #define ARRAY_ARRAY_TOLIST_METHODDEF    \
-    {"tolist", (PyCFunction)array_array_tolist, METH_NOARGS, array_array_tolist__doc__},
+    {"tolist", array_array_tolist, METH_NOARGS, array_array_tolist__doc__},
 
 static PyObject *
 array_array_tolist_impl(arrayobject *self);
@@ -517,7 +517,7 @@ PyDoc_STRVAR(array_array_frombytes__doc__,
 "Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() method.");
 
 #define ARRAY_ARRAY_FROMBYTES_METHODDEF    \
-    {"frombytes", (PyCFunction)array_array_frombytes, METH_O, array_array_frombytes__doc__},
+    {"frombytes", array_array_frombytes, METH_O, array_array_frombytes__doc__},
 
 static PyObject *
 array_array_frombytes_impl(arrayobject *self, Py_buffer *buffer);
@@ -549,7 +549,7 @@ PyDoc_STRVAR(array_array_tobytes__doc__,
 "Convert the array to an array of machine values and return the bytes representation.");
 
 #define ARRAY_ARRAY_TOBYTES_METHODDEF    \
-    {"tobytes", (PyCFunction)array_array_tobytes, METH_NOARGS, array_array_tobytes__doc__},
+    {"tobytes", array_array_tobytes, METH_NOARGS, array_array_tobytes__doc__},
 
 static PyObject *
 array_array_tobytes_impl(arrayobject *self);
@@ -571,7 +571,7 @@ PyDoc_STRVAR(array_array_fromunicode__doc__,
 "some other type.");
 
 #define ARRAY_ARRAY_FROMUNICODE_METHODDEF    \
-    {"fromunicode", (PyCFunction)array_array_fromunicode, METH_O, array_array_fromunicode__doc__},
+    {"fromunicode", array_array_fromunicode, METH_O, array_array_fromunicode__doc__},
 
 static PyObject *
 array_array_fromunicode_impl(arrayobject *self, PyObject *ustr);
@@ -604,7 +604,7 @@ PyDoc_STRVAR(array_array_tounicode__doc__,
 "unicode string from an array of some other type.");
 
 #define ARRAY_ARRAY_TOUNICODE_METHODDEF    \
-    {"tounicode", (PyCFunction)array_array_tounicode, METH_NOARGS, array_array_tounicode__doc__},
+    {"tounicode", array_array_tounicode, METH_NOARGS, array_array_tounicode__doc__},
 
 static PyObject *
 array_array_tounicode_impl(arrayobject *self);
@@ -622,7 +622,7 @@ PyDoc_STRVAR(array_array___sizeof____doc__,
 "Size of the array in memory, in bytes.");
 
 #define ARRAY_ARRAY___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)array_array___sizeof__, METH_NOARGS, array_array___sizeof____doc__},
+    {"__sizeof__", array_array___sizeof__, METH_NOARGS, array_array___sizeof____doc__},
 
 static PyObject *
 array_array___sizeof___impl(arrayobject *self);
@@ -759,7 +759,7 @@ PyDoc_STRVAR(array_arrayiterator___setstate____doc__,
 "Set state information for unpickling.");
 
 #define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF    \
-    {"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__},
+    {"__setstate__", array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__},
 
 static PyObject *
 array_arrayiterator___setstate___impl(arrayiterobject *self, PyObject *state);
@@ -773,4 +773,4 @@ array_arrayiterator___setstate__(PyObject *self, PyObject *state)
 
     return return_value;
 }
-/*[clinic end generated code: output=dd49451ac1cc3f39 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=88448cc228e01197 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h
index 602e42a4c1aaa4..b88b21af0f9bea 100644
--- a/Modules/clinic/binascii.c.h
+++ b/Modules/clinic/binascii.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(binascii_a2b_uu__doc__,
 "Decode a line of uuencoded data.");
 
 #define BINASCII_A2B_UU_METHODDEF    \
-    {"a2b_uu", (PyCFunction)binascii_a2b_uu, METH_O, binascii_a2b_uu__doc__},
+    {"a2b_uu", binascii_a2b_uu, METH_O, binascii_a2b_uu__doc__},
 
 static PyObject *
 binascii_a2b_uu_impl(PyObject *module, Py_buffer *data);
@@ -558,7 +558,7 @@ PyDoc_STRVAR(binascii_a2b_hex__doc__,
 "This function is also available as \"unhexlify()\".");
 
 #define BINASCII_A2B_HEX_METHODDEF    \
-    {"a2b_hex", (PyCFunction)binascii_a2b_hex, METH_O, binascii_a2b_hex__doc__},
+    {"a2b_hex", binascii_a2b_hex, METH_O, binascii_a2b_hex__doc__},
 
 static PyObject *
 binascii_a2b_hex_impl(PyObject *module, Py_buffer *hexstr);
@@ -591,7 +591,7 @@ PyDoc_STRVAR(binascii_unhexlify__doc__,
 "hexstr must contain an even number of hex digits (upper or lower case).");
 
 #define BINASCII_UNHEXLIFY_METHODDEF    \
-    {"unhexlify", (PyCFunction)binascii_unhexlify, METH_O, binascii_unhexlify__doc__},
+    {"unhexlify", binascii_unhexlify, METH_O, binascii_unhexlify__doc__},
 
 static PyObject *
 binascii_unhexlify_impl(PyObject *module, Py_buffer *hexstr);
@@ -788,4 +788,4 @@ binascii_b2a_qp(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
 
     return return_value;
 }
-/*[clinic end generated code: output=adb855a2797c3cad input=a9049054013a1b77]*/
+/*[clinic end generated code: output=443214c82c5b3219 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/blake2module.c.h b/Modules/clinic/blake2module.c.h
index bb2e308574a50a..94764fff294477 100644
--- a/Modules/clinic/blake2module.c.h
+++ b/Modules/clinic/blake2module.c.h
@@ -410,7 +410,7 @@ PyDoc_STRVAR(_blake2_blake2b_copy__doc__,
 "Return a copy of the hash object.");
 
 #define _BLAKE2_BLAKE2B_COPY_METHODDEF    \
-    {"copy", (PyCFunction)_blake2_blake2b_copy, METH_NOARGS, _blake2_blake2b_copy__doc__},
+    {"copy", _blake2_blake2b_copy, METH_NOARGS, _blake2_blake2b_copy__doc__},
 
 static PyObject *
 _blake2_blake2b_copy_impl(Blake2Object *self);
@@ -428,7 +428,7 @@ PyDoc_STRVAR(_blake2_blake2b_update__doc__,
 "Update this hash object\'s state with the provided bytes-like object.");
 
 #define _BLAKE2_BLAKE2B_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)_blake2_blake2b_update, METH_O, _blake2_blake2b_update__doc__},
+    {"update", _blake2_blake2b_update, METH_O, _blake2_blake2b_update__doc__},
 
 static PyObject *
 _blake2_blake2b_update_impl(Blake2Object *self, PyObject *data);
@@ -450,7 +450,7 @@ PyDoc_STRVAR(_blake2_blake2b_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define _BLAKE2_BLAKE2B_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)_blake2_blake2b_digest, METH_NOARGS, _blake2_blake2b_digest__doc__},
+    {"digest", _blake2_blake2b_digest, METH_NOARGS, _blake2_blake2b_digest__doc__},
 
 static PyObject *
 _blake2_blake2b_digest_impl(Blake2Object *self);
@@ -468,7 +468,7 @@ PyDoc_STRVAR(_blake2_blake2b_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define _BLAKE2_BLAKE2B_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)_blake2_blake2b_hexdigest, METH_NOARGS, _blake2_blake2b_hexdigest__doc__},
+    {"hexdigest", _blake2_blake2b_hexdigest, METH_NOARGS, _blake2_blake2b_hexdigest__doc__},
 
 static PyObject *
 _blake2_blake2b_hexdigest_impl(Blake2Object *self);
@@ -478,4 +478,4 @@ _blake2_blake2b_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return _blake2_blake2b_hexdigest_impl((Blake2Object *)self);
 }
-/*[clinic end generated code: output=d30e8293bd8e2950 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b80c6cafd9a2bf1e input=a9049054013a1b77]*/
diff --git a/Modules/clinic/cmathmodule.c.h b/Modules/clinic/cmathmodule.c.h
index 7f9e65baf120ea..301a377c5ebad2 100644
--- a/Modules/clinic/cmathmodule.c.h
+++ b/Modules/clinic/cmathmodule.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(cmath_acos__doc__,
 "Return the arc cosine of z.");
 
 #define CMATH_ACOS_METHODDEF    \
-    {"acos", (PyCFunction)cmath_acos, METH_O, cmath_acos__doc__},
+    {"acos", cmath_acos, METH_O, cmath_acos__doc__},
 
 static Py_complex
 cmath_acos_impl(PyObject *module, Py_complex z);
@@ -57,7 +57,7 @@ PyDoc_STRVAR(cmath_acosh__doc__,
 "Return the inverse hyperbolic cosine of z.");
 
 #define CMATH_ACOSH_METHODDEF    \
-    {"acosh", (PyCFunction)cmath_acosh, METH_O, cmath_acosh__doc__},
+    {"acosh", cmath_acosh, METH_O, cmath_acosh__doc__},
 
 static Py_complex
 cmath_acosh_impl(PyObject *module, Py_complex z);
@@ -99,7 +99,7 @@ PyDoc_STRVAR(cmath_asin__doc__,
 "Return the arc sine of z.");
 
 #define CMATH_ASIN_METHODDEF    \
-    {"asin", (PyCFunction)cmath_asin, METH_O, cmath_asin__doc__},
+    {"asin", cmath_asin, METH_O, cmath_asin__doc__},
 
 static Py_complex
 cmath_asin_impl(PyObject *module, Py_complex z);
@@ -141,7 +141,7 @@ PyDoc_STRVAR(cmath_asinh__doc__,
 "Return the inverse hyperbolic sine of z.");
 
 #define CMATH_ASINH_METHODDEF    \
-    {"asinh", (PyCFunction)cmath_asinh, METH_O, cmath_asinh__doc__},
+    {"asinh", cmath_asinh, METH_O, cmath_asinh__doc__},
 
 static Py_complex
 cmath_asinh_impl(PyObject *module, Py_complex z);
@@ -183,7 +183,7 @@ PyDoc_STRVAR(cmath_atan__doc__,
 "Return the arc tangent of z.");
 
 #define CMATH_ATAN_METHODDEF    \
-    {"atan", (PyCFunction)cmath_atan, METH_O, cmath_atan__doc__},
+    {"atan", cmath_atan, METH_O, cmath_atan__doc__},
 
 static Py_complex
 cmath_atan_impl(PyObject *module, Py_complex z);
@@ -225,7 +225,7 @@ PyDoc_STRVAR(cmath_atanh__doc__,
 "Return the inverse hyperbolic tangent of z.");
 
 #define CMATH_ATANH_METHODDEF    \
-    {"atanh", (PyCFunction)cmath_atanh, METH_O, cmath_atanh__doc__},
+    {"atanh", cmath_atanh, METH_O, cmath_atanh__doc__},
 
 static Py_complex
 cmath_atanh_impl(PyObject *module, Py_complex z);
@@ -267,7 +267,7 @@ PyDoc_STRVAR(cmath_cos__doc__,
 "Return the cosine of z.");
 
 #define CMATH_COS_METHODDEF    \
-    {"cos", (PyCFunction)cmath_cos, METH_O, cmath_cos__doc__},
+    {"cos", cmath_cos, METH_O, cmath_cos__doc__},
 
 static Py_complex
 cmath_cos_impl(PyObject *module, Py_complex z);
@@ -309,7 +309,7 @@ PyDoc_STRVAR(cmath_cosh__doc__,
 "Return the hyperbolic cosine of z.");
 
 #define CMATH_COSH_METHODDEF    \
-    {"cosh", (PyCFunction)cmath_cosh, METH_O, cmath_cosh__doc__},
+    {"cosh", cmath_cosh, METH_O, cmath_cosh__doc__},
 
 static Py_complex
 cmath_cosh_impl(PyObject *module, Py_complex z);
@@ -351,7 +351,7 @@ PyDoc_STRVAR(cmath_exp__doc__,
 "Return the exponential value e**z.");
 
 #define CMATH_EXP_METHODDEF    \
-    {"exp", (PyCFunction)cmath_exp, METH_O, cmath_exp__doc__},
+    {"exp", cmath_exp, METH_O, cmath_exp__doc__},
 
 static Py_complex
 cmath_exp_impl(PyObject *module, Py_complex z);
@@ -393,7 +393,7 @@ PyDoc_STRVAR(cmath_log10__doc__,
 "Return the base-10 logarithm of z.");
 
 #define CMATH_LOG10_METHODDEF    \
-    {"log10", (PyCFunction)cmath_log10, METH_O, cmath_log10__doc__},
+    {"log10", cmath_log10, METH_O, cmath_log10__doc__},
 
 static Py_complex
 cmath_log10_impl(PyObject *module, Py_complex z);
@@ -435,7 +435,7 @@ PyDoc_STRVAR(cmath_sin__doc__,
 "Return the sine of z.");
 
 #define CMATH_SIN_METHODDEF    \
-    {"sin", (PyCFunction)cmath_sin, METH_O, cmath_sin__doc__},
+    {"sin", cmath_sin, METH_O, cmath_sin__doc__},
 
 static Py_complex
 cmath_sin_impl(PyObject *module, Py_complex z);
@@ -477,7 +477,7 @@ PyDoc_STRVAR(cmath_sinh__doc__,
 "Return the hyperbolic sine of z.");
 
 #define CMATH_SINH_METHODDEF    \
-    {"sinh", (PyCFunction)cmath_sinh, METH_O, cmath_sinh__doc__},
+    {"sinh", cmath_sinh, METH_O, cmath_sinh__doc__},
 
 static Py_complex
 cmath_sinh_impl(PyObject *module, Py_complex z);
@@ -519,7 +519,7 @@ PyDoc_STRVAR(cmath_sqrt__doc__,
 "Return the square root of z.");
 
 #define CMATH_SQRT_METHODDEF    \
-    {"sqrt", (PyCFunction)cmath_sqrt, METH_O, cmath_sqrt__doc__},
+    {"sqrt", cmath_sqrt, METH_O, cmath_sqrt__doc__},
 
 static Py_complex
 cmath_sqrt_impl(PyObject *module, Py_complex z);
@@ -561,7 +561,7 @@ PyDoc_STRVAR(cmath_tan__doc__,
 "Return the tangent of z.");
 
 #define CMATH_TAN_METHODDEF    \
-    {"tan", (PyCFunction)cmath_tan, METH_O, cmath_tan__doc__},
+    {"tan", cmath_tan, METH_O, cmath_tan__doc__},
 
 static Py_complex
 cmath_tan_impl(PyObject *module, Py_complex z);
@@ -603,7 +603,7 @@ PyDoc_STRVAR(cmath_tanh__doc__,
 "Return the hyperbolic tangent of z.");
 
 #define CMATH_TANH_METHODDEF    \
-    {"tanh", (PyCFunction)cmath_tanh, METH_O, cmath_tanh__doc__},
+    {"tanh", cmath_tanh, METH_O, cmath_tanh__doc__},
 
 static Py_complex
 cmath_tanh_impl(PyObject *module, Py_complex z);
@@ -684,7 +684,7 @@ PyDoc_STRVAR(cmath_phase__doc__,
 "Return argument, also known as the phase angle, of a complex.");
 
 #define CMATH_PHASE_METHODDEF    \
-    {"phase", (PyCFunction)cmath_phase, METH_O, cmath_phase__doc__},
+    {"phase", cmath_phase, METH_O, cmath_phase__doc__},
 
 static PyObject *
 cmath_phase_impl(PyObject *module, Py_complex z);
@@ -714,7 +714,7 @@ PyDoc_STRVAR(cmath_polar__doc__,
 "r is the distance from 0 and phi the phase angle.");
 
 #define CMATH_POLAR_METHODDEF    \
-    {"polar", (PyCFunction)cmath_polar, METH_O, cmath_polar__doc__},
+    {"polar", cmath_polar, METH_O, cmath_polar__doc__},
 
 static PyObject *
 cmath_polar_impl(PyObject *module, Py_complex z);
@@ -790,7 +790,7 @@ PyDoc_STRVAR(cmath_isfinite__doc__,
 "Return True if both the real and imaginary parts of z are finite, else False.");
 
 #define CMATH_ISFINITE_METHODDEF    \
-    {"isfinite", (PyCFunction)cmath_isfinite, METH_O, cmath_isfinite__doc__},
+    {"isfinite", cmath_isfinite, METH_O, cmath_isfinite__doc__},
 
 static PyObject *
 cmath_isfinite_impl(PyObject *module, Py_complex z);
@@ -818,7 +818,7 @@ PyDoc_STRVAR(cmath_isnan__doc__,
 "Checks if the real or imaginary part of z not a number (NaN).");
 
 #define CMATH_ISNAN_METHODDEF    \
-    {"isnan", (PyCFunction)cmath_isnan, METH_O, cmath_isnan__doc__},
+    {"isnan", cmath_isnan, METH_O, cmath_isnan__doc__},
 
 static PyObject *
 cmath_isnan_impl(PyObject *module, Py_complex z);
@@ -846,7 +846,7 @@ PyDoc_STRVAR(cmath_isinf__doc__,
 "Checks if the real or imaginary part of z is infinite.");
 
 #define CMATH_ISINF_METHODDEF    \
-    {"isinf", (PyCFunction)cmath_isinf, METH_O, cmath_isinf__doc__},
+    {"isinf", cmath_isinf, METH_O, cmath_isinf__doc__},
 
 static PyObject *
 cmath_isinf_impl(PyObject *module, Py_complex z);
@@ -985,4 +985,4 @@ cmath_isclose(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=631db17fb1c79d66 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f4c8e62e3ae0904e input=a9049054013a1b77]*/
diff --git a/Modules/clinic/gcmodule.c.h b/Modules/clinic/gcmodule.c.h
index 53ff9e4faf8b7c..0d61d3cebb46ac 100644
--- a/Modules/clinic/gcmodule.c.h
+++ b/Modules/clinic/gcmodule.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(gc_enable__doc__,
 "Enable automatic garbage collection.");
 
 #define GC_ENABLE_METHODDEF    \
-    {"enable", (PyCFunction)gc_enable, METH_NOARGS, gc_enable__doc__},
+    {"enable", gc_enable, METH_NOARGS, gc_enable__doc__},
 
 static PyObject *
 gc_enable_impl(PyObject *module);
@@ -35,7 +35,7 @@ PyDoc_STRVAR(gc_disable__doc__,
 "Disable automatic garbage collection.");
 
 #define GC_DISABLE_METHODDEF    \
-    {"disable", (PyCFunction)gc_disable, METH_NOARGS, gc_disable__doc__},
+    {"disable", gc_disable, METH_NOARGS, gc_disable__doc__},
 
 static PyObject *
 gc_disable_impl(PyObject *module);
@@ -53,7 +53,7 @@ PyDoc_STRVAR(gc_isenabled__doc__,
 "Returns true if automatic garbage collection is enabled.");
 
 #define GC_ISENABLED_METHODDEF    \
-    {"isenabled", (PyCFunction)gc_isenabled, METH_NOARGS, gc_isenabled__doc__},
+    {"isenabled", gc_isenabled, METH_NOARGS, gc_isenabled__doc__},
 
 static int
 gc_isenabled_impl(PyObject *module);
@@ -169,7 +169,7 @@ PyDoc_STRVAR(gc_set_debug__doc__,
 "Debugging information is written to sys.stderr.");
 
 #define GC_SET_DEBUG_METHODDEF    \
-    {"set_debug", (PyCFunction)gc_set_debug, METH_O, gc_set_debug__doc__},
+    {"set_debug", gc_set_debug, METH_O, gc_set_debug__doc__},
 
 static PyObject *
 gc_set_debug_impl(PyObject *module, int flags);
@@ -197,7 +197,7 @@ PyDoc_STRVAR(gc_get_debug__doc__,
 "Get the garbage collection debugging flags.");
 
 #define GC_GET_DEBUG_METHODDEF    \
-    {"get_debug", (PyCFunction)gc_get_debug, METH_NOARGS, gc_get_debug__doc__},
+    {"get_debug", gc_get_debug, METH_NOARGS, gc_get_debug__doc__},
 
 static int
 gc_get_debug_impl(PyObject *module);
@@ -225,7 +225,7 @@ PyDoc_STRVAR(gc_set_threshold__doc__,
 "Setting \'threshold0\' to zero disables collection.");
 
 #define GC_SET_THRESHOLD_METHODDEF    \
-    {"set_threshold", (PyCFunction)gc_set_threshold, METH_VARARGS, gc_set_threshold__doc__},
+    {"set_threshold", gc_set_threshold, METH_VARARGS, gc_set_threshold__doc__},
 
 static PyObject *
 gc_set_threshold_impl(PyObject *module, int threshold0, int group_right_1,
@@ -277,7 +277,7 @@ PyDoc_STRVAR(gc_get_threshold__doc__,
 "Return the current collection thresholds.");
 
 #define GC_GET_THRESHOLD_METHODDEF    \
-    {"get_threshold", (PyCFunction)gc_get_threshold, METH_NOARGS, gc_get_threshold__doc__},
+    {"get_threshold", gc_get_threshold, METH_NOARGS, gc_get_threshold__doc__},
 
 static PyObject *
 gc_get_threshold_impl(PyObject *module);
@@ -295,7 +295,7 @@ PyDoc_STRVAR(gc_get_count__doc__,
 "Return a three-tuple of the current collection counts.");
 
 #define GC_GET_COUNT_METHODDEF    \
-    {"get_count", (PyCFunction)gc_get_count, METH_NOARGS, gc_get_count__doc__},
+    {"get_count", gc_get_count, METH_NOARGS, gc_get_count__doc__},
 
 static PyObject *
 gc_get_count_impl(PyObject *module);
@@ -446,7 +446,7 @@ PyDoc_STRVAR(gc_get_stats__doc__,
 "Return a list of dictionaries containing per-generation statistics.");
 
 #define GC_GET_STATS_METHODDEF    \
-    {"get_stats", (PyCFunction)gc_get_stats, METH_NOARGS, gc_get_stats__doc__},
+    {"get_stats", gc_get_stats, METH_NOARGS, gc_get_stats__doc__},
 
 static PyObject *
 gc_get_stats_impl(PyObject *module);
@@ -466,7 +466,7 @@ PyDoc_STRVAR(gc_is_tracked__doc__,
 "Simple atomic objects will return false.");
 
 #define GC_IS_TRACKED_METHODDEF    \
-    {"is_tracked", (PyCFunction)gc_is_tracked, METH_O, gc_is_tracked__doc__},
+    {"is_tracked", gc_is_tracked, METH_O, gc_is_tracked__doc__},
 
 static int
 gc_is_tracked_impl(PyObject *module, PyObject *obj);
@@ -494,7 +494,7 @@ PyDoc_STRVAR(gc_is_finalized__doc__,
 "Returns true if the object has been already finalized by the GC.");
 
 #define GC_IS_FINALIZED_METHODDEF    \
-    {"is_finalized", (PyCFunction)gc_is_finalized, METH_O, gc_is_finalized__doc__},
+    {"is_finalized", gc_is_finalized, METH_O, gc_is_finalized__doc__},
 
 static int
 gc_is_finalized_impl(PyObject *module, PyObject *obj);
@@ -526,7 +526,7 @@ PyDoc_STRVAR(gc_freeze__doc__,
 "which can cause copy-on-write.");
 
 #define GC_FREEZE_METHODDEF    \
-    {"freeze", (PyCFunction)gc_freeze, METH_NOARGS, gc_freeze__doc__},
+    {"freeze", gc_freeze, METH_NOARGS, gc_freeze__doc__},
 
 static PyObject *
 gc_freeze_impl(PyObject *module);
@@ -546,7 +546,7 @@ PyDoc_STRVAR(gc_unfreeze__doc__,
 "Put all objects in the permanent generation back into oldest generation.");
 
 #define GC_UNFREEZE_METHODDEF    \
-    {"unfreeze", (PyCFunction)gc_unfreeze, METH_NOARGS, gc_unfreeze__doc__},
+    {"unfreeze", gc_unfreeze, METH_NOARGS, gc_unfreeze__doc__},
 
 static PyObject *
 gc_unfreeze_impl(PyObject *module);
@@ -564,7 +564,7 @@ PyDoc_STRVAR(gc_get_freeze_count__doc__,
 "Return the number of objects in the permanent generation.");
 
 #define GC_GET_FREEZE_COUNT_METHODDEF    \
-    {"get_freeze_count", (PyCFunction)gc_get_freeze_count, METH_NOARGS, gc_get_freeze_count__doc__},
+    {"get_freeze_count", gc_get_freeze_count, METH_NOARGS, gc_get_freeze_count__doc__},
 
 static Py_ssize_t
 gc_get_freeze_count_impl(PyObject *module);
@@ -584,4 +584,4 @@ gc_get_freeze_count(PyObject *module, PyObject *Py_UNUSED(ignored))
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=96d057eac558e6ca input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bb3dc7d7d0d7f269 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/grpmodule.c.h b/Modules/clinic/grpmodule.c.h
index 665c2f2dfdac14..ad4e512f70f257 100644
--- a/Modules/clinic/grpmodule.c.h
+++ b/Modules/clinic/grpmodule.c.h
@@ -142,7 +142,7 @@ PyDoc_STRVAR(grp_getgrall__doc__,
 "to use YP/NIS and may not be accessible via getgrnam or getgrgid.");
 
 #define GRP_GETGRALL_METHODDEF    \
-    {"getgrall", (PyCFunction)grp_getgrall, METH_NOARGS, grp_getgrall__doc__},
+    {"getgrall", grp_getgrall, METH_NOARGS, grp_getgrall__doc__},
 
 static PyObject *
 grp_getgrall_impl(PyObject *module);
@@ -152,4 +152,4 @@ grp_getgrall(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return grp_getgrall_impl(module);
 }
-/*[clinic end generated code: output=35aa81c00dbd3229 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=946bc57698c739a6 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/hmacmodule.c.h b/Modules/clinic/hmacmodule.c.h
index 1ceb2d809e830a..a0253482867f97 100644
--- a/Modules/clinic/hmacmodule.c.h
+++ b/Modules/clinic/hmacmodule.c.h
@@ -170,7 +170,7 @@ PyDoc_STRVAR(_hmac_HMAC_digest__doc__,
 "This method may raise a MemoryError.");
 
 #define _HMAC_HMAC_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)_hmac_HMAC_digest, METH_NOARGS, _hmac_HMAC_digest__doc__},
+    {"digest", _hmac_HMAC_digest, METH_NOARGS, _hmac_HMAC_digest__doc__},
 
 static PyObject *
 _hmac_HMAC_digest_impl(HMACObject *self);
@@ -193,7 +193,7 @@ PyDoc_STRVAR(_hmac_HMAC_hexdigest__doc__,
 "This method may raise a MemoryError.");
 
 #define _HMAC_HMAC_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)_hmac_HMAC_hexdigest, METH_NOARGS, _hmac_HMAC_hexdigest__doc__},
+    {"hexdigest", _hmac_HMAC_hexdigest, METH_NOARGS, _hmac_HMAC_hexdigest__doc__},
 
 static PyObject *
 _hmac_HMAC_hexdigest_impl(HMACObject *self);
@@ -209,9 +209,9 @@ _hmac_HMAC_hexdigest(PyObject *self, PyObject *Py_UNUSED(ignored))
 #endif
 #if defined(_HMAC_HMAC_NAME_GETSETDEF)
 #  undef _HMAC_HMAC_NAME_GETSETDEF
-#  define _HMAC_HMAC_NAME_GETSETDEF {"name", (getter)_hmac_HMAC_name_get, (setter)_hmac_HMAC_name_set, _hmac_HMAC_name_DOCSTR},
+#  define _HMAC_HMAC_NAME_GETSETDEF {"name", _hmac_HMAC_name_get, _hmac_HMAC_name_set, _hmac_HMAC_name_DOCSTR},
 #else
-#  define _HMAC_HMAC_NAME_GETSETDEF {"name", (getter)_hmac_HMAC_name_get, NULL, _hmac_HMAC_name_DOCSTR},
+#  define _HMAC_HMAC_NAME_GETSETDEF {"name", _hmac_HMAC_name_get, NULL, _hmac_HMAC_name_DOCSTR},
 #endif
 
 static PyObject *
@@ -228,9 +228,9 @@ _hmac_HMAC_name_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_HMAC_HMAC_BLOCK_SIZE_GETSETDEF)
 #  undef _HMAC_HMAC_BLOCK_SIZE_GETSETDEF
-#  define _HMAC_HMAC_BLOCK_SIZE_GETSETDEF {"block_size", (getter)_hmac_HMAC_block_size_get, (setter)_hmac_HMAC_block_size_set, _hmac_HMAC_block_size_DOCSTR},
+#  define _HMAC_HMAC_BLOCK_SIZE_GETSETDEF {"block_size", _hmac_HMAC_block_size_get, _hmac_HMAC_block_size_set, _hmac_HMAC_block_size_DOCSTR},
 #else
-#  define _HMAC_HMAC_BLOCK_SIZE_GETSETDEF {"block_size", (getter)_hmac_HMAC_block_size_get, NULL, _hmac_HMAC_block_size_DOCSTR},
+#  define _HMAC_HMAC_BLOCK_SIZE_GETSETDEF {"block_size", _hmac_HMAC_block_size_get, NULL, _hmac_HMAC_block_size_DOCSTR},
 #endif
 
 static PyObject *
@@ -247,9 +247,9 @@ _hmac_HMAC_block_size_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(_HMAC_HMAC_DIGEST_SIZE_GETSETDEF)
 #  undef _HMAC_HMAC_DIGEST_SIZE_GETSETDEF
-#  define _HMAC_HMAC_DIGEST_SIZE_GETSETDEF {"digest_size", (getter)_hmac_HMAC_digest_size_get, (setter)_hmac_HMAC_digest_size_set, _hmac_HMAC_digest_size_DOCSTR},
+#  define _HMAC_HMAC_DIGEST_SIZE_GETSETDEF {"digest_size", _hmac_HMAC_digest_size_get, _hmac_HMAC_digest_size_set, _hmac_HMAC_digest_size_DOCSTR},
 #else
-#  define _HMAC_HMAC_DIGEST_SIZE_GETSETDEF {"digest_size", (getter)_hmac_HMAC_digest_size_get, NULL, _hmac_HMAC_digest_size_DOCSTR},
+#  define _HMAC_HMAC_DIGEST_SIZE_GETSETDEF {"digest_size", _hmac_HMAC_digest_size_get, NULL, _hmac_HMAC_digest_size_DOCSTR},
 #endif
 
 static PyObject *
@@ -670,4 +670,4 @@ _hmac_compute_blake2b_32(PyObject *module, PyObject *const *args, Py_ssize_t nar
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=30c0614482d963f5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8fc277191f6cc0bb input=a9049054013a1b77]*/
diff --git a/Modules/clinic/itertoolsmodule.c.h b/Modules/clinic/itertoolsmodule.c.h
index 0af82e7eb05be8..b1de3910c6caff 100644
--- a/Modules/clinic/itertoolsmodule.c.h
+++ b/Modules/clinic/itertoolsmodule.c.h
@@ -488,7 +488,7 @@ PyDoc_STRVAR(itertools_chain_from_iterable__doc__,
 "Alternative chain() constructor taking a single iterable argument that evaluates lazily.");
 
 #define ITERTOOLS_CHAIN_FROM_ITERABLE_METHODDEF    \
-    {"from_iterable", (PyCFunction)itertools_chain_from_iterable, METH_O|METH_CLASS, itertools_chain_from_iterable__doc__},
+    {"from_iterable", itertools_chain_from_iterable, METH_O|METH_CLASS, itertools_chain_from_iterable__doc__},
 
 static PyObject *
 itertools_chain_from_iterable_impl(PyTypeObject *type, PyObject *arg);
@@ -965,4 +965,4 @@ itertools_count(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=999758202a532e0a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=af14fd865653900c input=a9049054013a1b77]*/
diff --git a/Modules/clinic/mathmodule.c.h b/Modules/clinic/mathmodule.c.h
index 4c2c8acd8f69d8..7ff3f91abf8460 100644
--- a/Modules/clinic/mathmodule.c.h
+++ b/Modules/clinic/mathmodule.c.h
@@ -71,7 +71,7 @@ PyDoc_STRVAR(math_ceil__doc__,
 "This is the smallest integer >= x.");
 
 #define MATH_CEIL_METHODDEF    \
-    {"ceil", (PyCFunction)math_ceil, METH_O, math_ceil__doc__},
+    {"ceil", math_ceil, METH_O, math_ceil__doc__},
 
 PyDoc_STRVAR(math_floor__doc__,
 "floor($module, x, /)\n"
@@ -82,7 +82,7 @@ PyDoc_STRVAR(math_floor__doc__,
 "This is the largest integer <= x.");
 
 #define MATH_FLOOR_METHODDEF    \
-    {"floor", (PyCFunction)math_floor, METH_O, math_floor__doc__},
+    {"floor", math_floor, METH_O, math_floor__doc__},
 
 PyDoc_STRVAR(math_fsum__doc__,
 "fsum($module, seq, /)\n"
@@ -93,7 +93,7 @@ PyDoc_STRVAR(math_fsum__doc__,
 "Assumes IEEE-754 floating-point arithmetic.");
 
 #define MATH_FSUM_METHODDEF    \
-    {"fsum", (PyCFunction)math_fsum, METH_O, math_fsum__doc__},
+    {"fsum", math_fsum, METH_O, math_fsum__doc__},
 
 PyDoc_STRVAR(math_isqrt__doc__,
 "isqrt($module, n, /)\n"
@@ -102,7 +102,7 @@ PyDoc_STRVAR(math_isqrt__doc__,
 "Return the integer part of the square root of the input.");
 
 #define MATH_ISQRT_METHODDEF    \
-    {"isqrt", (PyCFunction)math_isqrt, METH_O, math_isqrt__doc__},
+    {"isqrt", math_isqrt, METH_O, math_isqrt__doc__},
 
 PyDoc_STRVAR(math_factorial__doc__,
 "factorial($module, n, /)\n"
@@ -113,7 +113,7 @@ PyDoc_STRVAR(math_factorial__doc__,
 "Raise a ValueError if x is negative or non-integral.");
 
 #define MATH_FACTORIAL_METHODDEF    \
-    {"factorial", (PyCFunction)math_factorial, METH_O, math_factorial__doc__},
+    {"factorial", math_factorial, METH_O, math_factorial__doc__},
 
 PyDoc_STRVAR(math_trunc__doc__,
 "trunc($module, x, /)\n"
@@ -124,7 +124,7 @@ PyDoc_STRVAR(math_trunc__doc__,
 "Uses the __trunc__ magic method.");
 
 #define MATH_TRUNC_METHODDEF    \
-    {"trunc", (PyCFunction)math_trunc, METH_O, math_trunc__doc__},
+    {"trunc", math_trunc, METH_O, math_trunc__doc__},
 
 PyDoc_STRVAR(math_frexp__doc__,
 "frexp($module, x, /)\n"
@@ -136,7 +136,7 @@ PyDoc_STRVAR(math_frexp__doc__,
 "If x is 0, m and e are both 0.  Else 0.5 <= abs(m) < 1.0.");
 
 #define MATH_FREXP_METHODDEF    \
-    {"frexp", (PyCFunction)math_frexp, METH_O, math_frexp__doc__},
+    {"frexp", math_frexp, METH_O, math_frexp__doc__},
 
 static PyObject *
 math_frexp_impl(PyObject *module, double x);
@@ -213,7 +213,7 @@ PyDoc_STRVAR(math_modf__doc__,
 "Both results carry the sign of x and are floats.");
 
 #define MATH_MODF_METHODDEF    \
-    {"modf", (PyCFunction)math_modf, METH_O, math_modf__doc__},
+    {"modf", math_modf, METH_O, math_modf__doc__},
 
 static PyObject *
 math_modf_impl(PyObject *module, double x);
@@ -247,7 +247,7 @@ PyDoc_STRVAR(math_log2__doc__,
 "Return the base 2 logarithm of x.");
 
 #define MATH_LOG2_METHODDEF    \
-    {"log2", (PyCFunction)math_log2, METH_O, math_log2__doc__},
+    {"log2", math_log2, METH_O, math_log2__doc__},
 
 PyDoc_STRVAR(math_log10__doc__,
 "log10($module, x, /)\n"
@@ -256,7 +256,7 @@ PyDoc_STRVAR(math_log10__doc__,
 "Return the base 10 logarithm of x.");
 
 #define MATH_LOG10_METHODDEF    \
-    {"log10", (PyCFunction)math_log10, METH_O, math_log10__doc__},
+    {"log10", math_log10, METH_O, math_log10__doc__},
 
 PyDoc_STRVAR(math_fma__doc__,
 "fma($module, x, y, z, /)\n"
@@ -535,7 +535,7 @@ PyDoc_STRVAR(math_degrees__doc__,
 "Convert angle x from radians to degrees.");
 
 #define MATH_DEGREES_METHODDEF    \
-    {"degrees", (PyCFunction)math_degrees, METH_O, math_degrees__doc__},
+    {"degrees", math_degrees, METH_O, math_degrees__doc__},
 
 static PyObject *
 math_degrees_impl(PyObject *module, double x);
@@ -569,7 +569,7 @@ PyDoc_STRVAR(math_radians__doc__,
 "Convert angle x from degrees to radians.");
 
 #define MATH_RADIANS_METHODDEF    \
-    {"radians", (PyCFunction)math_radians, METH_O, math_radians__doc__},
+    {"radians", math_radians, METH_O, math_radians__doc__},
 
 static PyObject *
 math_radians_impl(PyObject *module, double x);
@@ -603,7 +603,7 @@ PyDoc_STRVAR(math_isfinite__doc__,
 "Return True if x is neither an infinity nor a NaN, and False otherwise.");
 
 #define MATH_ISFINITE_METHODDEF    \
-    {"isfinite", (PyCFunction)math_isfinite, METH_O, math_isfinite__doc__},
+    {"isfinite", math_isfinite, METH_O, math_isfinite__doc__},
 
 static PyObject *
 math_isfinite_impl(PyObject *module, double x);
@@ -637,7 +637,7 @@ PyDoc_STRVAR(math_isnan__doc__,
 "Return True if x is a NaN (not a number), and False otherwise.");
 
 #define MATH_ISNAN_METHODDEF    \
-    {"isnan", (PyCFunction)math_isnan, METH_O, math_isnan__doc__},
+    {"isnan", math_isnan, METH_O, math_isnan__doc__},
 
 static PyObject *
 math_isnan_impl(PyObject *module, double x);
@@ -671,7 +671,7 @@ PyDoc_STRVAR(math_isinf__doc__,
 "Return True if x is a positive or negative infinity, and False otherwise.");
 
 #define MATH_ISINF_METHODDEF    \
-    {"isinf", (PyCFunction)math_isinf, METH_O, math_isinf__doc__},
+    {"isinf", math_isinf, METH_O, math_isinf__doc__},
 
 static PyObject *
 math_isinf_impl(PyObject *module, double x);
@@ -1081,7 +1081,7 @@ PyDoc_STRVAR(math_ulp__doc__,
 "Return the value of the least significant bit of the float x.");
 
 #define MATH_ULP_METHODDEF    \
-    {"ulp", (PyCFunction)math_ulp, METH_O, math_ulp__doc__},
+    {"ulp", math_ulp, METH_O, math_ulp__doc__},
 
 static double
 math_ulp_impl(PyObject *module, double x);
@@ -1112,4 +1112,4 @@ math_ulp(PyObject *module, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=634773bd18cd3f93 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bd9afa2b4572bd65 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h
index 9ca4f6528ce8f5..48ceab88db9fef 100644
--- a/Modules/clinic/md5module.c.h
+++ b/Modules/clinic/md5module.c.h
@@ -37,7 +37,7 @@ PyDoc_STRVAR(MD5Type_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define MD5TYPE_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)MD5Type_digest, METH_NOARGS, MD5Type_digest__doc__},
+    {"digest", MD5Type_digest, METH_NOARGS, MD5Type_digest__doc__},
 
 static PyObject *
 MD5Type_digest_impl(MD5object *self);
@@ -55,7 +55,7 @@ PyDoc_STRVAR(MD5Type_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define MD5TYPE_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)MD5Type_hexdigest, METH_NOARGS, MD5Type_hexdigest__doc__},
+    {"hexdigest", MD5Type_hexdigest, METH_NOARGS, MD5Type_hexdigest__doc__},
 
 static PyObject *
 MD5Type_hexdigest_impl(MD5object *self);
@@ -73,7 +73,7 @@ PyDoc_STRVAR(MD5Type_update__doc__,
 "Update this hash object\'s state with the provided string.");
 
 #define MD5TYPE_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)MD5Type_update, METH_O, MD5Type_update__doc__},
+    {"update", MD5Type_update, METH_O, MD5Type_update__doc__},
 
 static PyObject *
 MD5Type_update_impl(MD5object *self, PyObject *obj);
@@ -164,4 +164,4 @@ _md5_md5(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=73f4d2034d9fcc63 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=00b9229e080ff7d0 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/overlapped.c.h b/Modules/clinic/overlapped.c.h
index 7e2480bdace38d..6660deb19a822a 100644
--- a/Modules/clinic/overlapped.c.h
+++ b/Modules/clinic/overlapped.c.h
@@ -201,7 +201,7 @@ PyDoc_STRVAR(_overlapped_UnregisterWait__doc__,
 "Unregister wait handle.");
 
 #define _OVERLAPPED_UNREGISTERWAIT_METHODDEF    \
-    {"UnregisterWait", (PyCFunction)_overlapped_UnregisterWait, METH_O, _overlapped_UnregisterWait__doc__},
+    {"UnregisterWait", _overlapped_UnregisterWait, METH_O, _overlapped_UnregisterWait__doc__},
 
 static PyObject *
 _overlapped_UnregisterWait_impl(PyObject *module, HANDLE WaitHandle);
@@ -326,7 +326,7 @@ PyDoc_STRVAR(_overlapped_SetEvent__doc__,
 "Set event.");
 
 #define _OVERLAPPED_SETEVENT_METHODDEF    \
-    {"SetEvent", (PyCFunction)_overlapped_SetEvent, METH_O, _overlapped_SetEvent__doc__},
+    {"SetEvent", _overlapped_SetEvent, METH_O, _overlapped_SetEvent__doc__},
 
 static PyObject *
 _overlapped_SetEvent_impl(PyObject *module, HANDLE Handle);
@@ -354,7 +354,7 @@ PyDoc_STRVAR(_overlapped_ResetEvent__doc__,
 "Reset event.");
 
 #define _OVERLAPPED_RESETEVENT_METHODDEF    \
-    {"ResetEvent", (PyCFunction)_overlapped_ResetEvent, METH_O, _overlapped_ResetEvent__doc__},
+    {"ResetEvent", _overlapped_ResetEvent, METH_O, _overlapped_ResetEvent__doc__},
 
 static PyObject *
 _overlapped_ResetEvent_impl(PyObject *module, HANDLE Handle);
@@ -420,7 +420,7 @@ PyDoc_STRVAR(_overlapped_FormatMessage__doc__,
 "Return error message for an error code.");
 
 #define _OVERLAPPED_FORMATMESSAGE_METHODDEF    \
-    {"FormatMessage", (PyCFunction)_overlapped_FormatMessage, METH_O, _overlapped_FormatMessage__doc__},
+    {"FormatMessage", _overlapped_FormatMessage, METH_O, _overlapped_FormatMessage__doc__},
 
 static PyObject *
 _overlapped_FormatMessage_impl(PyObject *module, DWORD code);
@@ -512,7 +512,7 @@ PyDoc_STRVAR(_overlapped_Overlapped_cancel__doc__,
 "Cancel overlapped operation.");
 
 #define _OVERLAPPED_OVERLAPPED_CANCEL_METHODDEF    \
-    {"cancel", (PyCFunction)_overlapped_Overlapped_cancel, METH_NOARGS, _overlapped_Overlapped_cancel__doc__},
+    {"cancel", _overlapped_Overlapped_cancel, METH_NOARGS, _overlapped_Overlapped_cancel__doc__},
 
 static PyObject *
 _overlapped_Overlapped_cancel_impl(OverlappedObject *self);
@@ -996,7 +996,7 @@ PyDoc_STRVAR(_overlapped_Overlapped_ConnectNamedPipe__doc__,
 "Start overlapped wait for a client to connect.");
 
 #define _OVERLAPPED_OVERLAPPED_CONNECTNAMEDPIPE_METHODDEF    \
-    {"ConnectNamedPipe", (PyCFunction)_overlapped_Overlapped_ConnectNamedPipe, METH_O, _overlapped_Overlapped_ConnectNamedPipe__doc__},
+    {"ConnectNamedPipe", _overlapped_Overlapped_ConnectNamedPipe, METH_O, _overlapped_Overlapped_ConnectNamedPipe__doc__},
 
 static PyObject *
 _overlapped_Overlapped_ConnectNamedPipe_impl(OverlappedObject *self,
@@ -1025,7 +1025,7 @@ PyDoc_STRVAR(_overlapped_Overlapped_ConnectPipe__doc__,
 "Connect to the pipe for asynchronous I/O (overlapped).");
 
 #define _OVERLAPPED_OVERLAPPED_CONNECTPIPE_METHODDEF    \
-    {"ConnectPipe", (PyCFunction)_overlapped_Overlapped_ConnectPipe, METH_O, _overlapped_Overlapped_ConnectPipe__doc__},
+    {"ConnectPipe", _overlapped_Overlapped_ConnectPipe, METH_O, _overlapped_Overlapped_ConnectPipe__doc__},
 
 static PyObject *
 _overlapped_Overlapped_ConnectPipe_impl(OverlappedObject *self,
@@ -1242,4 +1242,4 @@ _overlapped_Overlapped_WSARecvFromInto(PyObject *self, PyObject *const *args, Py
 
     return return_value;
 }
-/*[clinic end generated code: output=3e4cb2b55342cd96 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5cacbafa0c7eee40 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index d03f68ab8fb9aa..94464ae833c672 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -327,7 +327,7 @@ PyDoc_STRVAR(os_ttyname__doc__,
 "    Integer file descriptor handle.");
 
 #define OS_TTYNAME_METHODDEF    \
-    {"ttyname", (PyCFunction)os_ttyname, METH_O, os_ttyname__doc__},
+    {"ttyname", os_ttyname, METH_O, os_ttyname__doc__},
 
 static PyObject *
 os_ttyname_impl(PyObject *module, int fd);
@@ -359,7 +359,7 @@ PyDoc_STRVAR(os_ctermid__doc__,
 "Return the name of the controlling terminal for this process.");
 
 #define OS_CTERMID_METHODDEF    \
-    {"ctermid", (PyCFunction)os_ctermid, METH_NOARGS, os_ctermid__doc__},
+    {"ctermid", os_ctermid, METH_NOARGS, os_ctermid__doc__},
 
 static PyObject *
 os_ctermid_impl(PyObject *module);
@@ -1081,7 +1081,7 @@ PyDoc_STRVAR(os_sync__doc__,
 "Force write of everything to disk.");
 
 #define OS_SYNC_METHODDEF    \
-    {"sync", (PyCFunction)os_sync, METH_NOARGS, os_sync__doc__},
+    {"sync", os_sync, METH_NOARGS, os_sync__doc__},
 
 static PyObject *
 os_sync_impl(PyObject *module);
@@ -1438,7 +1438,7 @@ PyDoc_STRVAR(os_getcwd__doc__,
 "Return a unicode string representing the current working directory.");
 
 #define OS_GETCWD_METHODDEF    \
-    {"getcwd", (PyCFunction)os_getcwd, METH_NOARGS, os_getcwd__doc__},
+    {"getcwd", os_getcwd, METH_NOARGS, os_getcwd__doc__},
 
 static PyObject *
 os_getcwd_impl(PyObject *module);
@@ -1456,7 +1456,7 @@ PyDoc_STRVAR(os_getcwdb__doc__,
 "Return a bytes string representing the current working directory.");
 
 #define OS_GETCWDB_METHODDEF    \
-    {"getcwdb", (PyCFunction)os_getcwdb, METH_NOARGS, os_getcwdb__doc__},
+    {"getcwdb", os_getcwdb, METH_NOARGS, os_getcwdb__doc__},
 
 static PyObject *
 os_getcwdb_impl(PyObject *module);
@@ -1670,7 +1670,7 @@ PyDoc_STRVAR(os_listdrives__doc__,
 "A drive name typically looks like \'C:\\\\\'.");
 
 #define OS_LISTDRIVES_METHODDEF    \
-    {"listdrives", (PyCFunction)os_listdrives, METH_NOARGS, os_listdrives__doc__},
+    {"listdrives", os_listdrives, METH_NOARGS, os_listdrives__doc__},
 
 static PyObject *
 os_listdrives_impl(PyObject *module);
@@ -1694,7 +1694,7 @@ PyDoc_STRVAR(os_listvolumes__doc__,
 "Volumes are typically represented as a GUID path.");
 
 #define OS_LISTVOLUMES_METHODDEF    \
-    {"listvolumes", (PyCFunction)os_listvolumes, METH_NOARGS, os_listvolumes__doc__},
+    {"listvolumes", os_listvolumes, METH_NOARGS, os_listvolumes__doc__},
 
 static PyObject *
 os_listvolumes_impl(PyObject *module);
@@ -1851,7 +1851,7 @@ PyDoc_STRVAR(os__getfullpathname__doc__,
 "\n");
 
 #define OS__GETFULLPATHNAME_METHODDEF    \
-    {"_getfullpathname", (PyCFunction)os__getfullpathname, METH_O, os__getfullpathname__doc__},
+    {"_getfullpathname", os__getfullpathname, METH_O, os__getfullpathname__doc__},
 
 static PyObject *
 os__getfullpathname_impl(PyObject *module, path_t *path);
@@ -1885,7 +1885,7 @@ PyDoc_STRVAR(os__getfinalpathname__doc__,
 "A helper function for samepath on windows.");
 
 #define OS__GETFINALPATHNAME_METHODDEF    \
-    {"_getfinalpathname", (PyCFunction)os__getfinalpathname, METH_O, os__getfinalpathname__doc__},
+    {"_getfinalpathname", os__getfinalpathname, METH_O, os__getfinalpathname__doc__},
 
 static PyObject *
 os__getfinalpathname_impl(PyObject *module, path_t *path);
@@ -1919,7 +1919,7 @@ PyDoc_STRVAR(os__findfirstfile__doc__,
 "A function to get the real file name without accessing the file in Windows.");
 
 #define OS__FINDFIRSTFILE_METHODDEF    \
-    {"_findfirstfile", (PyCFunction)os__findfirstfile, METH_O, os__findfirstfile__doc__},
+    {"_findfirstfile", os__findfirstfile, METH_O, os__findfirstfile__doc__},
 
 static PyObject *
 os__findfirstfile_impl(PyObject *module, path_t *path);
@@ -2741,7 +2741,7 @@ PyDoc_STRVAR(os_nice__doc__,
 "Add increment to the priority of process and return the new priority.");
 
 #define OS_NICE_METHODDEF    \
-    {"nice", (PyCFunction)os_nice, METH_O, os_nice__doc__},
+    {"nice", os_nice, METH_O, os_nice__doc__},
 
 static PyObject *
 os_nice_impl(PyObject *module, int increment);
@@ -3332,7 +3332,7 @@ PyDoc_STRVAR(os_umask__doc__,
 "Set the current numeric umask and return the previous umask.");
 
 #define OS_UMASK_METHODDEF    \
-    {"umask", (PyCFunction)os_umask, METH_O, os_umask__doc__},
+    {"umask", os_umask, METH_O, os_umask__doc__},
 
 static PyObject *
 os_umask_impl(PyObject *module, int mask);
@@ -3521,7 +3521,7 @@ PyDoc_STRVAR(os_uname__doc__,
 "  (sysname, nodename, release, version, machine)");
 
 #define OS_UNAME_METHODDEF    \
-    {"uname", (PyCFunction)os_uname, METH_NOARGS, os_uname__doc__},
+    {"uname", os_uname, METH_NOARGS, os_uname__doc__},
 
 static PyObject *
 os_uname_impl(PyObject *module);
@@ -4359,7 +4359,7 @@ PyDoc_STRVAR(os_fork1__doc__,
 "Return 0 to child process and PID of child to parent process.");
 
 #define OS_FORK1_METHODDEF    \
-    {"fork1", (PyCFunction)os_fork1, METH_NOARGS, os_fork1__doc__},
+    {"fork1", os_fork1, METH_NOARGS, os_fork1__doc__},
 
 static PyObject *
 os_fork1_impl(PyObject *module);
@@ -4383,7 +4383,7 @@ PyDoc_STRVAR(os_fork__doc__,
 "Return 0 to child process and PID of child to parent process.");
 
 #define OS_FORK_METHODDEF    \
-    {"fork", (PyCFunction)os_fork, METH_NOARGS, os_fork__doc__},
+    {"fork", os_fork, METH_NOARGS, os_fork__doc__},
 
 static PyObject *
 os_fork_impl(PyObject *module);
@@ -4537,7 +4537,7 @@ PyDoc_STRVAR(os_sched_getscheduler__doc__,
 "Passing 0 for pid returns the scheduling policy for the calling process.");
 
 #define OS_SCHED_GETSCHEDULER_METHODDEF    \
-    {"sched_getscheduler", (PyCFunction)os_sched_getscheduler, METH_O, os_sched_getscheduler__doc__},
+    {"sched_getscheduler", os_sched_getscheduler, METH_O, os_sched_getscheduler__doc__},
 
 static PyObject *
 os_sched_getscheduler_impl(PyObject *module, pid_t pid);
@@ -4682,7 +4682,7 @@ PyDoc_STRVAR(os_sched_getparam__doc__,
 "Return value is an instance of sched_param.");
 
 #define OS_SCHED_GETPARAM_METHODDEF    \
-    {"sched_getparam", (PyCFunction)os_sched_getparam, METH_O, os_sched_getparam__doc__},
+    {"sched_getparam", os_sched_getparam, METH_O, os_sched_getparam__doc__},
 
 static PyObject *
 os_sched_getparam_impl(PyObject *module, pid_t pid);
@@ -4756,7 +4756,7 @@ PyDoc_STRVAR(os_sched_rr_get_interval__doc__,
 "Value returned is a float.");
 
 #define OS_SCHED_RR_GET_INTERVAL_METHODDEF    \
-    {"sched_rr_get_interval", (PyCFunction)os_sched_rr_get_interval, METH_O, os_sched_rr_get_interval__doc__},
+    {"sched_rr_get_interval", os_sched_rr_get_interval, METH_O, os_sched_rr_get_interval__doc__},
 
 static double
 os_sched_rr_get_interval_impl(PyObject *module, pid_t pid);
@@ -4793,7 +4793,7 @@ PyDoc_STRVAR(os_sched_yield__doc__,
 "Voluntarily relinquish the CPU.");
 
 #define OS_SCHED_YIELD_METHODDEF    \
-    {"sched_yield", (PyCFunction)os_sched_yield, METH_NOARGS, os_sched_yield__doc__},
+    {"sched_yield", os_sched_yield, METH_NOARGS, os_sched_yield__doc__},
 
 static PyObject *
 os_sched_yield_impl(PyObject *module);
@@ -4856,7 +4856,7 @@ PyDoc_STRVAR(os_sched_getaffinity__doc__,
 "The affinity is returned as a set of CPU identifiers.");
 
 #define OS_SCHED_GETAFFINITY_METHODDEF    \
-    {"sched_getaffinity", (PyCFunction)os_sched_getaffinity, METH_O, os_sched_getaffinity__doc__},
+    {"sched_getaffinity", os_sched_getaffinity, METH_O, os_sched_getaffinity__doc__},
 
 static PyObject *
 os_sched_getaffinity_impl(PyObject *module, pid_t pid);
@@ -4892,7 +4892,7 @@ PyDoc_STRVAR(os_posix_openpt__doc__,
 "of posix_openpt() of your system.");
 
 #define OS_POSIX_OPENPT_METHODDEF    \
-    {"posix_openpt", (PyCFunction)os_posix_openpt, METH_O, os_posix_openpt__doc__},
+    {"posix_openpt", os_posix_openpt, METH_O, os_posix_openpt__doc__},
 
 static int
 os_posix_openpt_impl(PyObject *module, int oflag);
@@ -4934,7 +4934,7 @@ PyDoc_STRVAR(os_grantpt__doc__,
 "Performs a grantpt() C function call.");
 
 #define OS_GRANTPT_METHODDEF    \
-    {"grantpt", (PyCFunction)os_grantpt, METH_O, os_grantpt__doc__},
+    {"grantpt", os_grantpt, METH_O, os_grantpt__doc__},
 
 static PyObject *
 os_grantpt_impl(PyObject *module, int fd);
@@ -4971,7 +4971,7 @@ PyDoc_STRVAR(os_unlockpt__doc__,
 "Performs an unlockpt() C function call.");
 
 #define OS_UNLOCKPT_METHODDEF    \
-    {"unlockpt", (PyCFunction)os_unlockpt, METH_O, os_unlockpt__doc__},
+    {"unlockpt", os_unlockpt, METH_O, os_unlockpt__doc__},
 
 static PyObject *
 os_unlockpt_impl(PyObject *module, int fd);
@@ -5009,7 +5009,7 @@ PyDoc_STRVAR(os_ptsname__doc__,
 "otherwise, performs a ptsname() C function call.");
 
 #define OS_PTSNAME_METHODDEF    \
-    {"ptsname", (PyCFunction)os_ptsname, METH_O, os_ptsname__doc__},
+    {"ptsname", os_ptsname, METH_O, os_ptsname__doc__},
 
 static PyObject *
 os_ptsname_impl(PyObject *module, int fd);
@@ -5044,7 +5044,7 @@ PyDoc_STRVAR(os_openpty__doc__,
 "for both the master and slave ends.");
 
 #define OS_OPENPTY_METHODDEF    \
-    {"openpty", (PyCFunction)os_openpty, METH_NOARGS, os_openpty__doc__},
+    {"openpty", os_openpty, METH_NOARGS, os_openpty__doc__},
 
 static PyObject *
 os_openpty_impl(PyObject *module);
@@ -5070,7 +5070,7 @@ PyDoc_STRVAR(os_login_tty__doc__,
 "calling process; close fd.");
 
 #define OS_LOGIN_TTY_METHODDEF    \
-    {"login_tty", (PyCFunction)os_login_tty, METH_O, os_login_tty__doc__},
+    {"login_tty", os_login_tty, METH_O, os_login_tty__doc__},
 
 static PyObject *
 os_login_tty_impl(PyObject *module, int fd);
@@ -5107,7 +5107,7 @@ PyDoc_STRVAR(os_forkpty__doc__,
 "To both, return fd of newly opened pseudo-terminal.");
 
 #define OS_FORKPTY_METHODDEF    \
-    {"forkpty", (PyCFunction)os_forkpty, METH_NOARGS, os_forkpty__doc__},
+    {"forkpty", os_forkpty, METH_NOARGS, os_forkpty__doc__},
 
 static PyObject *
 os_forkpty_impl(PyObject *module);
@@ -5129,7 +5129,7 @@ PyDoc_STRVAR(os_getegid__doc__,
 "Return the current process\'s effective group id.");
 
 #define OS_GETEGID_METHODDEF    \
-    {"getegid", (PyCFunction)os_getegid, METH_NOARGS, os_getegid__doc__},
+    {"getegid", os_getegid, METH_NOARGS, os_getegid__doc__},
 
 static PyObject *
 os_getegid_impl(PyObject *module);
@@ -5151,7 +5151,7 @@ PyDoc_STRVAR(os_geteuid__doc__,
 "Return the current process\'s effective user id.");
 
 #define OS_GETEUID_METHODDEF    \
-    {"geteuid", (PyCFunction)os_geteuid, METH_NOARGS, os_geteuid__doc__},
+    {"geteuid", os_geteuid, METH_NOARGS, os_geteuid__doc__},
 
 static PyObject *
 os_geteuid_impl(PyObject *module);
@@ -5173,7 +5173,7 @@ PyDoc_STRVAR(os_getgid__doc__,
 "Return the current process\'s group id.");
 
 #define OS_GETGID_METHODDEF    \
-    {"getgid", (PyCFunction)os_getgid, METH_NOARGS, os_getgid__doc__},
+    {"getgid", os_getgid, METH_NOARGS, os_getgid__doc__},
 
 static PyObject *
 os_getgid_impl(PyObject *module);
@@ -5195,7 +5195,7 @@ PyDoc_STRVAR(os_getpid__doc__,
 "Return the current process id.");
 
 #define OS_GETPID_METHODDEF    \
-    {"getpid", (PyCFunction)os_getpid, METH_NOARGS, os_getpid__doc__},
+    {"getpid", os_getpid, METH_NOARGS, os_getpid__doc__},
 
 static PyObject *
 os_getpid_impl(PyObject *module);
@@ -5324,7 +5324,7 @@ PyDoc_STRVAR(os_getgroups__doc__,
 "Return list of supplemental group IDs for the process.");
 
 #define OS_GETGROUPS_METHODDEF    \
-    {"getgroups", (PyCFunction)os_getgroups, METH_NOARGS, os_getgroups__doc__},
+    {"getgroups", os_getgroups, METH_NOARGS, os_getgroups__doc__},
 
 static PyObject *
 os_getgroups_impl(PyObject *module);
@@ -5502,7 +5502,7 @@ PyDoc_STRVAR(os_getpgrp__doc__,
 "Return the current process group id.");
 
 #define OS_GETPGRP_METHODDEF    \
-    {"getpgrp", (PyCFunction)os_getpgrp, METH_NOARGS, os_getpgrp__doc__},
+    {"getpgrp", os_getpgrp, METH_NOARGS, os_getpgrp__doc__},
 
 static PyObject *
 os_getpgrp_impl(PyObject *module);
@@ -5524,7 +5524,7 @@ PyDoc_STRVAR(os_setpgrp__doc__,
 "Make the current process the leader of its process group.");
 
 #define OS_SETPGRP_METHODDEF    \
-    {"setpgrp", (PyCFunction)os_setpgrp, METH_NOARGS, os_setpgrp__doc__},
+    {"setpgrp", os_setpgrp, METH_NOARGS, os_setpgrp__doc__},
 
 static PyObject *
 os_setpgrp_impl(PyObject *module);
@@ -5549,7 +5549,7 @@ PyDoc_STRVAR(os_getppid__doc__,
 "return its id; others systems will return the id of the \'init\' process (1).");
 
 #define OS_GETPPID_METHODDEF    \
-    {"getppid", (PyCFunction)os_getppid, METH_NOARGS, os_getppid__doc__},
+    {"getppid", os_getppid, METH_NOARGS, os_getppid__doc__},
 
 static PyObject *
 os_getppid_impl(PyObject *module);
@@ -5571,7 +5571,7 @@ PyDoc_STRVAR(os_getlogin__doc__,
 "Return the actual login name.");
 
 #define OS_GETLOGIN_METHODDEF    \
-    {"getlogin", (PyCFunction)os_getlogin, METH_NOARGS, os_getlogin__doc__},
+    {"getlogin", os_getlogin, METH_NOARGS, os_getlogin__doc__},
 
 static PyObject *
 os_getlogin_impl(PyObject *module);
@@ -5593,7 +5593,7 @@ PyDoc_STRVAR(os_getuid__doc__,
 "Return the current process\'s user id.");
 
 #define OS_GETUID_METHODDEF    \
-    {"getuid", (PyCFunction)os_getuid, METH_NOARGS, os_getuid__doc__},
+    {"getuid", os_getuid, METH_NOARGS, os_getuid__doc__},
 
 static PyObject *
 os_getuid_impl(PyObject *module);
@@ -5703,7 +5703,7 @@ PyDoc_STRVAR(os_plock__doc__,
 "Lock program segments into memory.\");");
 
 #define OS_PLOCK_METHODDEF    \
-    {"plock", (PyCFunction)os_plock, METH_O, os_plock__doc__},
+    {"plock", os_plock, METH_O, os_plock__doc__},
 
 static PyObject *
 os_plock_impl(PyObject *module, int op);
@@ -5735,7 +5735,7 @@ PyDoc_STRVAR(os_setuid__doc__,
 "Set the current process\'s user id.");
 
 #define OS_SETUID_METHODDEF    \
-    {"setuid", (PyCFunction)os_setuid, METH_O, os_setuid__doc__},
+    {"setuid", os_setuid, METH_O, os_setuid__doc__},
 
 static PyObject *
 os_setuid_impl(PyObject *module, uid_t uid);
@@ -5766,7 +5766,7 @@ PyDoc_STRVAR(os_seteuid__doc__,
 "Set the current process\'s effective user id.");
 
 #define OS_SETEUID_METHODDEF    \
-    {"seteuid", (PyCFunction)os_seteuid, METH_O, os_seteuid__doc__},
+    {"seteuid", os_seteuid, METH_O, os_seteuid__doc__},
 
 static PyObject *
 os_seteuid_impl(PyObject *module, uid_t euid);
@@ -5797,7 +5797,7 @@ PyDoc_STRVAR(os_setegid__doc__,
 "Set the current process\'s effective group id.");
 
 #define OS_SETEGID_METHODDEF    \
-    {"setegid", (PyCFunction)os_setegid, METH_O, os_setegid__doc__},
+    {"setegid", os_setegid, METH_O, os_setegid__doc__},
 
 static PyObject *
 os_setegid_impl(PyObject *module, gid_t egid);
@@ -5904,7 +5904,7 @@ PyDoc_STRVAR(os_setgid__doc__,
 "Set the current process\'s group id.");
 
 #define OS_SETGID_METHODDEF    \
-    {"setgid", (PyCFunction)os_setgid, METH_O, os_setgid__doc__},
+    {"setgid", os_setgid, METH_O, os_setgid__doc__},
 
 static PyObject *
 os_setgid_impl(PyObject *module, gid_t gid);
@@ -5935,7 +5935,7 @@ PyDoc_STRVAR(os_setgroups__doc__,
 "Set the groups of the current process to list.");
 
 #define OS_SETGROUPS_METHODDEF    \
-    {"setgroups", (PyCFunction)os_setgroups, METH_O, os_setgroups__doc__},
+    {"setgroups", os_setgroups, METH_O, os_setgroups__doc__},
 
 #endif /* defined(HAVE_SETGROUPS) */
 
@@ -6237,7 +6237,7 @@ PyDoc_STRVAR(os_wait__doc__,
 "    (pid, status)");
 
 #define OS_WAIT_METHODDEF    \
-    {"wait", (PyCFunction)os_wait, METH_NOARGS, os_wait__doc__},
+    {"wait", os_wait, METH_NOARGS, os_wait__doc__},
 
 static PyObject *
 os_wait_impl(PyObject *module);
@@ -6675,7 +6675,7 @@ PyDoc_STRVAR(os_times__doc__,
 "All fields are floating-point numbers.");
 
 #define OS_TIMES_METHODDEF    \
-    {"times", (PyCFunction)os_times, METH_NOARGS, os_times__doc__},
+    {"times", os_times, METH_NOARGS, os_times__doc__},
 
 static PyObject *
 os_times_impl(PyObject *module);
@@ -7011,7 +7011,7 @@ PyDoc_STRVAR(os_timerfd_gettime__doc__,
 "    A timer file descriptor.");
 
 #define OS_TIMERFD_GETTIME_METHODDEF    \
-    {"timerfd_gettime", (PyCFunction)os_timerfd_gettime, METH_O, os_timerfd_gettime__doc__},
+    {"timerfd_gettime", os_timerfd_gettime, METH_O, os_timerfd_gettime__doc__},
 
 static PyObject *
 os_timerfd_gettime_impl(PyObject *module, int fd);
@@ -7046,7 +7046,7 @@ PyDoc_STRVAR(os_timerfd_gettime_ns__doc__,
 "    A timer file descriptor.");
 
 #define OS_TIMERFD_GETTIME_NS_METHODDEF    \
-    {"timerfd_gettime_ns", (PyCFunction)os_timerfd_gettime_ns, METH_O, os_timerfd_gettime_ns__doc__},
+    {"timerfd_gettime_ns", os_timerfd_gettime_ns, METH_O, os_timerfd_gettime_ns__doc__},
 
 static PyObject *
 os_timerfd_gettime_ns_impl(PyObject *module, int fd);
@@ -7078,7 +7078,7 @@ PyDoc_STRVAR(os_getsid__doc__,
 "Call the system call getsid(pid) and return the result.");
 
 #define OS_GETSID_METHODDEF    \
-    {"getsid", (PyCFunction)os_getsid, METH_O, os_getsid__doc__},
+    {"getsid", os_getsid, METH_O, os_getsid__doc__},
 
 static PyObject *
 os_getsid_impl(PyObject *module, pid_t pid);
@@ -7110,7 +7110,7 @@ PyDoc_STRVAR(os_setsid__doc__,
 "Call the system call setsid().");
 
 #define OS_SETSID_METHODDEF    \
-    {"setsid", (PyCFunction)os_setsid, METH_NOARGS, os_setsid__doc__},
+    {"setsid", os_setsid, METH_NOARGS, os_setsid__doc__},
 
 static PyObject *
 os_setsid_impl(PyObject *module);
@@ -7172,7 +7172,7 @@ PyDoc_STRVAR(os_tcgetpgrp__doc__,
 "Return the process group associated with the terminal specified by fd.");
 
 #define OS_TCGETPGRP_METHODDEF    \
-    {"tcgetpgrp", (PyCFunction)os_tcgetpgrp, METH_O, os_tcgetpgrp__doc__},
+    {"tcgetpgrp", os_tcgetpgrp, METH_O, os_tcgetpgrp__doc__},
 
 static PyObject *
 os_tcgetpgrp_impl(PyObject *module, int fd);
@@ -7440,7 +7440,7 @@ PyDoc_STRVAR(os_dup__doc__,
 "Return a duplicate of a file descriptor.");
 
 #define OS_DUP_METHODDEF    \
-    {"dup", (PyCFunction)os_dup, METH_O, os_dup__doc__},
+    {"dup", os_dup, METH_O, os_dup__doc__},
 
 static int
 os_dup_impl(PyObject *module, int fd);
@@ -8403,7 +8403,7 @@ PyDoc_STRVAR(os_isatty__doc__,
 "connected to the slave end of a terminal.");
 
 #define OS_ISATTY_METHODDEF    \
-    {"isatty", (PyCFunction)os_isatty, METH_O, os_isatty__doc__},
+    {"isatty", os_isatty, METH_O, os_isatty__doc__},
 
 static int
 os_isatty_impl(PyObject *module, int fd);
@@ -8441,7 +8441,7 @@ PyDoc_STRVAR(os_pipe__doc__,
 "  (read_fd, write_fd)");
 
 #define OS_PIPE_METHODDEF    \
-    {"pipe", (PyCFunction)os_pipe, METH_NOARGS, os_pipe__doc__},
+    {"pipe", os_pipe, METH_NOARGS, os_pipe__doc__},
 
 static PyObject *
 os_pipe_impl(PyObject *module);
@@ -8469,7 +8469,7 @@ PyDoc_STRVAR(os_pipe2__doc__,
 "O_NONBLOCK, O_CLOEXEC.");
 
 #define OS_PIPE2_METHODDEF    \
-    {"pipe2", (PyCFunction)os_pipe2, METH_O, os_pipe2__doc__},
+    {"pipe2", os_pipe2, METH_O, os_pipe2__doc__},
 
 static PyObject *
 os_pipe2_impl(PyObject *module, int flags);
@@ -9120,7 +9120,7 @@ PyDoc_STRVAR(os_major__doc__,
 "Extracts a device major number from a raw device number.");
 
 #define OS_MAJOR_METHODDEF    \
-    {"major", (PyCFunction)os_major, METH_O, os_major__doc__},
+    {"major", os_major, METH_O, os_major__doc__},
 
 static PyObject *
 os_major_impl(PyObject *module, dev_t device);
@@ -9151,7 +9151,7 @@ PyDoc_STRVAR(os_minor__doc__,
 "Extracts a device minor number from a raw device number.");
 
 #define OS_MINOR_METHODDEF    \
-    {"minor", (PyCFunction)os_minor, METH_O, os_minor__doc__},
+    {"minor", os_minor, METH_O, os_minor__doc__},
 
 static PyObject *
 os_minor_impl(PyObject *module, dev_t device);
@@ -9527,7 +9527,7 @@ PyDoc_STRVAR(os_unsetenv__doc__,
 "Delete an environment variable.");
 
 #define OS_UNSETENV_METHODDEF    \
-    {"unsetenv", (PyCFunction)os_unsetenv, METH_O, os_unsetenv__doc__},
+    {"unsetenv", os_unsetenv, METH_O, os_unsetenv__doc__},
 
 static PyObject *
 os_unsetenv_impl(PyObject *module, PyObject *name);
@@ -9560,7 +9560,7 @@ PyDoc_STRVAR(os_unsetenv__doc__,
 "Delete an environment variable.");
 
 #define OS_UNSETENV_METHODDEF    \
-    {"unsetenv", (PyCFunction)os_unsetenv, METH_O, os_unsetenv__doc__},
+    {"unsetenv", os_unsetenv, METH_O, os_unsetenv__doc__},
 
 static PyObject *
 os_unsetenv_impl(PyObject *module, PyObject *name);
@@ -9592,7 +9592,7 @@ PyDoc_STRVAR(os_strerror__doc__,
 "Translate an error code to a message string.");
 
 #define OS_STRERROR_METHODDEF    \
-    {"strerror", (PyCFunction)os_strerror, METH_O, os_strerror__doc__},
+    {"strerror", os_strerror, METH_O, os_strerror__doc__},
 
 static PyObject *
 os_strerror_impl(PyObject *module, int code);
@@ -9622,7 +9622,7 @@ PyDoc_STRVAR(os_WCOREDUMP__doc__,
 "Return True if the process returning status was dumped to a core file.");
 
 #define OS_WCOREDUMP_METHODDEF    \
-    {"WCOREDUMP", (PyCFunction)os_WCOREDUMP, METH_O, os_WCOREDUMP__doc__},
+    {"WCOREDUMP", os_WCOREDUMP, METH_O, os_WCOREDUMP__doc__},
 
 static int
 os_WCOREDUMP_impl(PyObject *module, int status);
@@ -10154,7 +10154,7 @@ PyDoc_STRVAR(os_fstatvfs__doc__,
 "Equivalent to statvfs(fd).");
 
 #define OS_FSTATVFS_METHODDEF    \
-    {"fstatvfs", (PyCFunction)os_fstatvfs, METH_O, os_fstatvfs__doc__},
+    {"fstatvfs", os_fstatvfs, METH_O, os_fstatvfs__doc__},
 
 static PyObject *
 os_fstatvfs_impl(PyObject *module, int fd);
@@ -10450,7 +10450,7 @@ PyDoc_STRVAR(os_confstr__doc__,
 "Return a string-valued system configuration variable.");
 
 #define OS_CONFSTR_METHODDEF    \
-    {"confstr", (PyCFunction)os_confstr, METH_O, os_confstr__doc__},
+    {"confstr", os_confstr, METH_O, os_confstr__doc__},
 
 static PyObject *
 os_confstr_impl(PyObject *module, int name);
@@ -10481,7 +10481,7 @@ PyDoc_STRVAR(os_sysconf__doc__,
 "Return an integer-valued system configuration variable.");
 
 #define OS_SYSCONF_METHODDEF    \
-    {"sysconf", (PyCFunction)os_sysconf, METH_O, os_sysconf__doc__},
+    {"sysconf", os_sysconf, METH_O, os_sysconf__doc__},
 
 static long
 os_sysconf_impl(PyObject *module, int name);
@@ -10518,7 +10518,7 @@ PyDoc_STRVAR(os_abort__doc__,
 "on the hosting operating system.  This function never returns.");
 
 #define OS_ABORT_METHODDEF    \
-    {"abort", (PyCFunction)os_abort, METH_NOARGS, os_abort__doc__},
+    {"abort", os_abort, METH_NOARGS, os_abort__doc__},
 
 static PyObject *
 os_abort_impl(PyObject *module);
@@ -10690,7 +10690,7 @@ PyDoc_STRVAR(os_getloadavg__doc__,
 "Raises OSError if the load average was unobtainable.");
 
 #define OS_GETLOADAVG_METHODDEF    \
-    {"getloadavg", (PyCFunction)os_getloadavg, METH_NOARGS, os_getloadavg__doc__},
+    {"getloadavg", os_getloadavg, METH_NOARGS, os_getloadavg__doc__},
 
 static PyObject *
 os_getloadavg_impl(PyObject *module);
@@ -10860,7 +10860,7 @@ PyDoc_STRVAR(os_getresuid__doc__,
 "Return a tuple of the current process\'s real, effective, and saved user ids.");
 
 #define OS_GETRESUID_METHODDEF    \
-    {"getresuid", (PyCFunction)os_getresuid, METH_NOARGS, os_getresuid__doc__},
+    {"getresuid", os_getresuid, METH_NOARGS, os_getresuid__doc__},
 
 static PyObject *
 os_getresuid_impl(PyObject *module);
@@ -10882,7 +10882,7 @@ PyDoc_STRVAR(os_getresgid__doc__,
 "Return a tuple of the current process\'s real, effective, and saved group ids.");
 
 #define OS_GETRESGID_METHODDEF    \
-    {"getresgid", (PyCFunction)os_getresgid, METH_NOARGS, os_getresgid__doc__},
+    {"getresgid", os_getresgid, METH_NOARGS, os_getresgid__doc__},
 
 static PyObject *
 os_getresgid_impl(PyObject *module);
@@ -11284,7 +11284,7 @@ PyDoc_STRVAR(os_urandom__doc__,
 "Return a bytes object containing random bytes suitable for cryptographic use.");
 
 #define OS_URANDOM_METHODDEF    \
-    {"urandom", (PyCFunction)os_urandom, METH_O, os_urandom__doc__},
+    {"urandom", os_urandom, METH_O, os_urandom__doc__},
 
 static PyObject *
 os_urandom_impl(PyObject *module, Py_ssize_t size);
@@ -11657,7 +11657,7 @@ PyDoc_STRVAR(os_cpu_count__doc__,
 "Return None if indeterminable.");
 
 #define OS_CPU_COUNT_METHODDEF    \
-    {"cpu_count", (PyCFunction)os_cpu_count, METH_NOARGS, os_cpu_count__doc__},
+    {"cpu_count", os_cpu_count, METH_NOARGS, os_cpu_count__doc__},
 
 static PyObject *
 os_cpu_count_impl(PyObject *module);
@@ -11675,7 +11675,7 @@ PyDoc_STRVAR(os_get_inheritable__doc__,
 "Get the close-on-exe flag of the specified file descriptor.");
 
 #define OS_GET_INHERITABLE_METHODDEF    \
-    {"get_inheritable", (PyCFunction)os_get_inheritable, METH_O, os_get_inheritable__doc__},
+    {"get_inheritable", os_get_inheritable, METH_O, os_get_inheritable__doc__},
 
 static int
 os_get_inheritable_impl(PyObject *module, int fd);
@@ -11746,7 +11746,7 @@ PyDoc_STRVAR(os_get_handle_inheritable__doc__,
 "Get the close-on-exe flag of the specified file descriptor.");
 
 #define OS_GET_HANDLE_INHERITABLE_METHODDEF    \
-    {"get_handle_inheritable", (PyCFunction)os_get_handle_inheritable, METH_O, os_get_handle_inheritable__doc__},
+    {"get_handle_inheritable", os_get_handle_inheritable, METH_O, os_get_handle_inheritable__doc__},
 
 static int
 os_get_handle_inheritable_impl(PyObject *module, intptr_t handle);
@@ -11824,7 +11824,7 @@ PyDoc_STRVAR(os_get_blocking__doc__,
 "Return False if the O_NONBLOCK flag is set, True if the flag is cleared.");
 
 #define OS_GET_BLOCKING_METHODDEF    \
-    {"get_blocking", (PyCFunction)os_get_blocking, METH_O, os_get_blocking__doc__},
+    {"get_blocking", os_get_blocking, METH_O, os_get_blocking__doc__},
 
 static int
 os_get_blocking_impl(PyObject *module, int fd);
@@ -11928,7 +11928,7 @@ PyDoc_STRVAR(os_DirEntry_is_junction__doc__,
 "Return True if the entry is a junction; cached per entry.");
 
 #define OS_DIRENTRY_IS_JUNCTION_METHODDEF    \
-    {"is_junction", (PyCFunction)os_DirEntry_is_junction, METH_NOARGS, os_DirEntry_is_junction__doc__},
+    {"is_junction", os_DirEntry_is_junction, METH_NOARGS, os_DirEntry_is_junction__doc__},
 
 static int
 os_DirEntry_is_junction_impl(DirEntry *self);
@@ -12167,7 +12167,7 @@ PyDoc_STRVAR(os_DirEntry_inode__doc__,
 "Return inode of the entry; cached per entry.");
 
 #define OS_DIRENTRY_INODE_METHODDEF    \
-    {"inode", (PyCFunction)os_DirEntry_inode, METH_NOARGS, os_DirEntry_inode__doc__},
+    {"inode", os_DirEntry_inode, METH_NOARGS, os_DirEntry_inode__doc__},
 
 static PyObject *
 os_DirEntry_inode_impl(DirEntry *self);
@@ -12185,7 +12185,7 @@ PyDoc_STRVAR(os_DirEntry___fspath____doc__,
 "Returns the path for the entry.");
 
 #define OS_DIRENTRY___FSPATH___METHODDEF    \
-    {"__fspath__", (PyCFunction)os_DirEntry___fspath__, METH_NOARGS, os_DirEntry___fspath____doc__},
+    {"__fspath__", os_DirEntry___fspath__, METH_NOARGS, os_DirEntry___fspath____doc__},
 
 static PyObject *
 os_DirEntry___fspath___impl(DirEntry *self);
@@ -12638,7 +12638,7 @@ PyDoc_STRVAR(os__supports_virtual_terminal__doc__,
 "Checks if virtual terminal is supported in windows");
 
 #define OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF    \
-    {"_supports_virtual_terminal", (PyCFunction)os__supports_virtual_terminal, METH_NOARGS, os__supports_virtual_terminal__doc__},
+    {"_supports_virtual_terminal", os__supports_virtual_terminal, METH_NOARGS, os__supports_virtual_terminal__doc__},
 
 static PyObject *
 os__supports_virtual_terminal_impl(PyObject *module);
@@ -12658,7 +12658,7 @@ PyDoc_STRVAR(os__inputhook__doc__,
 "Calls PyOS_CallInputHook droppong the GIL first");
 
 #define OS__INPUTHOOK_METHODDEF    \
-    {"_inputhook", (PyCFunction)os__inputhook, METH_NOARGS, os__inputhook__doc__},
+    {"_inputhook", os__inputhook, METH_NOARGS, os__inputhook__doc__},
 
 static PyObject *
 os__inputhook_impl(PyObject *module);
@@ -12676,7 +12676,7 @@ PyDoc_STRVAR(os__is_inputhook_installed__doc__,
 "Checks if PyOS_CallInputHook is set");
 
 #define OS__IS_INPUTHOOK_INSTALLED_METHODDEF    \
-    {"_is_inputhook_installed", (PyCFunction)os__is_inputhook_installed, METH_NOARGS, os__is_inputhook_installed__doc__},
+    {"_is_inputhook_installed", os__is_inputhook_installed, METH_NOARGS, os__is_inputhook_installed__doc__},
 
 static PyObject *
 os__is_inputhook_installed_impl(PyObject *module);
@@ -12694,7 +12694,7 @@ PyDoc_STRVAR(os__create_environ__doc__,
 "Create the environment dictionary.");
 
 #define OS__CREATE_ENVIRON_METHODDEF    \
-    {"_create_environ", (PyCFunction)os__create_environ, METH_NOARGS, os__create_environ__doc__},
+    {"_create_environ", os__create_environ, METH_NOARGS, os__create_environ__doc__},
 
 static PyObject *
 os__create_environ_impl(PyObject *module);
@@ -12714,7 +12714,7 @@ PyDoc_STRVAR(os__emscripten_debugger__doc__,
 "Create a breakpoint for the JavaScript debugger. Emscripten only.");
 
 #define OS__EMSCRIPTEN_DEBUGGER_METHODDEF    \
-    {"_emscripten_debugger", (PyCFunction)os__emscripten_debugger, METH_NOARGS, os__emscripten_debugger__doc__},
+    {"_emscripten_debugger", os__emscripten_debugger, METH_NOARGS, os__emscripten_debugger__doc__},
 
 static PyObject *
 os__emscripten_debugger_impl(PyObject *module);
@@ -13398,4 +13398,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=35dd8edb53b50537 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c203116760fc18ae input=a9049054013a1b77]*/
diff --git a/Modules/clinic/pwdmodule.c.h b/Modules/clinic/pwdmodule.c.h
index 365d99aab1dd22..9df6e27a123112 100644
--- a/Modules/clinic/pwdmodule.c.h
+++ b/Modules/clinic/pwdmodule.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(pwd_getpwuid__doc__,
 "See `help(pwd)` for more on password database entries.");
 
 #define PWD_GETPWUID_METHODDEF    \
-    {"getpwuid", (PyCFunction)pwd_getpwuid, METH_O, pwd_getpwuid__doc__},
+    {"getpwuid", pwd_getpwuid, METH_O, pwd_getpwuid__doc__},
 
 PyDoc_STRVAR(pwd_getpwnam__doc__,
 "getpwnam($module, name, /)\n"
@@ -22,7 +22,7 @@ PyDoc_STRVAR(pwd_getpwnam__doc__,
 "See `help(pwd)` for more on password database entries.");
 
 #define PWD_GETPWNAM_METHODDEF    \
-    {"getpwnam", (PyCFunction)pwd_getpwnam, METH_O, pwd_getpwnam__doc__},
+    {"getpwnam", pwd_getpwnam, METH_O, pwd_getpwnam__doc__},
 
 static PyObject *
 pwd_getpwnam_impl(PyObject *module, PyObject *name);
@@ -55,7 +55,7 @@ PyDoc_STRVAR(pwd_getpwall__doc__,
 "See help(pwd) for more on password database entries.");
 
 #define PWD_GETPWALL_METHODDEF    \
-    {"getpwall", (PyCFunction)pwd_getpwall, METH_NOARGS, pwd_getpwall__doc__},
+    {"getpwall", pwd_getpwall, METH_NOARGS, pwd_getpwall__doc__},
 
 static PyObject *
 pwd_getpwall_impl(PyObject *module);
@@ -71,4 +71,4 @@ pwd_getpwall(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef PWD_GETPWALL_METHODDEF
     #define PWD_GETPWALL_METHODDEF
 #endif /* !defined(PWD_GETPWALL_METHODDEF) */
-/*[clinic end generated code: output=dac88d500f6d6f49 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5a1eea3e45743a34 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h
index 13210e3be0f747..1692556583946e 100644
--- a/Modules/clinic/pyexpat.c.h
+++ b/Modules/clinic/pyexpat.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(pyexpat_xmlparser_SetReparseDeferralEnabled__doc__,
 "Enable/Disable reparse deferral; enabled by default with Expat >=2.6.0.");
 
 #define PYEXPAT_XMLPARSER_SETREPARSEDEFERRALENABLED_METHODDEF    \
-    {"SetReparseDeferralEnabled", (PyCFunction)pyexpat_xmlparser_SetReparseDeferralEnabled, METH_O, pyexpat_xmlparser_SetReparseDeferralEnabled__doc__},
+    {"SetReparseDeferralEnabled", pyexpat_xmlparser_SetReparseDeferralEnabled, METH_O, pyexpat_xmlparser_SetReparseDeferralEnabled__doc__},
 
 static PyObject *
 pyexpat_xmlparser_SetReparseDeferralEnabled_impl(xmlparseobject *self,
@@ -44,7 +44,7 @@ PyDoc_STRVAR(pyexpat_xmlparser_GetReparseDeferralEnabled__doc__,
 "Retrieve reparse deferral enabled status; always returns false with Expat <2.6.0.");
 
 #define PYEXPAT_XMLPARSER_GETREPARSEDEFERRALENABLED_METHODDEF    \
-    {"GetReparseDeferralEnabled", (PyCFunction)pyexpat_xmlparser_GetReparseDeferralEnabled, METH_NOARGS, pyexpat_xmlparser_GetReparseDeferralEnabled__doc__},
+    {"GetReparseDeferralEnabled", pyexpat_xmlparser_GetReparseDeferralEnabled, METH_NOARGS, pyexpat_xmlparser_GetReparseDeferralEnabled__doc__},
 
 static PyObject *
 pyexpat_xmlparser_GetReparseDeferralEnabled_impl(xmlparseobject *self);
@@ -163,7 +163,7 @@ PyDoc_STRVAR(pyexpat_xmlparser_SetBase__doc__,
 "Set the base URL for the parser.");
 
 #define PYEXPAT_XMLPARSER_SETBASE_METHODDEF    \
-    {"SetBase", (PyCFunction)pyexpat_xmlparser_SetBase, METH_O, pyexpat_xmlparser_SetBase__doc__},
+    {"SetBase", pyexpat_xmlparser_SetBase, METH_O, pyexpat_xmlparser_SetBase__doc__},
 
 static PyObject *
 pyexpat_xmlparser_SetBase_impl(xmlparseobject *self, const char *base);
@@ -200,7 +200,7 @@ PyDoc_STRVAR(pyexpat_xmlparser_GetBase__doc__,
 "Return base URL string for the parser.");
 
 #define PYEXPAT_XMLPARSER_GETBASE_METHODDEF    \
-    {"GetBase", (PyCFunction)pyexpat_xmlparser_GetBase, METH_NOARGS, pyexpat_xmlparser_GetBase__doc__},
+    {"GetBase", pyexpat_xmlparser_GetBase, METH_NOARGS, pyexpat_xmlparser_GetBase__doc__},
 
 static PyObject *
 pyexpat_xmlparser_GetBase_impl(xmlparseobject *self);
@@ -221,7 +221,7 @@ PyDoc_STRVAR(pyexpat_xmlparser_GetInputContext__doc__,
 "for an element with many attributes), not all of the text may be available.");
 
 #define PYEXPAT_XMLPARSER_GETINPUTCONTEXT_METHODDEF    \
-    {"GetInputContext", (PyCFunction)pyexpat_xmlparser_GetInputContext, METH_NOARGS, pyexpat_xmlparser_GetInputContext__doc__},
+    {"GetInputContext", pyexpat_xmlparser_GetInputContext, METH_NOARGS, pyexpat_xmlparser_GetInputContext__doc__},
 
 static PyObject *
 pyexpat_xmlparser_GetInputContext_impl(xmlparseobject *self);
@@ -327,7 +327,7 @@ PyDoc_STRVAR(pyexpat_xmlparser_SetParamEntityParsing__doc__,
 "was successful.");
 
 #define PYEXPAT_XMLPARSER_SETPARAMENTITYPARSING_METHODDEF    \
-    {"SetParamEntityParsing", (PyCFunction)pyexpat_xmlparser_SetParamEntityParsing, METH_O, pyexpat_xmlparser_SetParamEntityParsing__doc__},
+    {"SetParamEntityParsing", pyexpat_xmlparser_SetParamEntityParsing, METH_O, pyexpat_xmlparser_SetParamEntityParsing__doc__},
 
 static PyObject *
 pyexpat_xmlparser_SetParamEntityParsing_impl(xmlparseobject *self, int flag);
@@ -528,7 +528,7 @@ PyDoc_STRVAR(pyexpat_ErrorString__doc__,
 "Returns string error for given number.");
 
 #define PYEXPAT_ERRORSTRING_METHODDEF    \
-    {"ErrorString", (PyCFunction)pyexpat_ErrorString, METH_O, pyexpat_ErrorString__doc__},
+    {"ErrorString", pyexpat_ErrorString, METH_O, pyexpat_ErrorString__doc__},
 
 static PyObject *
 pyexpat_ErrorString_impl(PyObject *module, long code);
@@ -552,4 +552,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=4dbdc959c67dc2d5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7d154a755404b149 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/readline.c.h b/Modules/clinic/readline.c.h
index 696475f7d00f5b..e41d7b8213e692 100644
--- a/Modules/clinic/readline.c.h
+++ b/Modules/clinic/readline.c.h
@@ -12,7 +12,7 @@ PyDoc_STRVAR(readline_parse_and_bind__doc__,
 "Execute the init line provided in the string argument.");
 
 #define READLINE_PARSE_AND_BIND_METHODDEF    \
-    {"parse_and_bind", (PyCFunction)readline_parse_and_bind, METH_O, readline_parse_and_bind__doc__},
+    {"parse_and_bind", readline_parse_and_bind, METH_O, readline_parse_and_bind__doc__},
 
 static PyObject *
 readline_parse_and_bind_impl(PyObject *module, PyObject *string);
@@ -192,7 +192,7 @@ PyDoc_STRVAR(readline_set_history_length__doc__,
 "A negative length is used to inhibit history truncation.");
 
 #define READLINE_SET_HISTORY_LENGTH_METHODDEF    \
-    {"set_history_length", (PyCFunction)readline_set_history_length, METH_O, readline_set_history_length__doc__},
+    {"set_history_length", readline_set_history_length, METH_O, readline_set_history_length__doc__},
 
 static PyObject *
 readline_set_history_length_impl(PyObject *module, int length);
@@ -220,7 +220,7 @@ PyDoc_STRVAR(readline_get_history_length__doc__,
 "Return the maximum number of lines that will be written to the history file.");
 
 #define READLINE_GET_HISTORY_LENGTH_METHODDEF    \
-    {"get_history_length", (PyCFunction)readline_get_history_length, METH_NOARGS, readline_get_history_length__doc__},
+    {"get_history_length", readline_get_history_length, METH_NOARGS, readline_get_history_length__doc__},
 
 static PyObject *
 readline_get_history_length_impl(PyObject *module);
@@ -356,7 +356,7 @@ PyDoc_STRVAR(readline_get_completion_type__doc__,
 "Get the type of completion being attempted.");
 
 #define READLINE_GET_COMPLETION_TYPE_METHODDEF    \
-    {"get_completion_type", (PyCFunction)readline_get_completion_type, METH_NOARGS, readline_get_completion_type__doc__},
+    {"get_completion_type", readline_get_completion_type, METH_NOARGS, readline_get_completion_type__doc__},
 
 static PyObject *
 readline_get_completion_type_impl(PyObject *module);
@@ -374,7 +374,7 @@ PyDoc_STRVAR(readline_get_begidx__doc__,
 "Get the beginning index of the completion scope.");
 
 #define READLINE_GET_BEGIDX_METHODDEF    \
-    {"get_begidx", (PyCFunction)readline_get_begidx, METH_NOARGS, readline_get_begidx__doc__},
+    {"get_begidx", readline_get_begidx, METH_NOARGS, readline_get_begidx__doc__},
 
 static PyObject *
 readline_get_begidx_impl(PyObject *module);
@@ -392,7 +392,7 @@ PyDoc_STRVAR(readline_get_endidx__doc__,
 "Get the ending index of the completion scope.");
 
 #define READLINE_GET_ENDIDX_METHODDEF    \
-    {"get_endidx", (PyCFunction)readline_get_endidx, METH_NOARGS, readline_get_endidx__doc__},
+    {"get_endidx", readline_get_endidx, METH_NOARGS, readline_get_endidx__doc__},
 
 static PyObject *
 readline_get_endidx_impl(PyObject *module);
@@ -410,7 +410,7 @@ PyDoc_STRVAR(readline_set_completer_delims__doc__,
 "Set the word delimiters for completion.");
 
 #define READLINE_SET_COMPLETER_DELIMS_METHODDEF    \
-    {"set_completer_delims", (PyCFunction)readline_set_completer_delims, METH_O, readline_set_completer_delims__doc__},
+    {"set_completer_delims", readline_set_completer_delims, METH_O, readline_set_completer_delims__doc__},
 
 static PyObject *
 readline_set_completer_delims_impl(PyObject *module, PyObject *string);
@@ -434,7 +434,7 @@ PyDoc_STRVAR(readline_remove_history_item__doc__,
 "Remove history item given by its zero-based position.");
 
 #define READLINE_REMOVE_HISTORY_ITEM_METHODDEF    \
-    {"remove_history_item", (PyCFunction)readline_remove_history_item, METH_O, readline_remove_history_item__doc__},
+    {"remove_history_item", readline_remove_history_item, METH_O, readline_remove_history_item__doc__},
 
 static PyObject *
 readline_remove_history_item_impl(PyObject *module, int entry_number);
@@ -506,7 +506,7 @@ PyDoc_STRVAR(readline_add_history__doc__,
 "Add an item to the history buffer.");
 
 #define READLINE_ADD_HISTORY_METHODDEF    \
-    {"add_history", (PyCFunction)readline_add_history, METH_O, readline_add_history__doc__},
+    {"add_history", readline_add_history, METH_O, readline_add_history__doc__},
 
 static PyObject *
 readline_add_history_impl(PyObject *module, PyObject *string);
@@ -530,7 +530,7 @@ PyDoc_STRVAR(readline_set_auto_history__doc__,
 "Enables or disables automatic history.");
 
 #define READLINE_SET_AUTO_HISTORY_METHODDEF    \
-    {"set_auto_history", (PyCFunction)readline_set_auto_history, METH_O, readline_set_auto_history__doc__},
+    {"set_auto_history", readline_set_auto_history, METH_O, readline_set_auto_history__doc__},
 
 static PyObject *
 readline_set_auto_history_impl(PyObject *module,
@@ -559,7 +559,7 @@ PyDoc_STRVAR(readline_get_completer_delims__doc__,
 "Get the word delimiters for completion.");
 
 #define READLINE_GET_COMPLETER_DELIMS_METHODDEF    \
-    {"get_completer_delims", (PyCFunction)readline_get_completer_delims, METH_NOARGS, readline_get_completer_delims__doc__},
+    {"get_completer_delims", readline_get_completer_delims, METH_NOARGS, readline_get_completer_delims__doc__},
 
 static PyObject *
 readline_get_completer_delims_impl(PyObject *module);
@@ -621,7 +621,7 @@ PyDoc_STRVAR(readline_get_completer__doc__,
 "Get the current completer function.");
 
 #define READLINE_GET_COMPLETER_METHODDEF    \
-    {"get_completer", (PyCFunction)readline_get_completer, METH_NOARGS, readline_get_completer__doc__},
+    {"get_completer", readline_get_completer, METH_NOARGS, readline_get_completer__doc__},
 
 static PyObject *
 readline_get_completer_impl(PyObject *module);
@@ -639,7 +639,7 @@ PyDoc_STRVAR(readline_get_history_item__doc__,
 "Return the current contents of history item at one-based index.");
 
 #define READLINE_GET_HISTORY_ITEM_METHODDEF    \
-    {"get_history_item", (PyCFunction)readline_get_history_item, METH_O, readline_get_history_item__doc__},
+    {"get_history_item", readline_get_history_item, METH_O, readline_get_history_item__doc__},
 
 static PyObject *
 readline_get_history_item_impl(PyObject *module, int idx);
@@ -669,7 +669,7 @@ PyDoc_STRVAR(readline_get_current_history_length__doc__,
 "Return the current (not the maximum) length of history.");
 
 #define READLINE_GET_CURRENT_HISTORY_LENGTH_METHODDEF    \
-    {"get_current_history_length", (PyCFunction)readline_get_current_history_length, METH_NOARGS, readline_get_current_history_length__doc__},
+    {"get_current_history_length", readline_get_current_history_length, METH_NOARGS, readline_get_current_history_length__doc__},
 
 static PyObject *
 readline_get_current_history_length_impl(PyObject *module);
@@ -693,7 +693,7 @@ PyDoc_STRVAR(readline_get_line_buffer__doc__,
 "Return the current contents of the line buffer.");
 
 #define READLINE_GET_LINE_BUFFER_METHODDEF    \
-    {"get_line_buffer", (PyCFunction)readline_get_line_buffer, METH_NOARGS, readline_get_line_buffer__doc__},
+    {"get_line_buffer", readline_get_line_buffer, METH_NOARGS, readline_get_line_buffer__doc__},
 
 static PyObject *
 readline_get_line_buffer_impl(PyObject *module);
@@ -719,7 +719,7 @@ PyDoc_STRVAR(readline_clear_history__doc__,
 "Clear the current readline history.");
 
 #define READLINE_CLEAR_HISTORY_METHODDEF    \
-    {"clear_history", (PyCFunction)readline_clear_history, METH_NOARGS, readline_clear_history__doc__},
+    {"clear_history", readline_clear_history, METH_NOARGS, readline_clear_history__doc__},
 
 static PyObject *
 readline_clear_history_impl(PyObject *module);
@@ -745,7 +745,7 @@ PyDoc_STRVAR(readline_insert_text__doc__,
 "Insert text into the line buffer at the cursor position.");
 
 #define READLINE_INSERT_TEXT_METHODDEF    \
-    {"insert_text", (PyCFunction)readline_insert_text, METH_O, readline_insert_text__doc__},
+    {"insert_text", readline_insert_text, METH_O, readline_insert_text__doc__},
 
 static PyObject *
 readline_insert_text_impl(PyObject *module, PyObject *string);
@@ -769,7 +769,7 @@ PyDoc_STRVAR(readline_redisplay__doc__,
 "Change what\'s displayed on the screen to reflect contents of the line buffer.");
 
 #define READLINE_REDISPLAY_METHODDEF    \
-    {"redisplay", (PyCFunction)readline_redisplay, METH_NOARGS, readline_redisplay__doc__},
+    {"redisplay", readline_redisplay, METH_NOARGS, readline_redisplay__doc__},
 
 static PyObject *
 readline_redisplay_impl(PyObject *module);
@@ -797,4 +797,4 @@ readline_redisplay(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef READLINE_CLEAR_HISTORY_METHODDEF
     #define READLINE_CLEAR_HISTORY_METHODDEF
 #endif /* !defined(READLINE_CLEAR_HISTORY_METHODDEF) */
-/*[clinic end generated code: output=88d9812b6caa2102 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=286b83300ba086c2 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/resource.c.h b/Modules/clinic/resource.c.h
index 9eda7de27532a1..3e96cb78381395 100644
--- a/Modules/clinic/resource.c.h
+++ b/Modules/clinic/resource.c.h
@@ -10,7 +10,7 @@ PyDoc_STRVAR(resource_getrusage__doc__,
 "\n");
 
 #define RESOURCE_GETRUSAGE_METHODDEF    \
-    {"getrusage", (PyCFunction)resource_getrusage, METH_O, resource_getrusage__doc__},
+    {"getrusage", resource_getrusage, METH_O, resource_getrusage__doc__},
 
 static PyObject *
 resource_getrusage_impl(PyObject *module, int who);
@@ -39,7 +39,7 @@ PyDoc_STRVAR(resource_getrlimit__doc__,
 "\n");
 
 #define RESOURCE_GETRLIMIT_METHODDEF    \
-    {"getrlimit", (PyCFunction)resource_getrlimit, METH_O, resource_getrlimit__doc__},
+    {"getrlimit", resource_getrlimit, METH_O, resource_getrlimit__doc__},
 
 static PyObject *
 resource_getrlimit_impl(PyObject *module, int resource);
@@ -150,7 +150,7 @@ PyDoc_STRVAR(resource_getpagesize__doc__,
 "\n");
 
 #define RESOURCE_GETPAGESIZE_METHODDEF    \
-    {"getpagesize", (PyCFunction)resource_getpagesize, METH_NOARGS, resource_getpagesize__doc__},
+    {"getpagesize", resource_getpagesize, METH_NOARGS, resource_getpagesize__doc__},
 
 static int
 resource_getpagesize_impl(PyObject *module);
@@ -178,4 +178,4 @@ resource_getpagesize(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef RESOURCE_PRLIMIT_METHODDEF
     #define RESOURCE_PRLIMIT_METHODDEF
 #endif /* !defined(RESOURCE_PRLIMIT_METHODDEF) */
-/*[clinic end generated code: output=e45883ace510414a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3d91aec3c1e3a374 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/selectmodule.c.h b/Modules/clinic/selectmodule.c.h
index 253ad8c9e78f00..ab5712db4be3bc 100644
--- a/Modules/clinic/selectmodule.c.h
+++ b/Modules/clinic/selectmodule.c.h
@@ -177,7 +177,7 @@ PyDoc_STRVAR(select_poll_unregister__doc__,
 "Remove a file descriptor being tracked by the polling object.");
 
 #define SELECT_POLL_UNREGISTER_METHODDEF    \
-    {"unregister", (PyCFunction)select_poll_unregister, METH_O, select_poll_unregister__doc__},
+    {"unregister", select_poll_unregister, METH_O, select_poll_unregister__doc__},
 
 static PyObject *
 select_poll_unregister_impl(pollObject *self, int fd);
@@ -362,7 +362,7 @@ PyDoc_STRVAR(select_devpoll_unregister__doc__,
 "Remove a file descriptor being tracked by the polling object.");
 
 #define SELECT_DEVPOLL_UNREGISTER_METHODDEF    \
-    {"unregister", (PyCFunction)select_devpoll_unregister, METH_O, select_devpoll_unregister__doc__},
+    {"unregister", select_devpoll_unregister, METH_O, select_devpoll_unregister__doc__},
 
 static PyObject *
 select_devpoll_unregister_impl(devpollObject *self, int fd);
@@ -443,7 +443,7 @@ PyDoc_STRVAR(select_devpoll_close__doc__,
 "Further operations on the devpoll object will raise an exception.");
 
 #define SELECT_DEVPOLL_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)select_devpoll_close, METH_NOARGS, select_devpoll_close__doc__},
+    {"close", select_devpoll_close, METH_NOARGS, select_devpoll_close__doc__},
 
 static PyObject *
 select_devpoll_close_impl(devpollObject *self);
@@ -471,7 +471,7 @@ PyDoc_STRVAR(select_devpoll_fileno__doc__,
 "Return the file descriptor.");
 
 #define SELECT_DEVPOLL_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)select_devpoll_fileno, METH_NOARGS, select_devpoll_fileno__doc__},
+    {"fileno", select_devpoll_fileno, METH_NOARGS, select_devpoll_fileno__doc__},
 
 static PyObject *
 select_devpoll_fileno_impl(devpollObject *self);
@@ -502,7 +502,7 @@ PyDoc_STRVAR(select_poll__doc__,
 "polling them for I/O events.");
 
 #define SELECT_POLL_METHODDEF    \
-    {"poll", (PyCFunction)select_poll, METH_NOARGS, select_poll__doc__},
+    {"poll", select_poll, METH_NOARGS, select_poll__doc__},
 
 static PyObject *
 select_poll_impl(PyObject *module);
@@ -527,7 +527,7 @@ PyDoc_STRVAR(select_devpoll__doc__,
 "polling them for I/O events.");
 
 #define SELECT_DEVPOLL_METHODDEF    \
-    {"devpoll", (PyCFunction)select_devpoll, METH_NOARGS, select_devpoll__doc__},
+    {"devpoll", select_devpoll, METH_NOARGS, select_devpoll__doc__},
 
 static PyObject *
 select_devpoll_impl(PyObject *module);
@@ -639,7 +639,7 @@ PyDoc_STRVAR(select_epoll_close__doc__,
 "Further operations on the epoll object will raise an exception.");
 
 #define SELECT_EPOLL_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)select_epoll_close, METH_NOARGS, select_epoll_close__doc__},
+    {"close", select_epoll_close, METH_NOARGS, select_epoll_close__doc__},
 
 static PyObject *
 select_epoll_close_impl(pyEpoll_Object *self);
@@ -667,7 +667,7 @@ PyDoc_STRVAR(select_epoll_fileno__doc__,
 "Return the epoll control file descriptor.");
 
 #define SELECT_EPOLL_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)select_epoll_fileno, METH_NOARGS, select_epoll_fileno__doc__},
+    {"fileno", select_epoll_fileno, METH_NOARGS, select_epoll_fileno__doc__},
 
 static PyObject *
 select_epoll_fileno_impl(pyEpoll_Object *self);
@@ -689,7 +689,7 @@ PyDoc_STRVAR(select_epoll_fromfd__doc__,
 "Create an epoll object from a given control fd.");
 
 #define SELECT_EPOLL_FROMFD_METHODDEF    \
-    {"fromfd", (PyCFunction)select_epoll_fromfd, METH_O|METH_CLASS, select_epoll_fromfd__doc__},
+    {"fromfd", select_epoll_fromfd, METH_O|METH_CLASS, select_epoll_fromfd__doc__},
 
 static PyObject *
 select_epoll_fromfd_impl(PyTypeObject *type, int fd);
@@ -1035,7 +1035,7 @@ PyDoc_STRVAR(select_epoll___enter____doc__,
 "\n");
 
 #define SELECT_EPOLL___ENTER___METHODDEF    \
-    {"__enter__", (PyCFunction)select_epoll___enter__, METH_NOARGS, select_epoll___enter____doc__},
+    {"__enter__", select_epoll___enter__, METH_NOARGS, select_epoll___enter____doc__},
 
 static PyObject *
 select_epoll___enter___impl(pyEpoll_Object *self);
@@ -1150,7 +1150,7 @@ PyDoc_STRVAR(select_kqueue_close__doc__,
 "Further operations on the kqueue object will raise an exception.");
 
 #define SELECT_KQUEUE_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)select_kqueue_close, METH_NOARGS, select_kqueue_close__doc__},
+    {"close", select_kqueue_close, METH_NOARGS, select_kqueue_close__doc__},
 
 static PyObject *
 select_kqueue_close_impl(kqueue_queue_Object *self);
@@ -1178,7 +1178,7 @@ PyDoc_STRVAR(select_kqueue_fileno__doc__,
 "Return the kqueue control file descriptor.");
 
 #define SELECT_KQUEUE_FILENO_METHODDEF    \
-    {"fileno", (PyCFunction)select_kqueue_fileno, METH_NOARGS, select_kqueue_fileno__doc__},
+    {"fileno", select_kqueue_fileno, METH_NOARGS, select_kqueue_fileno__doc__},
 
 static PyObject *
 select_kqueue_fileno_impl(kqueue_queue_Object *self);
@@ -1200,7 +1200,7 @@ PyDoc_STRVAR(select_kqueue_fromfd__doc__,
 "Create a kqueue object from a given control fd.");
 
 #define SELECT_KQUEUE_FROMFD_METHODDEF    \
-    {"fromfd", (PyCFunction)select_kqueue_fromfd, METH_O|METH_CLASS, select_kqueue_fromfd__doc__},
+    {"fromfd", select_kqueue_fromfd, METH_O|METH_CLASS, select_kqueue_fromfd__doc__},
 
 static PyObject *
 select_kqueue_fromfd_impl(PyTypeObject *type, int fd);
@@ -1375,4 +1375,4 @@ select_kqueue_control(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 #ifndef SELECT_KQUEUE_CONTROL_METHODDEF
     #define SELECT_KQUEUE_CONTROL_METHODDEF
 #endif /* !defined(SELECT_KQUEUE_CONTROL_METHODDEF) */
-/*[clinic end generated code: output=6fc20d78802511d1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7a6c4446ce82846a input=a9049054013a1b77]*/
diff --git a/Modules/clinic/sha1module.c.h b/Modules/clinic/sha1module.c.h
index 3e5fd1a41ce21f..70af8b45c5a71a 100644
--- a/Modules/clinic/sha1module.c.h
+++ b/Modules/clinic/sha1module.c.h
@@ -37,7 +37,7 @@ PyDoc_STRVAR(SHA1Type_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define SHA1TYPE_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)SHA1Type_digest, METH_NOARGS, SHA1Type_digest__doc__},
+    {"digest", SHA1Type_digest, METH_NOARGS, SHA1Type_digest__doc__},
 
 static PyObject *
 SHA1Type_digest_impl(SHA1object *self);
@@ -55,7 +55,7 @@ PyDoc_STRVAR(SHA1Type_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define SHA1TYPE_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)SHA1Type_hexdigest, METH_NOARGS, SHA1Type_hexdigest__doc__},
+    {"hexdigest", SHA1Type_hexdigest, METH_NOARGS, SHA1Type_hexdigest__doc__},
 
 static PyObject *
 SHA1Type_hexdigest_impl(SHA1object *self);
@@ -73,7 +73,7 @@ PyDoc_STRVAR(SHA1Type_update__doc__,
 "Update this hash object\'s state with the provided string.");
 
 #define SHA1TYPE_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)SHA1Type_update, METH_O, SHA1Type_update__doc__},
+    {"update", SHA1Type_update, METH_O, SHA1Type_update__doc__},
 
 static PyObject *
 SHA1Type_update_impl(SHA1object *self, PyObject *obj);
@@ -164,4 +164,4 @@ _sha1_sha1(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=06161e87e2d645d4 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=116d94a8bc4bd230 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/sha2module.c.h b/Modules/clinic/sha2module.c.h
index 26612125e75df9..784b649311d629 100644
--- a/Modules/clinic/sha2module.c.h
+++ b/Modules/clinic/sha2module.c.h
@@ -59,7 +59,7 @@ PyDoc_STRVAR(SHA256Type_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define SHA256TYPE_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)SHA256Type_digest, METH_NOARGS, SHA256Type_digest__doc__},
+    {"digest", SHA256Type_digest, METH_NOARGS, SHA256Type_digest__doc__},
 
 static PyObject *
 SHA256Type_digest_impl(SHA256object *self);
@@ -77,7 +77,7 @@ PyDoc_STRVAR(SHA512Type_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define SHA512TYPE_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)SHA512Type_digest, METH_NOARGS, SHA512Type_digest__doc__},
+    {"digest", SHA512Type_digest, METH_NOARGS, SHA512Type_digest__doc__},
 
 static PyObject *
 SHA512Type_digest_impl(SHA512object *self);
@@ -95,7 +95,7 @@ PyDoc_STRVAR(SHA256Type_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define SHA256TYPE_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)SHA256Type_hexdigest, METH_NOARGS, SHA256Type_hexdigest__doc__},
+    {"hexdigest", SHA256Type_hexdigest, METH_NOARGS, SHA256Type_hexdigest__doc__},
 
 static PyObject *
 SHA256Type_hexdigest_impl(SHA256object *self);
@@ -113,7 +113,7 @@ PyDoc_STRVAR(SHA512Type_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define SHA512TYPE_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)SHA512Type_hexdigest, METH_NOARGS, SHA512Type_hexdigest__doc__},
+    {"hexdigest", SHA512Type_hexdigest, METH_NOARGS, SHA512Type_hexdigest__doc__},
 
 static PyObject *
 SHA512Type_hexdigest_impl(SHA512object *self);
@@ -131,7 +131,7 @@ PyDoc_STRVAR(SHA256Type_update__doc__,
 "Update this hash object\'s state with the provided string.");
 
 #define SHA256TYPE_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)SHA256Type_update, METH_O, SHA256Type_update__doc__},
+    {"update", SHA256Type_update, METH_O, SHA256Type_update__doc__},
 
 static PyObject *
 SHA256Type_update_impl(SHA256object *self, PyObject *obj);
@@ -153,7 +153,7 @@ PyDoc_STRVAR(SHA512Type_update__doc__,
 "Update this hash object\'s state with the provided string.");
 
 #define SHA512TYPE_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)SHA512Type_update, METH_O, SHA512Type_update__doc__},
+    {"update", SHA512Type_update, METH_O, SHA512Type_update__doc__},
 
 static PyObject *
 SHA512Type_update_impl(SHA512object *self, PyObject *obj);
@@ -475,4 +475,4 @@ _sha2_sha384(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=af11090855b7c85a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e97e604854e0cefe input=a9049054013a1b77]*/
diff --git a/Modules/clinic/sha3module.c.h b/Modules/clinic/sha3module.c.h
index 25f72b74f801db..a02d0bcfbd0bb8 100644
--- a/Modules/clinic/sha3module.c.h
+++ b/Modules/clinic/sha3module.c.h
@@ -88,7 +88,7 @@ PyDoc_STRVAR(_sha3_sha3_224_copy__doc__,
 "Return a copy of the hash object.");
 
 #define _SHA3_SHA3_224_COPY_METHODDEF    \
-    {"copy", (PyCFunction)_sha3_sha3_224_copy, METH_NOARGS, _sha3_sha3_224_copy__doc__},
+    {"copy", _sha3_sha3_224_copy, METH_NOARGS, _sha3_sha3_224_copy__doc__},
 
 static PyObject *
 _sha3_sha3_224_copy_impl(SHA3object *self);
@@ -106,7 +106,7 @@ PyDoc_STRVAR(_sha3_sha3_224_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define _SHA3_SHA3_224_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)_sha3_sha3_224_digest, METH_NOARGS, _sha3_sha3_224_digest__doc__},
+    {"digest", _sha3_sha3_224_digest, METH_NOARGS, _sha3_sha3_224_digest__doc__},
 
 static PyObject *
 _sha3_sha3_224_digest_impl(SHA3object *self);
@@ -124,7 +124,7 @@ PyDoc_STRVAR(_sha3_sha3_224_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define _SHA3_SHA3_224_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)_sha3_sha3_224_hexdigest, METH_NOARGS, _sha3_sha3_224_hexdigest__doc__},
+    {"hexdigest", _sha3_sha3_224_hexdigest, METH_NOARGS, _sha3_sha3_224_hexdigest__doc__},
 
 static PyObject *
 _sha3_sha3_224_hexdigest_impl(SHA3object *self);
@@ -142,7 +142,7 @@ PyDoc_STRVAR(_sha3_sha3_224_update__doc__,
 "Update this hash object\'s state with the provided bytes-like object.");
 
 #define _SHA3_SHA3_224_UPDATE_METHODDEF    \
-    {"update", (PyCFunction)_sha3_sha3_224_update, METH_O, _sha3_sha3_224_update__doc__},
+    {"update", _sha3_sha3_224_update, METH_O, _sha3_sha3_224_update__doc__},
 
 static PyObject *
 _sha3_sha3_224_update_impl(SHA3object *self, PyObject *data);
@@ -164,7 +164,7 @@ PyDoc_STRVAR(_sha3_shake_128_digest__doc__,
 "Return the digest value as a bytes object.");
 
 #define _SHA3_SHAKE_128_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)_sha3_shake_128_digest, METH_O, _sha3_shake_128_digest__doc__},
+    {"digest", _sha3_shake_128_digest, METH_O, _sha3_shake_128_digest__doc__},
 
 static PyObject *
 _sha3_shake_128_digest_impl(SHA3object *self, unsigned long length);
@@ -191,7 +191,7 @@ PyDoc_STRVAR(_sha3_shake_128_hexdigest__doc__,
 "Return the digest value as a string of hexadecimal digits.");
 
 #define _SHA3_SHAKE_128_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)_sha3_shake_128_hexdigest, METH_O, _sha3_shake_128_hexdigest__doc__},
+    {"hexdigest", _sha3_shake_128_hexdigest, METH_O, _sha3_shake_128_hexdigest__doc__},
 
 static PyObject *
 _sha3_shake_128_hexdigest_impl(SHA3object *self, unsigned long length);
@@ -210,4 +210,4 @@ _sha3_shake_128_hexdigest(PyObject *self, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=5b3ac1c06c6899ea input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bc10c20adde2bb22 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h
index 3ae8be84ccbf9c..42705063bc3554 100644
--- a/Modules/clinic/signalmodule.c.h
+++ b/Modules/clinic/signalmodule.c.h
@@ -53,7 +53,7 @@ PyDoc_STRVAR(signal_alarm__doc__,
 "Arrange for SIGALRM to arrive after the given number of seconds.");
 
 #define SIGNAL_ALARM_METHODDEF    \
-    {"alarm", (PyCFunction)signal_alarm, METH_O, signal_alarm__doc__},
+    {"alarm", signal_alarm, METH_O, signal_alarm__doc__},
 
 static long
 signal_alarm_impl(PyObject *module, int seconds);
@@ -90,7 +90,7 @@ PyDoc_STRVAR(signal_pause__doc__,
 "Wait until a signal arrives.");
 
 #define SIGNAL_PAUSE_METHODDEF    \
-    {"pause", (PyCFunction)signal_pause, METH_NOARGS, signal_pause__doc__},
+    {"pause", signal_pause, METH_NOARGS, signal_pause__doc__},
 
 static PyObject *
 signal_pause_impl(PyObject *module);
@@ -110,7 +110,7 @@ PyDoc_STRVAR(signal_raise_signal__doc__,
 "Send a signal to the executing process.");
 
 #define SIGNAL_RAISE_SIGNAL_METHODDEF    \
-    {"raise_signal", (PyCFunction)signal_raise_signal, METH_O, signal_raise_signal__doc__},
+    {"raise_signal", signal_raise_signal, METH_O, signal_raise_signal__doc__},
 
 static PyObject *
 signal_raise_signal_impl(PyObject *module, int signalnum);
@@ -184,7 +184,7 @@ PyDoc_STRVAR(signal_getsignal__doc__,
 "  anything else -- the callable Python object used as a handler");
 
 #define SIGNAL_GETSIGNAL_METHODDEF    \
-    {"getsignal", (PyCFunction)signal_getsignal, METH_O, signal_getsignal__doc__},
+    {"getsignal", signal_getsignal, METH_O, signal_getsignal__doc__},
 
 static PyObject *
 signal_getsignal_impl(PyObject *module, int signalnum);
@@ -216,7 +216,7 @@ PyDoc_STRVAR(signal_strsignal__doc__,
 "description. Raises :exc:`ValueError` if *signalnum* is invalid.");
 
 #define SIGNAL_STRSIGNAL_METHODDEF    \
-    {"strsignal", (PyCFunction)signal_strsignal, METH_O, signal_strsignal__doc__},
+    {"strsignal", signal_strsignal, METH_O, signal_strsignal__doc__},
 
 static PyObject *
 signal_strsignal_impl(PyObject *module, int signalnum);
@@ -412,7 +412,7 @@ PyDoc_STRVAR(signal_getitimer__doc__,
 "Returns current value of given itimer.");
 
 #define SIGNAL_GETITIMER_METHODDEF    \
-    {"getitimer", (PyCFunction)signal_getitimer, METH_O, signal_getitimer__doc__},
+    {"getitimer", signal_getitimer, METH_O, signal_getitimer__doc__},
 
 static PyObject *
 signal_getitimer_impl(PyObject *module, int which);
@@ -486,7 +486,7 @@ PyDoc_STRVAR(signal_sigpending__doc__,
 "the calling thread.");
 
 #define SIGNAL_SIGPENDING_METHODDEF    \
-    {"sigpending", (PyCFunction)signal_sigpending, METH_NOARGS, signal_sigpending__doc__},
+    {"sigpending", signal_sigpending, METH_NOARGS, signal_sigpending__doc__},
 
 static PyObject *
 signal_sigpending_impl(PyObject *module);
@@ -512,7 +512,7 @@ PyDoc_STRVAR(signal_sigwait__doc__,
 "and returns the signal number.");
 
 #define SIGNAL_SIGWAIT_METHODDEF    \
-    {"sigwait", (PyCFunction)signal_sigwait, METH_O, signal_sigwait__doc__},
+    {"sigwait", signal_sigwait, METH_O, signal_sigwait__doc__},
 
 static PyObject *
 signal_sigwait_impl(PyObject *module, sigset_t sigset);
@@ -546,7 +546,7 @@ PyDoc_STRVAR(signal_valid_signals__doc__,
 "functions like `pthread_sigmask`.");
 
 #define SIGNAL_VALID_SIGNALS_METHODDEF    \
-    {"valid_signals", (PyCFunction)signal_valid_signals, METH_NOARGS, signal_valid_signals__doc__},
+    {"valid_signals", signal_valid_signals, METH_NOARGS, signal_valid_signals__doc__},
 
 static PyObject *
 signal_valid_signals_impl(PyObject *module);
@@ -570,7 +570,7 @@ PyDoc_STRVAR(signal_sigwaitinfo__doc__,
 "Returns a struct_siginfo containing information about the signal.");
 
 #define SIGNAL_SIGWAITINFO_METHODDEF    \
-    {"sigwaitinfo", (PyCFunction)signal_sigwaitinfo, METH_O, signal_sigwaitinfo__doc__},
+    {"sigwaitinfo", signal_sigwaitinfo, METH_O, signal_sigwaitinfo__doc__},
 
 static PyObject *
 signal_sigwaitinfo_impl(PyObject *module, sigset_t sigset);
@@ -779,4 +779,4 @@ signal_pidfd_send_signal(PyObject *module, PyObject *const *args, Py_ssize_t nar
 #ifndef SIGNAL_PIDFD_SEND_SIGNAL_METHODDEF
     #define SIGNAL_PIDFD_SEND_SIGNAL_METHODDEF
 #endif /* !defined(SIGNAL_PIDFD_SEND_SIGNAL_METHODDEF) */
-/*[clinic end generated code: output=a8b1ac2fc44a007e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f33a27be1612f42d input=a9049054013a1b77]*/
diff --git a/Modules/clinic/socketmodule.c.h b/Modules/clinic/socketmodule.c.h
index 174fb46590f5d1..33d37d510ddec8 100644
--- a/Modules/clinic/socketmodule.c.h
+++ b/Modules/clinic/socketmodule.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(_socket_socket_close__doc__,
 "Close the socket.  It cannot be used after this call.");
 
 #define _SOCKET_SOCKET_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)_socket_socket_close, METH_NOARGS, _socket_socket_close__doc__},
+    {"close", _socket_socket_close, METH_NOARGS, _socket_socket_close__doc__},
 
 static PyObject *
 _socket_socket_close_impl(PySocketSockObject *s);
@@ -122,7 +122,7 @@ PyDoc_STRVAR(_socket_socket_ntohs__doc__,
 "Convert a 16-bit unsigned integer from network to host byte order.");
 
 #define _SOCKET_SOCKET_NTOHS_METHODDEF    \
-    {"ntohs", (PyCFunction)_socket_socket_ntohs, METH_O, _socket_socket_ntohs__doc__},
+    {"ntohs", _socket_socket_ntohs, METH_O, _socket_socket_ntohs__doc__},
 
 static PyObject *
 _socket_socket_ntohs_impl(PySocketSockObject *self, int x);
@@ -150,7 +150,7 @@ PyDoc_STRVAR(_socket_socket_htons__doc__,
 "Convert a 16-bit unsigned integer from host to network byte order.");
 
 #define _SOCKET_SOCKET_HTONS_METHODDEF    \
-    {"htons", (PyCFunction)_socket_socket_htons, METH_O, _socket_socket_htons__doc__},
+    {"htons", _socket_socket_htons, METH_O, _socket_socket_htons__doc__},
 
 static PyObject *
 _socket_socket_htons_impl(PySocketSockObject *self, int x);
@@ -178,7 +178,7 @@ PyDoc_STRVAR(_socket_socket_inet_aton__doc__,
 "Convert an IP address in string format (123.45.67.89) to the 32-bit packed binary format used in low-level network functions.");
 
 #define _SOCKET_SOCKET_INET_ATON_METHODDEF    \
-    {"inet_aton", (PyCFunction)_socket_socket_inet_aton, METH_O, _socket_socket_inet_aton__doc__},
+    {"inet_aton", _socket_socket_inet_aton, METH_O, _socket_socket_inet_aton__doc__},
 
 static PyObject *
 _socket_socket_inet_aton_impl(PySocketSockObject *self, const char *ip_addr);
@@ -217,7 +217,7 @@ PyDoc_STRVAR(_socket_socket_inet_ntoa__doc__,
 "Convert an IP address from 32-bit packed binary format to string format.");
 
 #define _SOCKET_SOCKET_INET_NTOA_METHODDEF    \
-    {"inet_ntoa", (PyCFunction)_socket_socket_inet_ntoa, METH_O, _socket_socket_inet_ntoa__doc__},
+    {"inet_ntoa", _socket_socket_inet_ntoa, METH_O, _socket_socket_inet_ntoa__doc__},
 
 static PyObject *
 _socket_socket_inet_ntoa_impl(PySocketSockObject *self, Py_buffer *packed_ip);
@@ -253,7 +253,7 @@ PyDoc_STRVAR(_socket_socket_if_nametoindex__doc__,
 "Returns the interface index corresponding to the interface name if_name.");
 
 #define _SOCKET_SOCKET_IF_NAMETOINDEX_METHODDEF    \
-    {"if_nametoindex", (PyCFunction)_socket_socket_if_nametoindex, METH_O, _socket_socket_if_nametoindex__doc__},
+    {"if_nametoindex", _socket_socket_if_nametoindex, METH_O, _socket_socket_if_nametoindex__doc__},
 
 static PyObject *
 _socket_socket_if_nametoindex_impl(PySocketSockObject *self, PyObject *oname);
@@ -282,4 +282,4 @@ _socket_socket_if_nametoindex(PyObject *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=27bc54006551ab0c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=cdbd7bc4f8f83dd1 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/syslogmodule.c.h b/Modules/clinic/syslogmodule.c.h
index f9034982f3b2c7..53157c8af4ec1b 100644
--- a/Modules/clinic/syslogmodule.c.h
+++ b/Modules/clinic/syslogmodule.c.h
@@ -105,7 +105,7 @@ PyDoc_STRVAR(syslog_syslog__doc__,
 "Send the string message to the system logger.");
 
 #define SYSLOG_SYSLOG_METHODDEF    \
-    {"syslog", (PyCFunction)syslog_syslog, METH_VARARGS, syslog_syslog__doc__},
+    {"syslog", syslog_syslog, METH_VARARGS, syslog_syslog__doc__},
 
 static PyObject *
 syslog_syslog_impl(PyObject *module, int group_left_1, int priority,
@@ -150,7 +150,7 @@ PyDoc_STRVAR(syslog_closelog__doc__,
 "Reset the syslog module values and call the system library closelog().");
 
 #define SYSLOG_CLOSELOG_METHODDEF    \
-    {"closelog", (PyCFunction)syslog_closelog, METH_NOARGS, syslog_closelog__doc__},
+    {"closelog", syslog_closelog, METH_NOARGS, syslog_closelog__doc__},
 
 static PyObject *
 syslog_closelog_impl(PyObject *module);
@@ -174,7 +174,7 @@ PyDoc_STRVAR(syslog_setlogmask__doc__,
 "Set the priority mask to maskpri and return the previous mask value.");
 
 #define SYSLOG_SETLOGMASK_METHODDEF    \
-    {"setlogmask", (PyCFunction)syslog_setlogmask, METH_O, syslog_setlogmask__doc__},
+    {"setlogmask", syslog_setlogmask, METH_O, syslog_setlogmask__doc__},
 
 static long
 syslog_setlogmask_impl(PyObject *module, long maskpri);
@@ -207,7 +207,7 @@ PyDoc_STRVAR(syslog_LOG_MASK__doc__,
 "Calculates the mask for the individual priority pri.");
 
 #define SYSLOG_LOG_MASK_METHODDEF    \
-    {"LOG_MASK", (PyCFunction)syslog_LOG_MASK, METH_O, syslog_LOG_MASK__doc__},
+    {"LOG_MASK", syslog_LOG_MASK, METH_O, syslog_LOG_MASK__doc__},
 
 static long
 syslog_LOG_MASK_impl(PyObject *module, long pri);
@@ -240,7 +240,7 @@ PyDoc_STRVAR(syslog_LOG_UPTO__doc__,
 "Calculates the mask for all priorities up to and including pri.");
 
 #define SYSLOG_LOG_UPTO_METHODDEF    \
-    {"LOG_UPTO", (PyCFunction)syslog_LOG_UPTO, METH_O, syslog_LOG_UPTO__doc__},
+    {"LOG_UPTO", syslog_LOG_UPTO, METH_O, syslog_LOG_UPTO__doc__},
 
 static long
 syslog_LOG_UPTO_impl(PyObject *module, long pri);
@@ -265,4 +265,4 @@ syslog_LOG_UPTO(PyObject *module, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=f92ac9948fa6131e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=866c52f4edda0a73 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/termios.c.h b/Modules/clinic/termios.c.h
index 83f5a4f6e9f882..c1e202465ab7bc 100644
--- a/Modules/clinic/termios.c.h
+++ b/Modules/clinic/termios.c.h
@@ -16,7 +16,7 @@ PyDoc_STRVAR(termios_tcgetattr__doc__,
 "done using the symbolic constants defined in this module.");
 
 #define TERMIOS_TCGETATTR_METHODDEF    \
-    {"tcgetattr", (PyCFunction)termios_tcgetattr, METH_O, termios_tcgetattr__doc__},
+    {"tcgetattr", termios_tcgetattr, METH_O, termios_tcgetattr__doc__},
 
 static PyObject *
 termios_tcgetattr_impl(PyObject *module, int fd);
@@ -130,7 +130,7 @@ PyDoc_STRVAR(termios_tcdrain__doc__,
 "Wait until all output written to file descriptor fd has been transmitted.");
 
 #define TERMIOS_TCDRAIN_METHODDEF    \
-    {"tcdrain", (PyCFunction)termios_tcdrain, METH_O, termios_tcdrain__doc__},
+    {"tcdrain", termios_tcdrain, METH_O, termios_tcdrain__doc__},
 
 static PyObject *
 termios_tcdrain_impl(PyObject *module, int fd);
@@ -242,7 +242,7 @@ PyDoc_STRVAR(termios_tcgetwinsize__doc__,
 "Returns a tuple (ws_row, ws_col).");
 
 #define TERMIOS_TCGETWINSIZE_METHODDEF    \
-    {"tcgetwinsize", (PyCFunction)termios_tcgetwinsize, METH_O, termios_tcgetwinsize__doc__},
+    {"tcgetwinsize", termios_tcgetwinsize, METH_O, termios_tcgetwinsize__doc__},
 
 static PyObject *
 termios_tcgetwinsize_impl(PyObject *module, int fd);
@@ -299,4 +299,4 @@ termios_tcsetwinsize(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=c6c6192583b0da36 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2ee49d5de55b30c6 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/timemodule.c.h b/Modules/clinic/timemodule.c.h
index bbc0748f9a9c0d..09717c2176c3bd 100644
--- a/Modules/clinic/timemodule.c.h
+++ b/Modules/clinic/timemodule.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(time_clock_gettime__doc__,
 "Return the time of the specified clock clk_id as a float.");
 
 #define TIME_CLOCK_GETTIME_METHODDEF    \
-    {"clock_gettime", (PyCFunction)time_clock_gettime, METH_O, time_clock_gettime__doc__},
+    {"clock_gettime", time_clock_gettime, METH_O, time_clock_gettime__doc__},
 
 static PyObject *
 time_clock_gettime_impl(PyObject *module, clockid_t clk_id);
@@ -42,7 +42,7 @@ PyDoc_STRVAR(time_clock_gettime_ns__doc__,
 "Return the time of the specified clock clk_id as nanoseconds (int).");
 
 #define TIME_CLOCK_GETTIME_NS_METHODDEF    \
-    {"clock_gettime_ns", (PyCFunction)time_clock_gettime_ns, METH_O, time_clock_gettime_ns__doc__},
+    {"clock_gettime_ns", time_clock_gettime_ns, METH_O, time_clock_gettime_ns__doc__},
 
 static PyObject *
 time_clock_gettime_ns_impl(PyObject *module, clockid_t clk_id);
@@ -71,4 +71,4 @@ time_clock_gettime_ns(PyObject *module, PyObject *arg)
 #ifndef TIME_CLOCK_GETTIME_NS_METHODDEF
     #define TIME_CLOCK_GETTIME_NS_METHODDEF
 #endif /* !defined(TIME_CLOCK_GETTIME_NS_METHODDEF) */
-/*[clinic end generated code: output=b589a2132aa9df47 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0a5e10de8e92d3da input=a9049054013a1b77]*/
diff --git a/Modules/clinic/unicodedata.c.h b/Modules/clinic/unicodedata.c.h
index 345440eeee89a6..d77e577b781167 100644
--- a/Modules/clinic/unicodedata.c.h
+++ b/Modules/clinic/unicodedata.c.h
@@ -160,7 +160,7 @@ PyDoc_STRVAR(unicodedata_UCD_category__doc__,
 "Returns the general category assigned to the character chr as string.");
 
 #define UNICODEDATA_UCD_CATEGORY_METHODDEF    \
-    {"category", (PyCFunction)unicodedata_UCD_category, METH_O, unicodedata_UCD_category__doc__},
+    {"category", unicodedata_UCD_category, METH_O, unicodedata_UCD_category__doc__},
 
 static PyObject *
 unicodedata_UCD_category_impl(PyObject *self, int chr);
@@ -198,7 +198,7 @@ PyDoc_STRVAR(unicodedata_UCD_bidirectional__doc__,
 "If no such value is defined, an empty string is returned.");
 
 #define UNICODEDATA_UCD_BIDIRECTIONAL_METHODDEF    \
-    {"bidirectional", (PyCFunction)unicodedata_UCD_bidirectional, METH_O, unicodedata_UCD_bidirectional__doc__},
+    {"bidirectional", unicodedata_UCD_bidirectional, METH_O, unicodedata_UCD_bidirectional__doc__},
 
 static PyObject *
 unicodedata_UCD_bidirectional_impl(PyObject *self, int chr);
@@ -236,7 +236,7 @@ PyDoc_STRVAR(unicodedata_UCD_combining__doc__,
 "Returns 0 if no combining class is defined.");
 
 #define UNICODEDATA_UCD_COMBINING_METHODDEF    \
-    {"combining", (PyCFunction)unicodedata_UCD_combining, METH_O, unicodedata_UCD_combining__doc__},
+    {"combining", unicodedata_UCD_combining, METH_O, unicodedata_UCD_combining__doc__},
 
 static int
 unicodedata_UCD_combining_impl(PyObject *self, int chr);
@@ -280,7 +280,7 @@ PyDoc_STRVAR(unicodedata_UCD_mirrored__doc__,
 "character in bidirectional text, 0 otherwise.");
 
 #define UNICODEDATA_UCD_MIRRORED_METHODDEF    \
-    {"mirrored", (PyCFunction)unicodedata_UCD_mirrored, METH_O, unicodedata_UCD_mirrored__doc__},
+    {"mirrored", unicodedata_UCD_mirrored, METH_O, unicodedata_UCD_mirrored__doc__},
 
 static int
 unicodedata_UCD_mirrored_impl(PyObject *self, int chr);
@@ -321,7 +321,7 @@ PyDoc_STRVAR(unicodedata_UCD_east_asian_width__doc__,
 "Returns the east asian width assigned to the character chr as string.");
 
 #define UNICODEDATA_UCD_EAST_ASIAN_WIDTH_METHODDEF    \
-    {"east_asian_width", (PyCFunction)unicodedata_UCD_east_asian_width, METH_O, unicodedata_UCD_east_asian_width__doc__},
+    {"east_asian_width", unicodedata_UCD_east_asian_width, METH_O, unicodedata_UCD_east_asian_width__doc__},
 
 static PyObject *
 unicodedata_UCD_east_asian_width_impl(PyObject *self, int chr);
@@ -359,7 +359,7 @@ PyDoc_STRVAR(unicodedata_UCD_decomposition__doc__,
 "An empty string is returned in case no such mapping is defined.");
 
 #define UNICODEDATA_UCD_DECOMPOSITION_METHODDEF    \
-    {"decomposition", (PyCFunction)unicodedata_UCD_decomposition, METH_O, unicodedata_UCD_decomposition__doc__},
+    {"decomposition", unicodedata_UCD_decomposition, METH_O, unicodedata_UCD_decomposition__doc__},
 
 static PyObject *
 unicodedata_UCD_decomposition_impl(PyObject *self, int chr);
@@ -528,7 +528,7 @@ PyDoc_STRVAR(unicodedata_UCD_lookup__doc__,
 "corresponding character.  If not found, KeyError is raised.");
 
 #define UNICODEDATA_UCD_LOOKUP_METHODDEF    \
-    {"lookup", (PyCFunction)unicodedata_UCD_lookup, METH_O, unicodedata_UCD_lookup__doc__},
+    {"lookup", unicodedata_UCD_lookup, METH_O, unicodedata_UCD_lookup__doc__},
 
 static PyObject *
 unicodedata_UCD_lookup_impl(PyObject *self, const char *name,
@@ -549,4 +549,4 @@ unicodedata_UCD_lookup(PyObject *self, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=8a59d430cee41058 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=21e9a48655bd516f input=a9049054013a1b77]*/
diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h
index ffb45ade11f6dc..29cca6829e2aa7 100644
--- a/Objects/clinic/bytearrayobject.c.h
+++ b/Objects/clinic/bytearrayobject.c.h
@@ -216,7 +216,7 @@ PyDoc_STRVAR(bytearray_clear__doc__,
 "Remove all items from the bytearray.");
 
 #define BYTEARRAY_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)bytearray_clear, METH_NOARGS, bytearray_clear__doc__},
+    {"clear", bytearray_clear, METH_NOARGS, bytearray_clear__doc__},
 
 static PyObject *
 bytearray_clear_impl(PyByteArrayObject *self);
@@ -234,7 +234,7 @@ PyDoc_STRVAR(bytearray_copy__doc__,
 "Return a copy of B.");
 
 #define BYTEARRAY_COPY_METHODDEF    \
-    {"copy", (PyCFunction)bytearray_copy, METH_NOARGS, bytearray_copy__doc__},
+    {"copy", bytearray_copy, METH_NOARGS, bytearray_copy__doc__},
 
 static PyObject *
 bytearray_copy_impl(PyByteArrayObject *self);
@@ -527,7 +527,7 @@ PyDoc_STRVAR(bytearray_removeprefix__doc__,
 "bytearray.");
 
 #define BYTEARRAY_REMOVEPREFIX_METHODDEF    \
-    {"removeprefix", (PyCFunction)bytearray_removeprefix, METH_O, bytearray_removeprefix__doc__},
+    {"removeprefix", bytearray_removeprefix, METH_O, bytearray_removeprefix__doc__},
 
 static PyObject *
 bytearray_removeprefix_impl(PyByteArrayObject *self, Py_buffer *prefix);
@@ -565,7 +565,7 @@ PyDoc_STRVAR(bytearray_removesuffix__doc__,
 "the original bytearray.");
 
 #define BYTEARRAY_REMOVESUFFIX_METHODDEF    \
-    {"removesuffix", (PyCFunction)bytearray_removesuffix, METH_O, bytearray_removesuffix__doc__},
+    {"removesuffix", bytearray_removesuffix, METH_O, bytearray_removesuffix__doc__},
 
 static PyObject *
 bytearray_removesuffix_impl(PyByteArrayObject *self, Py_buffer *suffix);
@@ -602,7 +602,7 @@ PyDoc_STRVAR(bytearray_resize__doc__,
 "    New size to resize to..");
 
 #define BYTEARRAY_RESIZE_METHODDEF    \
-    {"resize", (PyCFunction)bytearray_resize, METH_O, bytearray_resize__doc__},
+    {"resize", bytearray_resize, METH_O, bytearray_resize__doc__},
 
 static PyObject *
 bytearray_resize_impl(PyByteArrayObject *self, Py_ssize_t size);
@@ -929,7 +929,7 @@ PyDoc_STRVAR(bytearray_partition__doc__,
 "original bytearray object and two empty bytearray objects.");
 
 #define BYTEARRAY_PARTITION_METHODDEF    \
-    {"partition", (PyCFunction)bytearray_partition, METH_O, bytearray_partition__doc__},
+    {"partition", bytearray_partition, METH_O, bytearray_partition__doc__},
 
 static PyObject *
 bytearray_partition_impl(PyByteArrayObject *self, PyObject *sep);
@@ -961,7 +961,7 @@ PyDoc_STRVAR(bytearray_rpartition__doc__,
 "objects and the copy of the original bytearray object.");
 
 #define BYTEARRAY_RPARTITION_METHODDEF    \
-    {"rpartition", (PyCFunction)bytearray_rpartition, METH_O, bytearray_rpartition__doc__},
+    {"rpartition", bytearray_rpartition, METH_O, bytearray_rpartition__doc__},
 
 static PyObject *
 bytearray_rpartition_impl(PyByteArrayObject *self, PyObject *sep);
@@ -1079,7 +1079,7 @@ PyDoc_STRVAR(bytearray_reverse__doc__,
 "Reverse the order of the values in B in place.");
 
 #define BYTEARRAY_REVERSE_METHODDEF    \
-    {"reverse", (PyCFunction)bytearray_reverse, METH_NOARGS, bytearray_reverse__doc__},
+    {"reverse", bytearray_reverse, METH_NOARGS, bytearray_reverse__doc__},
 
 static PyObject *
 bytearray_reverse_impl(PyByteArrayObject *self);
@@ -1156,7 +1156,7 @@ PyDoc_STRVAR(bytearray_append__doc__,
 "    The item to be appended.");
 
 #define BYTEARRAY_APPEND_METHODDEF    \
-    {"append", (PyCFunction)bytearray_append, METH_O, bytearray_append__doc__},
+    {"append", bytearray_append, METH_O, bytearray_append__doc__},
 
 static PyObject *
 bytearray_append_impl(PyByteArrayObject *self, int item);
@@ -1188,7 +1188,7 @@ PyDoc_STRVAR(bytearray_extend__doc__,
 "    The iterable of items to append.");
 
 #define BYTEARRAY_EXTEND_METHODDEF    \
-    {"extend", (PyCFunction)bytearray_extend, METH_O, bytearray_extend__doc__},
+    {"extend", bytearray_extend, METH_O, bytearray_extend__doc__},
 
 static PyObject *
 bytearray_extend_impl(PyByteArrayObject *self, PyObject *iterable_of_ints);
@@ -1266,7 +1266,7 @@ PyDoc_STRVAR(bytearray_remove__doc__,
 "    The value to remove.");
 
 #define BYTEARRAY_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)bytearray_remove, METH_O, bytearray_remove__doc__},
+    {"remove", bytearray_remove, METH_O, bytearray_remove__doc__},
 
 static PyObject *
 bytearray_remove_impl(PyByteArrayObject *self, int value);
@@ -1513,7 +1513,7 @@ PyDoc_STRVAR(bytearray_join__doc__,
 "The result is returned as a new bytearray object.");
 
 #define BYTEARRAY_JOIN_METHODDEF    \
-    {"join", (PyCFunction)bytearray_join, METH_O, bytearray_join__doc__},
+    {"join", bytearray_join, METH_O, bytearray_join__doc__},
 
 static PyObject *
 bytearray_join_impl(PyByteArrayObject *self, PyObject *iterable_of_bytes);
@@ -1611,7 +1611,7 @@ PyDoc_STRVAR(bytearray_fromhex__doc__,
 "Example: bytearray.fromhex(\'B9 01EF\') -> bytearray(b\'\\\\xb9\\\\x01\\\\xef\')");
 
 #define BYTEARRAY_FROMHEX_METHODDEF    \
-    {"fromhex", (PyCFunction)bytearray_fromhex, METH_O|METH_CLASS, bytearray_fromhex__doc__},
+    {"fromhex", bytearray_fromhex, METH_O|METH_CLASS, bytearray_fromhex__doc__},
 
 static PyObject *
 bytearray_fromhex_impl(PyTypeObject *type, PyObject *string);
@@ -1725,7 +1725,7 @@ PyDoc_STRVAR(bytearray_reduce__doc__,
 "Return state information for pickling.");
 
 #define BYTEARRAY_REDUCE_METHODDEF    \
-    {"__reduce__", (PyCFunction)bytearray_reduce, METH_NOARGS, bytearray_reduce__doc__},
+    {"__reduce__", bytearray_reduce, METH_NOARGS, bytearray_reduce__doc__},
 
 static PyObject *
 bytearray_reduce_impl(PyByteArrayObject *self);
@@ -1786,7 +1786,7 @@ PyDoc_STRVAR(bytearray_sizeof__doc__,
 "Returns the size of the bytearray object in memory, in bytes.");
 
 #define BYTEARRAY_SIZEOF_METHODDEF    \
-    {"__sizeof__", (PyCFunction)bytearray_sizeof, METH_NOARGS, bytearray_sizeof__doc__},
+    {"__sizeof__", bytearray_sizeof, METH_NOARGS, bytearray_sizeof__doc__},
 
 static PyObject *
 bytearray_sizeof_impl(PyByteArrayObject *self);
@@ -1796,4 +1796,4 @@ bytearray_sizeof(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return bytearray_sizeof_impl((PyByteArrayObject *)self);
 }
-/*[clinic end generated code: output=be6d28193bc96a2c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b5c04356fe641443 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h
index 00cf13d422d900..5058ed5f6c14e4 100644
--- a/Objects/clinic/bytesobject.c.h
+++ b/Objects/clinic/bytesobject.c.h
@@ -16,7 +16,7 @@ PyDoc_STRVAR(bytes___bytes____doc__,
 "Convert this value to exact type bytes.");
 
 #define BYTES___BYTES___METHODDEF    \
-    {"__bytes__", (PyCFunction)bytes___bytes__, METH_NOARGS, bytes___bytes____doc__},
+    {"__bytes__", bytes___bytes__, METH_NOARGS, bytes___bytes____doc__},
 
 static PyObject *
 bytes___bytes___impl(PyBytesObject *self);
@@ -130,7 +130,7 @@ PyDoc_STRVAR(bytes_partition__doc__,
 "object and two empty bytes objects.");
 
 #define BYTES_PARTITION_METHODDEF    \
-    {"partition", (PyCFunction)bytes_partition, METH_O, bytes_partition__doc__},
+    {"partition", bytes_partition, METH_O, bytes_partition__doc__},
 
 static PyObject *
 bytes_partition_impl(PyBytesObject *self, Py_buffer *sep);
@@ -169,7 +169,7 @@ PyDoc_STRVAR(bytes_rpartition__doc__,
 "objects and the original bytes object.");
 
 #define BYTES_RPARTITION_METHODDEF    \
-    {"rpartition", (PyCFunction)bytes_rpartition, METH_O, bytes_rpartition__doc__},
+    {"rpartition", bytes_rpartition, METH_O, bytes_rpartition__doc__},
 
 static PyObject *
 bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep);
@@ -298,7 +298,7 @@ PyDoc_STRVAR(bytes_join__doc__,
 "Example: b\'.\'.join([b\'ab\', b\'pq\', b\'rs\']) -> b\'ab.pq.rs\'.");
 
 #define BYTES_JOIN_METHODDEF    \
-    {"join", (PyCFunction)bytes_join, METH_O, bytes_join__doc__},
+    {"join", bytes_join, METH_O, bytes_join__doc__},
 
 static PyObject *
 bytes_join_impl(PyBytesObject *self, PyObject *iterable_of_bytes);
@@ -866,7 +866,7 @@ PyDoc_STRVAR(bytes_removeprefix__doc__,
 "Otherwise, return a copy of the original bytes.");
 
 #define BYTES_REMOVEPREFIX_METHODDEF    \
-    {"removeprefix", (PyCFunction)bytes_removeprefix, METH_O, bytes_removeprefix__doc__},
+    {"removeprefix", bytes_removeprefix, METH_O, bytes_removeprefix__doc__},
 
 static PyObject *
 bytes_removeprefix_impl(PyBytesObject *self, Py_buffer *prefix);
@@ -902,7 +902,7 @@ PyDoc_STRVAR(bytes_removesuffix__doc__,
 "bytes.");
 
 #define BYTES_REMOVESUFFIX_METHODDEF    \
-    {"removesuffix", (PyCFunction)bytes_removesuffix, METH_O, bytes_removesuffix__doc__},
+    {"removesuffix", bytes_removesuffix, METH_O, bytes_removesuffix__doc__},
 
 static PyObject *
 bytes_removesuffix_impl(PyBytesObject *self, Py_buffer *suffix);
@@ -1212,7 +1212,7 @@ PyDoc_STRVAR(bytes_fromhex__doc__,
 "Example: bytes.fromhex(\'B9 01EF\') -> b\'\\\\xb9\\\\x01\\\\xef\'.");
 
 #define BYTES_FROMHEX_METHODDEF    \
-    {"fromhex", (PyCFunction)bytes_fromhex, METH_O|METH_CLASS, bytes_fromhex__doc__},
+    {"fromhex", bytes_fromhex, METH_O|METH_CLASS, bytes_fromhex__doc__},
 
 static PyObject *
 bytes_fromhex_impl(PyTypeObject *type, PyObject *string);
@@ -1411,4 +1411,4 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=08b9507244f73638 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a1688f129100ca3d input=a9049054013a1b77]*/
diff --git a/Objects/clinic/classobject.c.h b/Objects/clinic/classobject.c.h
index 5934f1c2a41669..f74fefc66fb8e3 100644
--- a/Objects/clinic/classobject.c.h
+++ b/Objects/clinic/classobject.c.h
@@ -10,7 +10,7 @@ PyDoc_STRVAR(method___reduce____doc__,
 "\n");
 
 #define METHOD___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)method___reduce__, METH_NOARGS, method___reduce____doc__},
+    {"__reduce__", method___reduce__, METH_NOARGS, method___reduce____doc__},
 
 static PyObject *
 method___reduce___impl(PyMethodObject *self);
@@ -82,4 +82,4 @@ instancemethod_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=ab546abf90aac94e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bebe7e84ba161657 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h
index c7303380de55f4..36245431b47ab2 100644
--- a/Objects/clinic/complexobject.c.h
+++ b/Objects/clinic/complexobject.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(complex_conjugate__doc__,
 "Return the complex conjugate of its argument. (3-4j).conjugate() == 3+4j.");
 
 #define COMPLEX_CONJUGATE_METHODDEF    \
-    {"conjugate", (PyCFunction)complex_conjugate, METH_NOARGS, complex_conjugate__doc__},
+    {"conjugate", complex_conjugate, METH_NOARGS, complex_conjugate__doc__},
 
 static PyObject *
 complex_conjugate_impl(PyComplexObject *self);
@@ -32,7 +32,7 @@ PyDoc_STRVAR(complex___getnewargs____doc__,
 "\n");
 
 #define COMPLEX___GETNEWARGS___METHODDEF    \
-    {"__getnewargs__", (PyCFunction)complex___getnewargs__, METH_NOARGS, complex___getnewargs____doc__},
+    {"__getnewargs__", complex___getnewargs__, METH_NOARGS, complex___getnewargs____doc__},
 
 static PyObject *
 complex___getnewargs___impl(PyComplexObject *self);
@@ -50,7 +50,7 @@ PyDoc_STRVAR(complex___format____doc__,
 "Convert to a string according to format_spec.");
 
 #define COMPLEX___FORMAT___METHODDEF    \
-    {"__format__", (PyCFunction)complex___format__, METH_O, complex___format____doc__},
+    {"__format__", complex___format__, METH_O, complex___format____doc__},
 
 static PyObject *
 complex___format___impl(PyComplexObject *self, PyObject *format_spec);
@@ -79,7 +79,7 @@ PyDoc_STRVAR(complex___complex____doc__,
 "Convert this value to exact type complex.");
 
 #define COMPLEX___COMPLEX___METHODDEF    \
-    {"__complex__", (PyCFunction)complex___complex__, METH_NOARGS, complex___complex____doc__},
+    {"__complex__", complex___complex__, METH_NOARGS, complex___complex____doc__},
 
 static PyObject *
 complex___complex___impl(PyComplexObject *self);
@@ -171,7 +171,7 @@ PyDoc_STRVAR(complex_from_number__doc__,
 "Convert number to a complex floating-point number.");
 
 #define COMPLEX_FROM_NUMBER_METHODDEF    \
-    {"from_number", (PyCFunction)complex_from_number, METH_O|METH_CLASS, complex_from_number__doc__},
+    {"from_number", complex_from_number, METH_O|METH_CLASS, complex_from_number__doc__},
 
 static PyObject *
 complex_from_number_impl(PyTypeObject *type, PyObject *number);
@@ -185,4 +185,4 @@ complex_from_number(PyObject *type, PyObject *number)
 
     return return_value;
 }
-/*[clinic end generated code: output=05d2ff43fc409733 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8e80b6f784e3376f input=a9049054013a1b77]*/
diff --git a/Objects/clinic/dictobject.c.h b/Objects/clinic/dictobject.c.h
index abf6b38449fcb0..aa0e84af416e2e 100644
--- a/Objects/clinic/dictobject.c.h
+++ b/Objects/clinic/dictobject.c.h
@@ -46,7 +46,7 @@ PyDoc_STRVAR(dict_copy__doc__,
 "Return a shallow copy of the dict.");
 
 #define DICT_COPY_METHODDEF    \
-    {"copy", (PyCFunction)dict_copy, METH_NOARGS, dict_copy__doc__},
+    {"copy", dict_copy, METH_NOARGS, dict_copy__doc__},
 
 static PyObject *
 dict_copy_impl(PyDictObject *self);
@@ -64,7 +64,7 @@ PyDoc_STRVAR(dict___contains____doc__,
 "True if the dictionary has the specified key, else False.");
 
 #define DICT___CONTAINS___METHODDEF    \
-    {"__contains__", (PyCFunction)dict___contains__, METH_O|METH_COEXIST, dict___contains____doc__},
+    {"__contains__", dict___contains__, METH_O|METH_COEXIST, dict___contains____doc__},
 
 static PyObject *
 dict___contains___impl(PyDictObject *self, PyObject *key);
@@ -159,7 +159,7 @@ PyDoc_STRVAR(dict_clear__doc__,
 "Remove all items from the dict.");
 
 #define DICT_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)dict_clear, METH_NOARGS, dict_clear__doc__},
+    {"clear", dict_clear, METH_NOARGS, dict_clear__doc__},
 
 static PyObject *
 dict_clear_impl(PyDictObject *self);
@@ -217,7 +217,7 @@ PyDoc_STRVAR(dict_popitem__doc__,
 "Raises KeyError if the dict is empty.");
 
 #define DICT_POPITEM_METHODDEF    \
-    {"popitem", (PyCFunction)dict_popitem, METH_NOARGS, dict_popitem__doc__},
+    {"popitem", dict_popitem, METH_NOARGS, dict_popitem__doc__},
 
 static PyObject *
 dict_popitem_impl(PyDictObject *self);
@@ -241,7 +241,7 @@ PyDoc_STRVAR(dict___sizeof____doc__,
 "Return the size of the dict in memory, in bytes.");
 
 #define DICT___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)dict___sizeof__, METH_NOARGS, dict___sizeof____doc__},
+    {"__sizeof__", dict___sizeof__, METH_NOARGS, dict___sizeof____doc__},
 
 static PyObject *
 dict___sizeof___impl(PyDictObject *self);
@@ -259,7 +259,7 @@ PyDoc_STRVAR(dict___reversed____doc__,
 "Return a reverse iterator over the dict keys.");
 
 #define DICT___REVERSED___METHODDEF    \
-    {"__reversed__", (PyCFunction)dict___reversed__, METH_NOARGS, dict___reversed____doc__},
+    {"__reversed__", dict___reversed__, METH_NOARGS, dict___reversed____doc__},
 
 static PyObject *
 dict___reversed___impl(PyDictObject *self);
@@ -277,7 +277,7 @@ PyDoc_STRVAR(dict_keys__doc__,
 "Return a set-like object providing a view on the dict\'s keys.");
 
 #define DICT_KEYS_METHODDEF    \
-    {"keys", (PyCFunction)dict_keys, METH_NOARGS, dict_keys__doc__},
+    {"keys", dict_keys, METH_NOARGS, dict_keys__doc__},
 
 static PyObject *
 dict_keys_impl(PyDictObject *self);
@@ -295,7 +295,7 @@ PyDoc_STRVAR(dict_items__doc__,
 "Return a set-like object providing a view on the dict\'s items.");
 
 #define DICT_ITEMS_METHODDEF    \
-    {"items", (PyCFunction)dict_items, METH_NOARGS, dict_items__doc__},
+    {"items", dict_items, METH_NOARGS, dict_items__doc__},
 
 static PyObject *
 dict_items_impl(PyDictObject *self);
@@ -313,7 +313,7 @@ PyDoc_STRVAR(dict_values__doc__,
 "Return an object providing a view on the dict\'s values.");
 
 #define DICT_VALUES_METHODDEF    \
-    {"values", (PyCFunction)dict_values, METH_NOARGS, dict_values__doc__},
+    {"values", dict_values, METH_NOARGS, dict_values__doc__},
 
 static PyObject *
 dict_values_impl(PyDictObject *self);
@@ -323,4 +323,4 @@ dict_values(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return dict_values_impl((PyDictObject *)self);
 }
-/*[clinic end generated code: output=9007b74432217017 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0ab6938dd62a694b input=a9049054013a1b77]*/
diff --git a/Objects/clinic/exceptions.c.h b/Objects/clinic/exceptions.c.h
index 9baac8b1cc660b..90c07379069274 100644
--- a/Objects/clinic/exceptions.c.h
+++ b/Objects/clinic/exceptions.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(BaseException___reduce____doc__,
 "\n");
 
 #define BASEEXCEPTION___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)BaseException___reduce__, METH_NOARGS, BaseException___reduce____doc__},
+    {"__reduce__", BaseException___reduce__, METH_NOARGS, BaseException___reduce____doc__},
 
 static PyObject *
 BaseException___reduce___impl(PyBaseExceptionObject *self);
@@ -34,7 +34,7 @@ PyDoc_STRVAR(BaseException___setstate____doc__,
 "\n");
 
 #define BASEEXCEPTION___SETSTATE___METHODDEF    \
-    {"__setstate__", (PyCFunction)BaseException___setstate__, METH_O, BaseException___setstate____doc__},
+    {"__setstate__", BaseException___setstate__, METH_O, BaseException___setstate____doc__},
 
 static PyObject *
 BaseException___setstate___impl(PyBaseExceptionObject *self, PyObject *state);
@@ -58,7 +58,7 @@ PyDoc_STRVAR(BaseException_with_traceback__doc__,
 "Set self.__traceback__ to tb and return self.");
 
 #define BASEEXCEPTION_WITH_TRACEBACK_METHODDEF    \
-    {"with_traceback", (PyCFunction)BaseException_with_traceback, METH_O, BaseException_with_traceback__doc__},
+    {"with_traceback", BaseException_with_traceback, METH_O, BaseException_with_traceback__doc__},
 
 static PyObject *
 BaseException_with_traceback_impl(PyBaseExceptionObject *self, PyObject *tb);
@@ -82,7 +82,7 @@ PyDoc_STRVAR(BaseException_add_note__doc__,
 "Add a note to the exception");
 
 #define BASEEXCEPTION_ADD_NOTE_METHODDEF    \
-    {"add_note", (PyCFunction)BaseException_add_note, METH_O, BaseException_add_note__doc__},
+    {"add_note", BaseException_add_note, METH_O, BaseException_add_note__doc__},
 
 static PyObject *
 BaseException_add_note_impl(PyBaseExceptionObject *self, PyObject *note);
@@ -111,9 +111,9 @@ BaseException_add_note(PyObject *self, PyObject *arg)
 #endif
 #if defined(BASEEXCEPTION_ARGS_GETSETDEF)
 #  undef BASEEXCEPTION_ARGS_GETSETDEF
-#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", (getter)BaseException_args_get, (setter)BaseException_args_set, BaseException_args_DOCSTR},
+#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", BaseException_args_get, BaseException_args_set, BaseException_args_DOCSTR},
 #else
-#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", (getter)BaseException_args_get, NULL, BaseException_args_DOCSTR},
+#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", BaseException_args_get, NULL, BaseException_args_DOCSTR},
 #endif
 
 static PyObject *
@@ -136,9 +136,9 @@ BaseException_args_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(BASEEXCEPTION_ARGS_GETSETDEF)
 #  undef BASEEXCEPTION_ARGS_GETSETDEF
-#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", (getter)BaseException_args_get, (setter)BaseException_args_set, BaseException_args_DOCSTR},
+#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", BaseException_args_get, BaseException_args_set, BaseException_args_DOCSTR},
 #else
-#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", NULL, (setter)BaseException_args_set, NULL},
+#  define BASEEXCEPTION_ARGS_GETSETDEF {"args", NULL, BaseException_args_set, NULL},
 #endif
 
 static int
@@ -161,9 +161,9 @@ BaseException_args_set(PyObject *self, PyObject *value, void *Py_UNUSED(context)
 #endif
 #if defined(BASEEXCEPTION___TRACEBACK___GETSETDEF)
 #  undef BASEEXCEPTION___TRACEBACK___GETSETDEF
-#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", (getter)BaseException___traceback___get, (setter)BaseException___traceback___set, BaseException___traceback___DOCSTR},
+#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", BaseException___traceback___get, BaseException___traceback___set, BaseException___traceback___DOCSTR},
 #else
-#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", (getter)BaseException___traceback___get, NULL, BaseException___traceback___DOCSTR},
+#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", BaseException___traceback___get, NULL, BaseException___traceback___DOCSTR},
 #endif
 
 static PyObject *
@@ -186,9 +186,9 @@ BaseException___traceback___get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(BASEEXCEPTION___TRACEBACK___GETSETDEF)
 #  undef BASEEXCEPTION___TRACEBACK___GETSETDEF
-#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", (getter)BaseException___traceback___get, (setter)BaseException___traceback___set, BaseException___traceback___DOCSTR},
+#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", BaseException___traceback___get, BaseException___traceback___set, BaseException___traceback___DOCSTR},
 #else
-#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", NULL, (setter)BaseException___traceback___set, NULL},
+#  define BASEEXCEPTION___TRACEBACK___GETSETDEF {"__traceback__", NULL, BaseException___traceback___set, NULL},
 #endif
 
 static int
@@ -212,9 +212,9 @@ BaseException___traceback___set(PyObject *self, PyObject *value, void *Py_UNUSED
 #endif
 #if defined(BASEEXCEPTION___CONTEXT___GETSETDEF)
 #  undef BASEEXCEPTION___CONTEXT___GETSETDEF
-#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", (getter)BaseException___context___get, (setter)BaseException___context___set, BaseException___context___DOCSTR},
+#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", BaseException___context___get, BaseException___context___set, BaseException___context___DOCSTR},
 #else
-#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", (getter)BaseException___context___get, NULL, BaseException___context___DOCSTR},
+#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", BaseException___context___get, NULL, BaseException___context___DOCSTR},
 #endif
 
 static PyObject *
@@ -237,9 +237,9 @@ BaseException___context___get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(BASEEXCEPTION___CONTEXT___GETSETDEF)
 #  undef BASEEXCEPTION___CONTEXT___GETSETDEF
-#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", (getter)BaseException___context___get, (setter)BaseException___context___set, BaseException___context___DOCSTR},
+#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", BaseException___context___get, BaseException___context___set, BaseException___context___DOCSTR},
 #else
-#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", NULL, (setter)BaseException___context___set, NULL},
+#  define BASEEXCEPTION___CONTEXT___GETSETDEF {"__context__", NULL, BaseException___context___set, NULL},
 #endif
 
 static int
@@ -263,9 +263,9 @@ BaseException___context___set(PyObject *self, PyObject *value, void *Py_UNUSED(c
 #endif
 #if defined(BASEEXCEPTION___CAUSE___GETSETDEF)
 #  undef BASEEXCEPTION___CAUSE___GETSETDEF
-#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", (getter)BaseException___cause___get, (setter)BaseException___cause___set, BaseException___cause___DOCSTR},
+#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", BaseException___cause___get, BaseException___cause___set, BaseException___cause___DOCSTR},
 #else
-#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", (getter)BaseException___cause___get, NULL, BaseException___cause___DOCSTR},
+#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", BaseException___cause___get, NULL, BaseException___cause___DOCSTR},
 #endif
 
 static PyObject *
@@ -288,9 +288,9 @@ BaseException___cause___get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(BASEEXCEPTION___CAUSE___GETSETDEF)
 #  undef BASEEXCEPTION___CAUSE___GETSETDEF
-#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", (getter)BaseException___cause___get, (setter)BaseException___cause___set, BaseException___cause___DOCSTR},
+#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", BaseException___cause___get, BaseException___cause___set, BaseException___cause___DOCSTR},
 #else
-#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", NULL, (setter)BaseException___cause___set, NULL},
+#  define BASEEXCEPTION___CAUSE___GETSETDEF {"__cause__", NULL, BaseException___cause___set, NULL},
 #endif
 
 static int
@@ -315,7 +315,7 @@ PyDoc_STRVAR(BaseExceptionGroup_derive__doc__,
 "\n");
 
 #define BASEEXCEPTIONGROUP_DERIVE_METHODDEF    \
-    {"derive", (PyCFunction)BaseExceptionGroup_derive, METH_O, BaseExceptionGroup_derive__doc__},
+    {"derive", BaseExceptionGroup_derive, METH_O, BaseExceptionGroup_derive__doc__},
 
 static PyObject *
 BaseExceptionGroup_derive_impl(PyBaseExceptionGroupObject *self,
@@ -339,7 +339,7 @@ PyDoc_STRVAR(BaseExceptionGroup_split__doc__,
 "\n");
 
 #define BASEEXCEPTIONGROUP_SPLIT_METHODDEF    \
-    {"split", (PyCFunction)BaseExceptionGroup_split, METH_O, BaseExceptionGroup_split__doc__},
+    {"split", BaseExceptionGroup_split, METH_O, BaseExceptionGroup_split__doc__},
 
 static PyObject *
 BaseExceptionGroup_split_impl(PyBaseExceptionGroupObject *self,
@@ -363,7 +363,7 @@ PyDoc_STRVAR(BaseExceptionGroup_subgroup__doc__,
 "\n");
 
 #define BASEEXCEPTIONGROUP_SUBGROUP_METHODDEF    \
-    {"subgroup", (PyCFunction)BaseExceptionGroup_subgroup, METH_O, BaseExceptionGroup_subgroup__doc__},
+    {"subgroup", BaseExceptionGroup_subgroup, METH_O, BaseExceptionGroup_subgroup__doc__},
 
 static PyObject *
 BaseExceptionGroup_subgroup_impl(PyBaseExceptionGroupObject *self,
@@ -380,4 +380,4 @@ BaseExceptionGroup_subgroup(PyObject *self, PyObject *matcher_value)
 
     return return_value;
 }
-/*[clinic end generated code: output=fcf70b3b71f3d14a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b4fc96680e981485 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/floatobject.c.h b/Objects/clinic/floatobject.c.h
index 4051131f480ccb..798bc87fb320b0 100644
--- a/Objects/clinic/floatobject.c.h
+++ b/Objects/clinic/floatobject.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(float_is_integer__doc__,
 "Return True if the float is an integer.");
 
 #define FLOAT_IS_INTEGER_METHODDEF    \
-    {"is_integer", (PyCFunction)float_is_integer, METH_NOARGS, float_is_integer__doc__},
+    {"is_integer", float_is_integer, METH_NOARGS, float_is_integer__doc__},
 
 static PyObject *
 float_is_integer_impl(PyObject *self);
@@ -29,7 +29,7 @@ PyDoc_STRVAR(float___trunc____doc__,
 "Return the Integral closest to x between 0 and x.");
 
 #define FLOAT___TRUNC___METHODDEF    \
-    {"__trunc__", (PyCFunction)float___trunc__, METH_NOARGS, float___trunc____doc__},
+    {"__trunc__", float___trunc__, METH_NOARGS, float___trunc____doc__},
 
 static PyObject *
 float___trunc___impl(PyObject *self);
@@ -47,7 +47,7 @@ PyDoc_STRVAR(float___floor____doc__,
 "Return the floor as an Integral.");
 
 #define FLOAT___FLOOR___METHODDEF    \
-    {"__floor__", (PyCFunction)float___floor__, METH_NOARGS, float___floor____doc__},
+    {"__floor__", float___floor__, METH_NOARGS, float___floor____doc__},
 
 static PyObject *
 float___floor___impl(PyObject *self);
@@ -65,7 +65,7 @@ PyDoc_STRVAR(float___ceil____doc__,
 "Return the ceiling as an Integral.");
 
 #define FLOAT___CEIL___METHODDEF    \
-    {"__ceil__", (PyCFunction)float___ceil__, METH_NOARGS, float___ceil____doc__},
+    {"__ceil__", float___ceil__, METH_NOARGS, float___ceil____doc__},
 
 static PyObject *
 float___ceil___impl(PyObject *self);
@@ -117,7 +117,7 @@ PyDoc_STRVAR(float_conjugate__doc__,
 "Return self, the complex conjugate of any float.");
 
 #define FLOAT_CONJUGATE_METHODDEF    \
-    {"conjugate", (PyCFunction)float_conjugate, METH_NOARGS, float_conjugate__doc__},
+    {"conjugate", float_conjugate, METH_NOARGS, float_conjugate__doc__},
 
 static PyObject *
 float_conjugate_impl(PyObject *self);
@@ -140,7 +140,7 @@ PyDoc_STRVAR(float_hex__doc__,
 "\'0x1.921f9f01b866ep+1\'");
 
 #define FLOAT_HEX_METHODDEF    \
-    {"hex", (PyCFunction)float_hex, METH_NOARGS, float_hex__doc__},
+    {"hex", float_hex, METH_NOARGS, float_hex__doc__},
 
 static PyObject *
 float_hex_impl(PyObject *self);
@@ -163,7 +163,7 @@ PyDoc_STRVAR(float_fromhex__doc__,
 "-5e-324");
 
 #define FLOAT_FROMHEX_METHODDEF    \
-    {"fromhex", (PyCFunction)float_fromhex, METH_O|METH_CLASS, float_fromhex__doc__},
+    {"fromhex", float_fromhex, METH_O|METH_CLASS, float_fromhex__doc__},
 
 static PyObject *
 float_fromhex_impl(PyTypeObject *type, PyObject *string);
@@ -195,7 +195,7 @@ PyDoc_STRVAR(float_as_integer_ratio__doc__,
 "(-1, 4)");
 
 #define FLOAT_AS_INTEGER_RATIO_METHODDEF    \
-    {"as_integer_ratio", (PyCFunction)float_as_integer_ratio, METH_NOARGS, float_as_integer_ratio__doc__},
+    {"as_integer_ratio", float_as_integer_ratio, METH_NOARGS, float_as_integer_ratio__doc__},
 
 static PyObject *
 float_as_integer_ratio_impl(PyObject *self);
@@ -247,7 +247,7 @@ PyDoc_STRVAR(float_from_number__doc__,
 "Convert real number to a floating-point number.");
 
 #define FLOAT_FROM_NUMBER_METHODDEF    \
-    {"from_number", (PyCFunction)float_from_number, METH_O|METH_CLASS, float_from_number__doc__},
+    {"from_number", float_from_number, METH_O|METH_CLASS, float_from_number__doc__},
 
 static PyObject *
 float_from_number_impl(PyTypeObject *type, PyObject *number);
@@ -268,7 +268,7 @@ PyDoc_STRVAR(float___getnewargs____doc__,
 "\n");
 
 #define FLOAT___GETNEWARGS___METHODDEF    \
-    {"__getnewargs__", (PyCFunction)float___getnewargs__, METH_NOARGS, float___getnewargs____doc__},
+    {"__getnewargs__", float___getnewargs__, METH_NOARGS, float___getnewargs____doc__},
 
 static PyObject *
 float___getnewargs___impl(PyObject *self);
@@ -295,7 +295,7 @@ PyDoc_STRVAR(float___getformat____doc__,
 "C type named by typestr.");
 
 #define FLOAT___GETFORMAT___METHODDEF    \
-    {"__getformat__", (PyCFunction)float___getformat__, METH_O|METH_CLASS, float___getformat____doc__},
+    {"__getformat__", float___getformat__, METH_O|METH_CLASS, float___getformat____doc__},
 
 static PyObject *
 float___getformat___impl(PyTypeObject *type, const char *typestr);
@@ -332,7 +332,7 @@ PyDoc_STRVAR(float___format____doc__,
 "Formats the float according to format_spec.");
 
 #define FLOAT___FORMAT___METHODDEF    \
-    {"__format__", (PyCFunction)float___format__, METH_O, float___format____doc__},
+    {"__format__", float___format__, METH_O, float___format____doc__},
 
 static PyObject *
 float___format___impl(PyObject *self, PyObject *format_spec);
@@ -353,4 +353,4 @@ float___format__(PyObject *self, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=927035897ea3573f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=188bb8fc6137be75 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/frameobject.c.h b/Objects/clinic/frameobject.c.h
index 327896f4b97c68..d907f1979bc77b 100644
--- a/Objects/clinic/frameobject.c.h
+++ b/Objects/clinic/frameobject.c.h
@@ -16,9 +16,9 @@ PyDoc_STRVAR(frame_locals__doc__,
 #endif
 #if defined(FRAME_LOCALS_GETSETDEF)
 #  undef FRAME_LOCALS_GETSETDEF
-#  define FRAME_LOCALS_GETSETDEF {"f_locals", (getter)frame_locals_get, (setter)frame_locals_set, frame_locals_DOCSTR},
+#  define FRAME_LOCALS_GETSETDEF {"f_locals", frame_locals_get, frame_locals_set, frame_locals_DOCSTR},
 #else
-#  define FRAME_LOCALS_GETSETDEF {"f_locals", (getter)frame_locals_get, NULL, frame_locals_DOCSTR},
+#  define FRAME_LOCALS_GETSETDEF {"f_locals", frame_locals_get, NULL, frame_locals_DOCSTR},
 #endif
 
 static PyObject *
@@ -48,9 +48,9 @@ PyDoc_STRVAR(frame_lineno__doc__,
 #endif
 #if defined(FRAME_LINENO_GETSETDEF)
 #  undef FRAME_LINENO_GETSETDEF
-#  define FRAME_LINENO_GETSETDEF {"f_lineno", (getter)frame_lineno_get, (setter)frame_lineno_set, frame_lineno_DOCSTR},
+#  define FRAME_LINENO_GETSETDEF {"f_lineno", frame_lineno_get, frame_lineno_set, frame_lineno_DOCSTR},
 #else
-#  define FRAME_LINENO_GETSETDEF {"f_lineno", (getter)frame_lineno_get, NULL, frame_lineno_DOCSTR},
+#  define FRAME_LINENO_GETSETDEF {"f_lineno", frame_lineno_get, NULL, frame_lineno_DOCSTR},
 #endif
 
 static PyObject *
@@ -80,9 +80,9 @@ PyDoc_STRVAR(frame_lasti__doc__,
 #endif
 #if defined(FRAME_LASTI_GETSETDEF)
 #  undef FRAME_LASTI_GETSETDEF
-#  define FRAME_LASTI_GETSETDEF {"f_lasti", (getter)frame_lasti_get, (setter)frame_lasti_set, frame_lasti_DOCSTR},
+#  define FRAME_LASTI_GETSETDEF {"f_lasti", frame_lasti_get, frame_lasti_set, frame_lasti_DOCSTR},
 #else
-#  define FRAME_LASTI_GETSETDEF {"f_lasti", (getter)frame_lasti_get, NULL, frame_lasti_DOCSTR},
+#  define FRAME_LASTI_GETSETDEF {"f_lasti", frame_lasti_get, NULL, frame_lasti_DOCSTR},
 #endif
 
 static PyObject *
@@ -112,9 +112,9 @@ PyDoc_STRVAR(frame_globals__doc__,
 #endif
 #if defined(FRAME_GLOBALS_GETSETDEF)
 #  undef FRAME_GLOBALS_GETSETDEF
-#  define FRAME_GLOBALS_GETSETDEF {"f_globals", (getter)frame_globals_get, (setter)frame_globals_set, frame_globals_DOCSTR},
+#  define FRAME_GLOBALS_GETSETDEF {"f_globals", frame_globals_get, frame_globals_set, frame_globals_DOCSTR},
 #else
-#  define FRAME_GLOBALS_GETSETDEF {"f_globals", (getter)frame_globals_get, NULL, frame_globals_DOCSTR},
+#  define FRAME_GLOBALS_GETSETDEF {"f_globals", frame_globals_get, NULL, frame_globals_DOCSTR},
 #endif
 
 static PyObject *
@@ -144,9 +144,9 @@ PyDoc_STRVAR(frame_builtins__doc__,
 #endif
 #if defined(FRAME_BUILTINS_GETSETDEF)
 #  undef FRAME_BUILTINS_GETSETDEF
-#  define FRAME_BUILTINS_GETSETDEF {"f_builtins", (getter)frame_builtins_get, (setter)frame_builtins_set, frame_builtins_DOCSTR},
+#  define FRAME_BUILTINS_GETSETDEF {"f_builtins", frame_builtins_get, frame_builtins_set, frame_builtins_DOCSTR},
 #else
-#  define FRAME_BUILTINS_GETSETDEF {"f_builtins", (getter)frame_builtins_get, NULL, frame_builtins_DOCSTR},
+#  define FRAME_BUILTINS_GETSETDEF {"f_builtins", frame_builtins_get, NULL, frame_builtins_DOCSTR},
 #endif
 
 static PyObject *
@@ -176,9 +176,9 @@ PyDoc_STRVAR(frame_code__doc__,
 #endif
 #if defined(FRAME_CODE_GETSETDEF)
 #  undef FRAME_CODE_GETSETDEF
-#  define FRAME_CODE_GETSETDEF {"f_code", (getter)frame_code_get, (setter)frame_code_set, frame_code_DOCSTR},
+#  define FRAME_CODE_GETSETDEF {"f_code", frame_code_get, frame_code_set, frame_code_DOCSTR},
 #else
-#  define FRAME_CODE_GETSETDEF {"f_code", (getter)frame_code_get, NULL, frame_code_DOCSTR},
+#  define FRAME_CODE_GETSETDEF {"f_code", frame_code_get, NULL, frame_code_DOCSTR},
 #endif
 
 static PyObject *
@@ -195,9 +195,9 @@ frame_code_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(FRAME_BACK_GETSETDEF)
 #  undef FRAME_BACK_GETSETDEF
-#  define FRAME_BACK_GETSETDEF {"f_back", (getter)frame_back_get, (setter)frame_back_set, frame_back_DOCSTR},
+#  define FRAME_BACK_GETSETDEF {"f_back", frame_back_get, frame_back_set, frame_back_DOCSTR},
 #else
-#  define FRAME_BACK_GETSETDEF {"f_back", (getter)frame_back_get, NULL, frame_back_DOCSTR},
+#  define FRAME_BACK_GETSETDEF {"f_back", frame_back_get, NULL, frame_back_DOCSTR},
 #endif
 
 static PyObject *
@@ -227,9 +227,9 @@ PyDoc_STRVAR(frame_trace_opcodes__doc__,
 #endif
 #if defined(FRAME_TRACE_OPCODES_GETSETDEF)
 #  undef FRAME_TRACE_OPCODES_GETSETDEF
-#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", (getter)frame_trace_opcodes_get, (setter)frame_trace_opcodes_set, frame_trace_opcodes_DOCSTR},
+#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", frame_trace_opcodes_get, frame_trace_opcodes_set, frame_trace_opcodes_DOCSTR},
 #else
-#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", (getter)frame_trace_opcodes_get, NULL, frame_trace_opcodes_DOCSTR},
+#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", frame_trace_opcodes_get, NULL, frame_trace_opcodes_DOCSTR},
 #endif
 
 static PyObject *
@@ -252,9 +252,9 @@ frame_trace_opcodes_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(FRAME_TRACE_OPCODES_GETSETDEF)
 #  undef FRAME_TRACE_OPCODES_GETSETDEF
-#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", (getter)frame_trace_opcodes_get, (setter)frame_trace_opcodes_set, frame_trace_opcodes_DOCSTR},
+#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", frame_trace_opcodes_get, frame_trace_opcodes_set, frame_trace_opcodes_DOCSTR},
 #else
-#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", NULL, (setter)frame_trace_opcodes_set, NULL},
+#  define FRAME_TRACE_OPCODES_GETSETDEF {"f_trace_opcodes", NULL, frame_trace_opcodes_set, NULL},
 #endif
 
 static int
@@ -277,9 +277,9 @@ frame_trace_opcodes_set(PyObject *self, PyObject *value, void *Py_UNUSED(context
 #endif
 #if defined(FRAME_LINENO_GETSETDEF)
 #  undef FRAME_LINENO_GETSETDEF
-#  define FRAME_LINENO_GETSETDEF {"f_lineno", (getter)frame_lineno_get, (setter)frame_lineno_set, frame_lineno_DOCSTR},
+#  define FRAME_LINENO_GETSETDEF {"f_lineno", frame_lineno_get, frame_lineno_set, frame_lineno_DOCSTR},
 #else
-#  define FRAME_LINENO_GETSETDEF {"f_lineno", NULL, (setter)frame_lineno_set, NULL},
+#  define FRAME_LINENO_GETSETDEF {"f_lineno", NULL, frame_lineno_set, NULL},
 #endif
 
 static int
@@ -309,9 +309,9 @@ PyDoc_STRVAR(frame_trace__doc__,
 #endif
 #if defined(FRAME_TRACE_GETSETDEF)
 #  undef FRAME_TRACE_GETSETDEF
-#  define FRAME_TRACE_GETSETDEF {"f_trace", (getter)frame_trace_get, (setter)frame_trace_set, frame_trace_DOCSTR},
+#  define FRAME_TRACE_GETSETDEF {"f_trace", frame_trace_get, frame_trace_set, frame_trace_DOCSTR},
 #else
-#  define FRAME_TRACE_GETSETDEF {"f_trace", (getter)frame_trace_get, NULL, frame_trace_DOCSTR},
+#  define FRAME_TRACE_GETSETDEF {"f_trace", frame_trace_get, NULL, frame_trace_DOCSTR},
 #endif
 
 static PyObject *
@@ -334,9 +334,9 @@ frame_trace_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(FRAME_TRACE_GETSETDEF)
 #  undef FRAME_TRACE_GETSETDEF
-#  define FRAME_TRACE_GETSETDEF {"f_trace", (getter)frame_trace_get, (setter)frame_trace_set, frame_trace_DOCSTR},
+#  define FRAME_TRACE_GETSETDEF {"f_trace", frame_trace_get, frame_trace_set, frame_trace_DOCSTR},
 #else
-#  define FRAME_TRACE_GETSETDEF {"f_trace", NULL, (setter)frame_trace_set, NULL},
+#  define FRAME_TRACE_GETSETDEF {"f_trace", NULL, frame_trace_set, NULL},
 #endif
 
 static int
@@ -366,9 +366,9 @@ PyDoc_STRVAR(frame_generator__doc__,
 #endif
 #if defined(FRAME_GENERATOR_GETSETDEF)
 #  undef FRAME_GENERATOR_GETSETDEF
-#  define FRAME_GENERATOR_GETSETDEF {"f_generator", (getter)frame_generator_get, (setter)frame_generator_set, frame_generator_DOCSTR},
+#  define FRAME_GENERATOR_GETSETDEF {"f_generator", frame_generator_get, frame_generator_set, frame_generator_DOCSTR},
 #else
-#  define FRAME_GENERATOR_GETSETDEF {"f_generator", (getter)frame_generator_get, NULL, frame_generator_DOCSTR},
+#  define FRAME_GENERATOR_GETSETDEF {"f_generator", frame_generator_get, NULL, frame_generator_DOCSTR},
 #endif
 
 static PyObject *
@@ -393,7 +393,7 @@ PyDoc_STRVAR(frame_clear__doc__,
 "Clear all references held by the frame.");
 
 #define FRAME_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)frame_clear, METH_NOARGS, frame_clear__doc__},
+    {"clear", frame_clear, METH_NOARGS, frame_clear__doc__},
 
 static PyObject *
 frame_clear_impl(PyFrameObject *self);
@@ -417,7 +417,7 @@ PyDoc_STRVAR(frame___sizeof____doc__,
 "Return the size of the frame in memory, in bytes.");
 
 #define FRAME___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)frame___sizeof__, METH_NOARGS, frame___sizeof____doc__},
+    {"__sizeof__", frame___sizeof__, METH_NOARGS, frame___sizeof____doc__},
 
 static PyObject *
 frame___sizeof___impl(PyFrameObject *self);
@@ -433,4 +433,4 @@ frame___sizeof__(PyObject *self, PyObject *Py_UNUSED(ignored))
 
     return return_value;
 }
-/*[clinic end generated code: output=74abf652547c0c11 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e00666ac581a7f1c input=a9049054013a1b77]*/
diff --git a/Objects/clinic/funcobject.c.h b/Objects/clinic/funcobject.c.h
index fec743146466a4..cd75e6a6c18488 100644
--- a/Objects/clinic/funcobject.c.h
+++ b/Objects/clinic/funcobject.c.h
@@ -21,9 +21,9 @@ PyDoc_STRVAR(function___annotate____doc__,
 #endif
 #if defined(FUNCTION___ANNOTATE___GETSETDEF)
 #  undef FUNCTION___ANNOTATE___GETSETDEF
-#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", (getter)function___annotate___get, (setter)function___annotate___set, function___annotate___DOCSTR},
+#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", function___annotate___get, function___annotate___set, function___annotate___DOCSTR},
 #else
-#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", (getter)function___annotate___get, NULL, function___annotate___DOCSTR},
+#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", function___annotate___get, NULL, function___annotate___DOCSTR},
 #endif
 
 static PyObject *
@@ -46,9 +46,9 @@ function___annotate___get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(FUNCTION___ANNOTATE___GETSETDEF)
 #  undef FUNCTION___ANNOTATE___GETSETDEF
-#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", (getter)function___annotate___get, (setter)function___annotate___set, function___annotate___DOCSTR},
+#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", function___annotate___get, function___annotate___set, function___annotate___DOCSTR},
 #else
-#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", NULL, (setter)function___annotate___set, NULL},
+#  define FUNCTION___ANNOTATE___GETSETDEF {"__annotate__", NULL, function___annotate___set, NULL},
 #endif
 
 static int
@@ -78,9 +78,9 @@ PyDoc_STRVAR(function___annotations____doc__,
 #endif
 #if defined(FUNCTION___ANNOTATIONS___GETSETDEF)
 #  undef FUNCTION___ANNOTATIONS___GETSETDEF
-#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", (getter)function___annotations___get, (setter)function___annotations___set, function___annotations___DOCSTR},
+#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", function___annotations___get, function___annotations___set, function___annotations___DOCSTR},
 #else
-#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", (getter)function___annotations___get, NULL, function___annotations___DOCSTR},
+#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", function___annotations___get, NULL, function___annotations___DOCSTR},
 #endif
 
 static PyObject *
@@ -103,9 +103,9 @@ function___annotations___get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(FUNCTION___ANNOTATIONS___GETSETDEF)
 #  undef FUNCTION___ANNOTATIONS___GETSETDEF
-#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", (getter)function___annotations___get, (setter)function___annotations___set, function___annotations___DOCSTR},
+#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", function___annotations___get, function___annotations___set, function___annotations___DOCSTR},
 #else
-#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", NULL, (setter)function___annotations___set, NULL},
+#  define FUNCTION___ANNOTATIONS___GETSETDEF {"__annotations__", NULL, function___annotations___set, NULL},
 #endif
 
 static int
@@ -135,9 +135,9 @@ PyDoc_STRVAR(function___type_params____doc__,
 #endif
 #if defined(FUNCTION___TYPE_PARAMS___GETSETDEF)
 #  undef FUNCTION___TYPE_PARAMS___GETSETDEF
-#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", (getter)function___type_params___get, (setter)function___type_params___set, function___type_params___DOCSTR},
+#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", function___type_params___get, function___type_params___set, function___type_params___DOCSTR},
 #else
-#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", (getter)function___type_params___get, NULL, function___type_params___DOCSTR},
+#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", function___type_params___get, NULL, function___type_params___DOCSTR},
 #endif
 
 static PyObject *
@@ -160,9 +160,9 @@ function___type_params___get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(FUNCTION___TYPE_PARAMS___GETSETDEF)
 #  undef FUNCTION___TYPE_PARAMS___GETSETDEF
-#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", (getter)function___type_params___get, (setter)function___type_params___set, function___type_params___DOCSTR},
+#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", function___type_params___get, function___type_params___set, function___type_params___DOCSTR},
 #else
-#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", NULL, (setter)function___type_params___set, NULL},
+#  define FUNCTION___TYPE_PARAMS___GETSETDEF {"__type_params__", NULL, function___type_params___set, NULL},
 #endif
 
 static int
@@ -290,4 +290,4 @@ func_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=12cb900088d41bdb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=20e59c23a5fc5ff2 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/listobject.c.h b/Objects/clinic/listobject.c.h
index 26ba5b954336da..74961f0c4c8247 100644
--- a/Objects/clinic/listobject.c.h
+++ b/Objects/clinic/listobject.c.h
@@ -60,7 +60,7 @@ PyDoc_STRVAR(py_list_clear__doc__,
 "Remove all items from list.");
 
 #define PY_LIST_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)py_list_clear, METH_NOARGS, py_list_clear__doc__},
+    {"clear", py_list_clear, METH_NOARGS, py_list_clear__doc__},
 
 static PyObject *
 py_list_clear_impl(PyListObject *self);
@@ -84,7 +84,7 @@ PyDoc_STRVAR(list_copy__doc__,
 "Return a shallow copy of the list.");
 
 #define LIST_COPY_METHODDEF    \
-    {"copy", (PyCFunction)list_copy, METH_NOARGS, list_copy__doc__},
+    {"copy", list_copy, METH_NOARGS, list_copy__doc__},
 
 static PyObject *
 list_copy_impl(PyListObject *self);
@@ -108,7 +108,7 @@ PyDoc_STRVAR(list_append__doc__,
 "Append object to the end of the list.");
 
 #define LIST_APPEND_METHODDEF    \
-    {"append", (PyCFunction)list_append, METH_O, list_append__doc__},
+    {"append", list_append, METH_O, list_append__doc__},
 
 static PyObject *
 list_append_impl(PyListObject *self, PyObject *object);
@@ -132,7 +132,7 @@ PyDoc_STRVAR(list_extend__doc__,
 "Extend list by appending elements from the iterable.");
 
 #define LIST_EXTEND_METHODDEF    \
-    {"extend", (PyCFunction)list_extend, METH_O, list_extend__doc__},
+    {"extend", list_extend, METH_O, list_extend__doc__},
 
 static PyObject *
 list_extend_impl(PyListObject *self, PyObject *iterable);
@@ -284,7 +284,7 @@ PyDoc_STRVAR(list_reverse__doc__,
 "Reverse *IN PLACE*.");
 
 #define LIST_REVERSE_METHODDEF    \
-    {"reverse", (PyCFunction)list_reverse, METH_NOARGS, list_reverse__doc__},
+    {"reverse", list_reverse, METH_NOARGS, list_reverse__doc__},
 
 static PyObject *
 list_reverse_impl(PyListObject *self);
@@ -354,7 +354,7 @@ PyDoc_STRVAR(list_count__doc__,
 "Return number of occurrences of value.");
 
 #define LIST_COUNT_METHODDEF    \
-    {"count", (PyCFunction)list_count, METH_O, list_count__doc__},
+    {"count", list_count, METH_O, list_count__doc__},
 
 static PyObject *
 list_count_impl(PyListObject *self, PyObject *value);
@@ -378,7 +378,7 @@ PyDoc_STRVAR(list_remove__doc__,
 "Raises ValueError if the value is not present.");
 
 #define LIST_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)list_remove, METH_O, list_remove__doc__},
+    {"remove", list_remove, METH_O, list_remove__doc__},
 
 static PyObject *
 list_remove_impl(PyListObject *self, PyObject *value);
@@ -440,7 +440,7 @@ PyDoc_STRVAR(list___sizeof____doc__,
 "Return the size of the list in memory, in bytes.");
 
 #define LIST___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)list___sizeof__, METH_NOARGS, list___sizeof____doc__},
+    {"__sizeof__", list___sizeof__, METH_NOARGS, list___sizeof____doc__},
 
 static PyObject *
 list___sizeof___impl(PyListObject *self);
@@ -458,7 +458,7 @@ PyDoc_STRVAR(list___reversed____doc__,
 "Return a reverse iterator over the list.");
 
 #define LIST___REVERSED___METHODDEF    \
-    {"__reversed__", (PyCFunction)list___reversed__, METH_NOARGS, list___reversed____doc__},
+    {"__reversed__", list___reversed__, METH_NOARGS, list___reversed____doc__},
 
 static PyObject *
 list___reversed___impl(PyListObject *self);
@@ -468,4 +468,4 @@ list___reversed__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return list___reversed___impl((PyListObject *)self);
 }
-/*[clinic end generated code: output=ae13fc2b56dc27c2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=87b1dc8ff9fdc019 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/longobject.c.h b/Objects/clinic/longobject.c.h
index a236a32c091c4c..88f53b7fb85064 100644
--- a/Objects/clinic/longobject.c.h
+++ b/Objects/clinic/longobject.c.h
@@ -78,7 +78,7 @@ PyDoc_STRVAR(int___getnewargs____doc__,
 "\n");
 
 #define INT___GETNEWARGS___METHODDEF    \
-    {"__getnewargs__", (PyCFunction)int___getnewargs__, METH_NOARGS, int___getnewargs____doc__},
+    {"__getnewargs__", int___getnewargs__, METH_NOARGS, int___getnewargs____doc__},
 
 static PyObject *
 int___getnewargs___impl(PyObject *self);
@@ -96,7 +96,7 @@ PyDoc_STRVAR(int___format____doc__,
 "Convert to a string according to format_spec.");
 
 #define INT___FORMAT___METHODDEF    \
-    {"__format__", (PyCFunction)int___format__, METH_O, int___format____doc__},
+    {"__format__", int___format__, METH_O, int___format____doc__},
 
 static PyObject *
 int___format___impl(PyObject *self, PyObject *format_spec);
@@ -159,7 +159,7 @@ PyDoc_STRVAR(int___sizeof____doc__,
 "Returns size in memory, in bytes.");
 
 #define INT___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)int___sizeof__, METH_NOARGS, int___sizeof____doc__},
+    {"__sizeof__", int___sizeof__, METH_NOARGS, int___sizeof____doc__},
 
 static Py_ssize_t
 int___sizeof___impl(PyObject *self);
@@ -192,7 +192,7 @@ PyDoc_STRVAR(int_bit_length__doc__,
 "6");
 
 #define INT_BIT_LENGTH_METHODDEF    \
-    {"bit_length", (PyCFunction)int_bit_length, METH_NOARGS, int_bit_length__doc__},
+    {"bit_length", int_bit_length, METH_NOARGS, int_bit_length__doc__},
 
 static PyObject *
 int_bit_length_impl(PyObject *self);
@@ -217,7 +217,7 @@ PyDoc_STRVAR(int_bit_count__doc__,
 "3");
 
 #define INT_BIT_COUNT_METHODDEF    \
-    {"bit_count", (PyCFunction)int_bit_count, METH_NOARGS, int_bit_count__doc__},
+    {"bit_count", int_bit_count, METH_NOARGS, int_bit_count__doc__},
 
 static PyObject *
 int_bit_count_impl(PyObject *self);
@@ -244,7 +244,7 @@ PyDoc_STRVAR(int_as_integer_ratio__doc__,
 "(0, 1)");
 
 #define INT_AS_INTEGER_RATIO_METHODDEF    \
-    {"as_integer_ratio", (PyCFunction)int_as_integer_ratio, METH_NOARGS, int_as_integer_ratio__doc__},
+    {"as_integer_ratio", int_as_integer_ratio, METH_NOARGS, int_as_integer_ratio__doc__},
 
 static PyObject *
 int_as_integer_ratio_impl(PyObject *self);
@@ -475,7 +475,7 @@ PyDoc_STRVAR(int_is_integer__doc__,
 "Returns True. Exists for duck type compatibility with float.is_integer.");
 
 #define INT_IS_INTEGER_METHODDEF    \
-    {"is_integer", (PyCFunction)int_is_integer, METH_NOARGS, int_is_integer__doc__},
+    {"is_integer", int_is_integer, METH_NOARGS, int_is_integer__doc__},
 
 static PyObject *
 int_is_integer_impl(PyObject *self);
@@ -485,4 +485,4 @@ int_is_integer(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return int_is_integer_impl(self);
 }
-/*[clinic end generated code: output=d23f8ce5bdf08a30 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=078b23fd35b27690 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/memoryobject.c.h b/Objects/clinic/memoryobject.c.h
index 28cfd1a22080c9..eaacfef3f8774b 100644
--- a/Objects/clinic/memoryobject.c.h
+++ b/Objects/clinic/memoryobject.c.h
@@ -135,7 +135,7 @@ PyDoc_STRVAR(memoryview_release__doc__,
 "Release the underlying buffer exposed by the memoryview object.");
 
 #define MEMORYVIEW_RELEASE_METHODDEF    \
-    {"release", (PyCFunction)memoryview_release, METH_NOARGS, memoryview_release__doc__},
+    {"release", memoryview_release, METH_NOARGS, memoryview_release__doc__},
 
 static PyObject *
 memoryview_release_impl(PyMemoryViewObject *self);
@@ -223,7 +223,7 @@ PyDoc_STRVAR(memoryview_toreadonly__doc__,
 "Return a readonly version of the memoryview.");
 
 #define MEMORYVIEW_TOREADONLY_METHODDEF    \
-    {"toreadonly", (PyCFunction)memoryview_toreadonly, METH_NOARGS, memoryview_toreadonly__doc__},
+    {"toreadonly", memoryview_toreadonly, METH_NOARGS, memoryview_toreadonly__doc__},
 
 static PyObject *
 memoryview_toreadonly_impl(PyMemoryViewObject *self);
@@ -241,7 +241,7 @@ PyDoc_STRVAR(memoryview_tolist__doc__,
 "Return the data in the buffer as a list of elements.");
 
 #define MEMORYVIEW_TOLIST_METHODDEF    \
-    {"tolist", (PyCFunction)memoryview_tolist, METH_NOARGS, memoryview_tolist__doc__},
+    {"tolist", memoryview_tolist, METH_NOARGS, memoryview_tolist__doc__},
 
 static PyObject *
 memoryview_tolist_impl(PyMemoryViewObject *self);
@@ -436,7 +436,7 @@ PyDoc_STRVAR(memoryview_count__doc__,
 "Count the number of occurrences of a value.");
 
 #define MEMORYVIEW_COUNT_METHODDEF    \
-    {"count", (PyCFunction)memoryview_count, METH_O, memoryview_count__doc__},
+    {"count", memoryview_count, METH_O, memoryview_count__doc__},
 
 static PyObject *
 memoryview_count_impl(PyMemoryViewObject *self, PyObject *value);
@@ -496,4 +496,4 @@ memoryview_index(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=154f4c04263ccb24 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fd9cc29b1053ecf7 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/setobject.c.h b/Objects/clinic/setobject.c.h
index 96c70d0ae95a46..fdc7a8a6c50b73 100644
--- a/Objects/clinic/setobject.c.h
+++ b/Objects/clinic/setobject.c.h
@@ -13,7 +13,7 @@ PyDoc_STRVAR(set_pop__doc__,
 "Raises KeyError if the set is empty.");
 
 #define SET_POP_METHODDEF    \
-    {"pop", (PyCFunction)set_pop, METH_NOARGS, set_pop__doc__},
+    {"pop", set_pop, METH_NOARGS, set_pop__doc__},
 
 static PyObject *
 set_pop_impl(PySetObject *so);
@@ -64,7 +64,7 @@ PyDoc_STRVAR(set_copy__doc__,
 "Return a shallow copy of a set.");
 
 #define SET_COPY_METHODDEF    \
-    {"copy", (PyCFunction)set_copy, METH_NOARGS, set_copy__doc__},
+    {"copy", set_copy, METH_NOARGS, set_copy__doc__},
 
 static PyObject *
 set_copy_impl(PySetObject *so);
@@ -88,7 +88,7 @@ PyDoc_STRVAR(frozenset_copy__doc__,
 "Return a shallow copy of a set.");
 
 #define FROZENSET_COPY_METHODDEF    \
-    {"copy", (PyCFunction)frozenset_copy, METH_NOARGS, frozenset_copy__doc__},
+    {"copy", frozenset_copy, METH_NOARGS, frozenset_copy__doc__},
 
 static PyObject *
 frozenset_copy_impl(PySetObject *so);
@@ -112,7 +112,7 @@ PyDoc_STRVAR(set_clear__doc__,
 "Remove all elements from this set.");
 
 #define SET_CLEAR_METHODDEF    \
-    {"clear", (PyCFunction)set_clear, METH_NOARGS, set_clear__doc__},
+    {"clear", set_clear, METH_NOARGS, set_clear__doc__},
 
 static PyObject *
 set_clear_impl(PySetObject *so);
@@ -217,7 +217,7 @@ PyDoc_STRVAR(set_isdisjoint__doc__,
 "Return True if two sets have a null intersection.");
 
 #define SET_ISDISJOINT_METHODDEF    \
-    {"isdisjoint", (PyCFunction)set_isdisjoint, METH_O, set_isdisjoint__doc__},
+    {"isdisjoint", set_isdisjoint, METH_O, set_isdisjoint__doc__},
 
 static PyObject *
 set_isdisjoint_impl(PySetObject *so, PyObject *other);
@@ -295,7 +295,7 @@ PyDoc_STRVAR(set_symmetric_difference_update__doc__,
 "Update the set, keeping only elements found in either set, but not in both.");
 
 #define SET_SYMMETRIC_DIFFERENCE_UPDATE_METHODDEF    \
-    {"symmetric_difference_update", (PyCFunction)set_symmetric_difference_update, METH_O, set_symmetric_difference_update__doc__},
+    {"symmetric_difference_update", set_symmetric_difference_update, METH_O, set_symmetric_difference_update__doc__},
 
 static PyObject *
 set_symmetric_difference_update_impl(PySetObject *so, PyObject *other);
@@ -317,7 +317,7 @@ PyDoc_STRVAR(set_symmetric_difference__doc__,
 "Return a new set with elements in either the set or other but not both.");
 
 #define SET_SYMMETRIC_DIFFERENCE_METHODDEF    \
-    {"symmetric_difference", (PyCFunction)set_symmetric_difference, METH_O, set_symmetric_difference__doc__},
+    {"symmetric_difference", set_symmetric_difference, METH_O, set_symmetric_difference__doc__},
 
 static PyObject *
 set_symmetric_difference_impl(PySetObject *so, PyObject *other);
@@ -341,7 +341,7 @@ PyDoc_STRVAR(set_issubset__doc__,
 "Report whether another set contains this set.");
 
 #define SET_ISSUBSET_METHODDEF    \
-    {"issubset", (PyCFunction)set_issubset, METH_O, set_issubset__doc__},
+    {"issubset", set_issubset, METH_O, set_issubset__doc__},
 
 static PyObject *
 set_issubset_impl(PySetObject *so, PyObject *other);
@@ -365,7 +365,7 @@ PyDoc_STRVAR(set_issuperset__doc__,
 "Report whether this set contains another set.");
 
 #define SET_ISSUPERSET_METHODDEF    \
-    {"issuperset", (PyCFunction)set_issuperset, METH_O, set_issuperset__doc__},
+    {"issuperset", set_issuperset, METH_O, set_issuperset__doc__},
 
 static PyObject *
 set_issuperset_impl(PySetObject *so, PyObject *other);
@@ -391,7 +391,7 @@ PyDoc_STRVAR(set_add__doc__,
 "This has no effect if the element is already present.");
 
 #define SET_ADD_METHODDEF    \
-    {"add", (PyCFunction)set_add, METH_O, set_add__doc__},
+    {"add", set_add, METH_O, set_add__doc__},
 
 static PyObject *
 set_add_impl(PySetObject *so, PyObject *key);
@@ -415,7 +415,7 @@ PyDoc_STRVAR(set___contains____doc__,
 "x.__contains__(y) <==> y in x.");
 
 #define SET___CONTAINS___METHODDEF    \
-    {"__contains__", (PyCFunction)set___contains__, METH_O|METH_COEXIST, set___contains____doc__},
+    {"__contains__", set___contains__, METH_O|METH_COEXIST, set___contains____doc__},
 
 static PyObject *
 set___contains___impl(PySetObject *so, PyObject *key);
@@ -441,7 +441,7 @@ PyDoc_STRVAR(set_remove__doc__,
 "If the element is not a member, raise a KeyError.");
 
 #define SET_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)set_remove, METH_O, set_remove__doc__},
+    {"remove", set_remove, METH_O, set_remove__doc__},
 
 static PyObject *
 set_remove_impl(PySetObject *so, PyObject *key);
@@ -468,7 +468,7 @@ PyDoc_STRVAR(set_discard__doc__,
 "an exception when an element is missing from the set.");
 
 #define SET_DISCARD_METHODDEF    \
-    {"discard", (PyCFunction)set_discard, METH_O, set_discard__doc__},
+    {"discard", set_discard, METH_O, set_discard__doc__},
 
 static PyObject *
 set_discard_impl(PySetObject *so, PyObject *key);
@@ -492,7 +492,7 @@ PyDoc_STRVAR(set___reduce____doc__,
 "Return state information for pickling.");
 
 #define SET___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)set___reduce__, METH_NOARGS, set___reduce____doc__},
+    {"__reduce__", set___reduce__, METH_NOARGS, set___reduce____doc__},
 
 static PyObject *
 set___reduce___impl(PySetObject *so);
@@ -516,7 +516,7 @@ PyDoc_STRVAR(set___sizeof____doc__,
 "S.__sizeof__() -> size of S in memory, in bytes.");
 
 #define SET___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)set___sizeof__, METH_NOARGS, set___sizeof____doc__},
+    {"__sizeof__", set___sizeof__, METH_NOARGS, set___sizeof____doc__},
 
 static PyObject *
 set___sizeof___impl(PySetObject *so);
@@ -532,4 +532,4 @@ set___sizeof__(PyObject *so, PyObject *Py_UNUSED(ignored))
 
     return return_value;
 }
-/*[clinic end generated code: output=e2f1470de062d661 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=222f962570251614 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/tupleobject.c.h b/Objects/clinic/tupleobject.c.h
index 1c12706c0bb43b..b71f3d3711673f 100644
--- a/Objects/clinic/tupleobject.c.h
+++ b/Objects/clinic/tupleobject.c.h
@@ -57,7 +57,7 @@ PyDoc_STRVAR(tuple_count__doc__,
 "Return number of occurrences of value.");
 
 #define TUPLE_COUNT_METHODDEF    \
-    {"count", (PyCFunction)tuple_count, METH_O, tuple_count__doc__},
+    {"count", tuple_count, METH_O, tuple_count__doc__},
 
 static PyObject *
 tuple_count_impl(PyTupleObject *self, PyObject *value);
@@ -117,7 +117,7 @@ PyDoc_STRVAR(tuple___getnewargs____doc__,
 "\n");
 
 #define TUPLE___GETNEWARGS___METHODDEF    \
-    {"__getnewargs__", (PyCFunction)tuple___getnewargs__, METH_NOARGS, tuple___getnewargs____doc__},
+    {"__getnewargs__", tuple___getnewargs__, METH_NOARGS, tuple___getnewargs____doc__},
 
 static PyObject *
 tuple___getnewargs___impl(PyTupleObject *self);
@@ -127,4 +127,4 @@ tuple___getnewargs__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return tuple___getnewargs___impl((PyTupleObject *)self);
 }
-/*[clinic end generated code: output=bd11662d62d973c2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8345867f523906f3 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/typeobject.c.h b/Objects/clinic/typeobject.c.h
index 24a25f27ea3cc3..0ed4fca818755f 100644
--- a/Objects/clinic/typeobject.c.h
+++ b/Objects/clinic/typeobject.c.h
@@ -11,7 +11,7 @@ PyDoc_STRVAR(type___instancecheck____doc__,
 "Check if an object is an instance.");
 
 #define TYPE___INSTANCECHECK___METHODDEF    \
-    {"__instancecheck__", (PyCFunction)type___instancecheck__, METH_O, type___instancecheck____doc__},
+    {"__instancecheck__", type___instancecheck__, METH_O, type___instancecheck____doc__},
 
 static int
 type___instancecheck___impl(PyTypeObject *self, PyObject *instance);
@@ -39,7 +39,7 @@ PyDoc_STRVAR(type___subclasscheck____doc__,
 "Check if a class is a subclass.");
 
 #define TYPE___SUBCLASSCHECK___METHODDEF    \
-    {"__subclasscheck__", (PyCFunction)type___subclasscheck__, METH_O, type___subclasscheck____doc__},
+    {"__subclasscheck__", type___subclasscheck__, METH_O, type___subclasscheck____doc__},
 
 static int
 type___subclasscheck___impl(PyTypeObject *self, PyObject *subclass);
@@ -67,7 +67,7 @@ PyDoc_STRVAR(type_mro__doc__,
 "Return a type\'s method resolution order.");
 
 #define TYPE_MRO_METHODDEF    \
-    {"mro", (PyCFunction)type_mro, METH_NOARGS, type_mro__doc__},
+    {"mro", type_mro, METH_NOARGS, type_mro__doc__},
 
 static PyObject *
 type_mro_impl(PyTypeObject *self);
@@ -85,7 +85,7 @@ PyDoc_STRVAR(type___subclasses____doc__,
 "Return a list of immediate subclasses.");
 
 #define TYPE___SUBCLASSES___METHODDEF    \
-    {"__subclasses__", (PyCFunction)type___subclasses__, METH_NOARGS, type___subclasses____doc__},
+    {"__subclasses__", type___subclasses__, METH_NOARGS, type___subclasses____doc__},
 
 static PyObject *
 type___subclasses___impl(PyTypeObject *self);
@@ -103,7 +103,7 @@ PyDoc_STRVAR(type___dir____doc__,
 "Specialized __dir__ implementation for types.");
 
 #define TYPE___DIR___METHODDEF    \
-    {"__dir__", (PyCFunction)type___dir__, METH_NOARGS, type___dir____doc__},
+    {"__dir__", type___dir__, METH_NOARGS, type___dir____doc__},
 
 static PyObject *
 type___dir___impl(PyTypeObject *self);
@@ -121,7 +121,7 @@ PyDoc_STRVAR(type___sizeof____doc__,
 "Return memory consumption of the type object.");
 
 #define TYPE___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)type___sizeof__, METH_NOARGS, type___sizeof____doc__},
+    {"__sizeof__", type___sizeof__, METH_NOARGS, type___sizeof____doc__},
 
 static PyObject *
 type___sizeof___impl(PyTypeObject *self);
@@ -139,7 +139,7 @@ PyDoc_STRVAR(object___getstate____doc__,
 "Helper for pickle.");
 
 #define OBJECT___GETSTATE___METHODDEF    \
-    {"__getstate__", (PyCFunction)object___getstate__, METH_NOARGS, object___getstate____doc__},
+    {"__getstate__", object___getstate__, METH_NOARGS, object___getstate____doc__},
 
 static PyObject *
 object___getstate___impl(PyObject *self);
@@ -157,7 +157,7 @@ PyDoc_STRVAR(object___reduce____doc__,
 "Helper for pickle.");
 
 #define OBJECT___REDUCE___METHODDEF    \
-    {"__reduce__", (PyCFunction)object___reduce__, METH_NOARGS, object___reduce____doc__},
+    {"__reduce__", object___reduce__, METH_NOARGS, object___reduce____doc__},
 
 static PyObject *
 object___reduce___impl(PyObject *self);
@@ -175,7 +175,7 @@ PyDoc_STRVAR(object___reduce_ex____doc__,
 "Helper for pickle.");
 
 #define OBJECT___REDUCE_EX___METHODDEF    \
-    {"__reduce_ex__", (PyCFunction)object___reduce_ex__, METH_O, object___reduce_ex____doc__},
+    {"__reduce_ex__", object___reduce_ex__, METH_O, object___reduce_ex____doc__},
 
 static PyObject *
 object___reduce_ex___impl(PyObject *self, int protocol);
@@ -205,7 +205,7 @@ PyDoc_STRVAR(object___format____doc__,
 "Return str(self) if format_spec is empty. Raise TypeError otherwise.");
 
 #define OBJECT___FORMAT___METHODDEF    \
-    {"__format__", (PyCFunction)object___format__, METH_O, object___format____doc__},
+    {"__format__", object___format__, METH_O, object___format____doc__},
 
 static PyObject *
 object___format___impl(PyObject *self, PyObject *format_spec);
@@ -234,7 +234,7 @@ PyDoc_STRVAR(object___sizeof____doc__,
 "Size of object in memory, in bytes.");
 
 #define OBJECT___SIZEOF___METHODDEF    \
-    {"__sizeof__", (PyCFunction)object___sizeof__, METH_NOARGS, object___sizeof____doc__},
+    {"__sizeof__", object___sizeof__, METH_NOARGS, object___sizeof____doc__},
 
 static PyObject *
 object___sizeof___impl(PyObject *self);
@@ -252,7 +252,7 @@ PyDoc_STRVAR(object___dir____doc__,
 "Default dir() implementation.");
 
 #define OBJECT___DIR___METHODDEF    \
-    {"__dir__", (PyCFunction)object___dir__, METH_NOARGS, object___dir____doc__},
+    {"__dir__", object___dir__, METH_NOARGS, object___dir____doc__},
 
 static PyObject *
 object___dir___impl(PyObject *self);
@@ -262,4 +262,4 @@ object___dir__(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     return object___dir___impl(self);
 }
-/*[clinic end generated code: output=b55c0d257e2518d2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=731c0d5d3f99d593 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/typevarobject.c.h b/Objects/clinic/typevarobject.c.h
index 9ae2f51f758403..10175c072dc4fc 100644
--- a/Objects/clinic/typevarobject.c.h
+++ b/Objects/clinic/typevarobject.c.h
@@ -130,7 +130,7 @@ PyDoc_STRVAR(typevar_typing_subst__doc__,
 "\n");
 
 #define TYPEVAR_TYPING_SUBST_METHODDEF    \
-    {"__typing_subst__", (PyCFunction)typevar_typing_subst, METH_O, typevar_typing_subst__doc__},
+    {"__typing_subst__", typevar_typing_subst, METH_O, typevar_typing_subst__doc__},
 
 static PyObject *
 typevar_typing_subst_impl(typevarobject *self, PyObject *arg);
@@ -181,7 +181,7 @@ PyDoc_STRVAR(typevar_reduce__doc__,
 "\n");
 
 #define TYPEVAR_REDUCE_METHODDEF    \
-    {"__reduce__", (PyCFunction)typevar_reduce, METH_NOARGS, typevar_reduce__doc__},
+    {"__reduce__", typevar_reduce, METH_NOARGS, typevar_reduce__doc__},
 
 static PyObject *
 typevar_reduce_impl(typevarobject *self);
@@ -198,7 +198,7 @@ PyDoc_STRVAR(typevar_has_default__doc__,
 "\n");
 
 #define TYPEVAR_HAS_DEFAULT_METHODDEF    \
-    {"has_default", (PyCFunction)typevar_has_default, METH_NOARGS, typevar_has_default__doc__},
+    {"has_default", typevar_has_default, METH_NOARGS, typevar_has_default__doc__},
 
 static PyObject *
 typevar_has_default_impl(typevarobject *self);
@@ -437,7 +437,7 @@ PyDoc_STRVAR(paramspec_typing_subst__doc__,
 "\n");
 
 #define PARAMSPEC_TYPING_SUBST_METHODDEF    \
-    {"__typing_subst__", (PyCFunction)paramspec_typing_subst, METH_O, paramspec_typing_subst__doc__},
+    {"__typing_subst__", paramspec_typing_subst, METH_O, paramspec_typing_subst__doc__},
 
 static PyObject *
 paramspec_typing_subst_impl(paramspecobject *self, PyObject *arg);
@@ -488,7 +488,7 @@ PyDoc_STRVAR(paramspec_reduce__doc__,
 "\n");
 
 #define PARAMSPEC_REDUCE_METHODDEF    \
-    {"__reduce__", (PyCFunction)paramspec_reduce, METH_NOARGS, paramspec_reduce__doc__},
+    {"__reduce__", paramspec_reduce, METH_NOARGS, paramspec_reduce__doc__},
 
 static PyObject *
 paramspec_reduce_impl(paramspecobject *self);
@@ -505,7 +505,7 @@ PyDoc_STRVAR(paramspec_has_default__doc__,
 "\n");
 
 #define PARAMSPEC_HAS_DEFAULT_METHODDEF    \
-    {"has_default", (PyCFunction)paramspec_has_default, METH_NOARGS, paramspec_has_default__doc__},
+    {"has_default", paramspec_has_default, METH_NOARGS, paramspec_has_default__doc__},
 
 static PyObject *
 paramspec_has_default_impl(paramspecobject *self);
@@ -591,7 +591,7 @@ PyDoc_STRVAR(typevartuple_typing_subst__doc__,
 "\n");
 
 #define TYPEVARTUPLE_TYPING_SUBST_METHODDEF    \
-    {"__typing_subst__", (PyCFunction)typevartuple_typing_subst, METH_O, typevartuple_typing_subst__doc__},
+    {"__typing_subst__", typevartuple_typing_subst, METH_O, typevartuple_typing_subst__doc__},
 
 static PyObject *
 typevartuple_typing_subst_impl(typevartupleobject *self, PyObject *arg);
@@ -642,7 +642,7 @@ PyDoc_STRVAR(typevartuple_reduce__doc__,
 "\n");
 
 #define TYPEVARTUPLE_REDUCE_METHODDEF    \
-    {"__reduce__", (PyCFunction)typevartuple_reduce, METH_NOARGS, typevartuple_reduce__doc__},
+    {"__reduce__", typevartuple_reduce, METH_NOARGS, typevartuple_reduce__doc__},
 
 static PyObject *
 typevartuple_reduce_impl(typevartupleobject *self);
@@ -659,7 +659,7 @@ PyDoc_STRVAR(typevartuple_has_default__doc__,
 "\n");
 
 #define TYPEVARTUPLE_HAS_DEFAULT_METHODDEF    \
-    {"has_default", (PyCFunction)typevartuple_has_default, METH_NOARGS, typevartuple_has_default__doc__},
+    {"has_default", typevartuple_has_default, METH_NOARGS, typevartuple_has_default__doc__},
 
 static PyObject *
 typevartuple_has_default_impl(typevartupleobject *self);
@@ -676,7 +676,7 @@ PyDoc_STRVAR(typealias_reduce__doc__,
 "\n");
 
 #define TYPEALIAS_REDUCE_METHODDEF    \
-    {"__reduce__", (PyCFunction)typealias_reduce, METH_NOARGS, typealias_reduce__doc__},
+    {"__reduce__", typealias_reduce, METH_NOARGS, typealias_reduce__doc__},
 
 static PyObject *
 typealias_reduce_impl(typealiasobject *self);
@@ -757,4 +757,4 @@ typealias_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=9dad71445e079303 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ec488fe21dd2dfa9 input=a9049054013a1b77]*/
diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h
index 1819fbaea220a3..6da29599f76711 100644
--- a/Objects/clinic/unicodeobject.c.h
+++ b/Objects/clinic/unicodeobject.c.h
@@ -16,7 +16,7 @@ PyDoc_STRVAR(EncodingMap_size__doc__,
 "Return the size (in bytes) of this object.");
 
 #define ENCODINGMAP_SIZE_METHODDEF    \
-    {"size", (PyCFunction)EncodingMap_size, METH_NOARGS, EncodingMap_size__doc__},
+    {"size", EncodingMap_size, METH_NOARGS, EncodingMap_size__doc__},
 
 static PyObject *
 EncodingMap_size_impl(struct encoding_map *self);
@@ -37,7 +37,7 @@ PyDoc_STRVAR(unicode_title__doc__,
 "cased characters have lower case.");
 
 #define UNICODE_TITLE_METHODDEF    \
-    {"title", (PyCFunction)unicode_title, METH_NOARGS, unicode_title__doc__},
+    {"title", unicode_title, METH_NOARGS, unicode_title__doc__},
 
 static PyObject *
 unicode_title_impl(PyObject *self);
@@ -58,7 +58,7 @@ PyDoc_STRVAR(unicode_capitalize__doc__,
 "case.");
 
 #define UNICODE_CAPITALIZE_METHODDEF    \
-    {"capitalize", (PyCFunction)unicode_capitalize, METH_NOARGS, unicode_capitalize__doc__},
+    {"capitalize", unicode_capitalize, METH_NOARGS, unicode_capitalize__doc__},
 
 static PyObject *
 unicode_capitalize_impl(PyObject *self);
@@ -76,7 +76,7 @@ PyDoc_STRVAR(unicode_casefold__doc__,
 "Return a version of the string suitable for caseless comparisons.");
 
 #define UNICODE_CASEFOLD_METHODDEF    \
-    {"casefold", (PyCFunction)unicode_casefold, METH_NOARGS, unicode_casefold__doc__},
+    {"casefold", unicode_casefold, METH_NOARGS, unicode_casefold__doc__},
 
 static PyObject *
 unicode_casefold_impl(PyObject *self);
@@ -484,7 +484,7 @@ PyDoc_STRVAR(unicode_isascii__doc__,
 "Empty string is ASCII too.");
 
 #define UNICODE_ISASCII_METHODDEF    \
-    {"isascii", (PyCFunction)unicode_isascii, METH_NOARGS, unicode_isascii__doc__},
+    {"isascii", unicode_isascii, METH_NOARGS, unicode_isascii__doc__},
 
 static PyObject *
 unicode_isascii_impl(PyObject *self);
@@ -505,7 +505,7 @@ PyDoc_STRVAR(unicode_islower__doc__,
 "there is at least one cased character in the string.");
 
 #define UNICODE_ISLOWER_METHODDEF    \
-    {"islower", (PyCFunction)unicode_islower, METH_NOARGS, unicode_islower__doc__},
+    {"islower", unicode_islower, METH_NOARGS, unicode_islower__doc__},
 
 static PyObject *
 unicode_islower_impl(PyObject *self);
@@ -526,7 +526,7 @@ PyDoc_STRVAR(unicode_isupper__doc__,
 "there is at least one cased character in the string.");
 
 #define UNICODE_ISUPPER_METHODDEF    \
-    {"isupper", (PyCFunction)unicode_isupper, METH_NOARGS, unicode_isupper__doc__},
+    {"isupper", unicode_isupper, METH_NOARGS, unicode_isupper__doc__},
 
 static PyObject *
 unicode_isupper_impl(PyObject *self);
@@ -547,7 +547,7 @@ PyDoc_STRVAR(unicode_istitle__doc__,
 "follow uncased characters and lowercase characters only cased ones.");
 
 #define UNICODE_ISTITLE_METHODDEF    \
-    {"istitle", (PyCFunction)unicode_istitle, METH_NOARGS, unicode_istitle__doc__},
+    {"istitle", unicode_istitle, METH_NOARGS, unicode_istitle__doc__},
 
 static PyObject *
 unicode_istitle_impl(PyObject *self);
@@ -568,7 +568,7 @@ PyDoc_STRVAR(unicode_isspace__doc__,
 "is at least one character in the string.");
 
 #define UNICODE_ISSPACE_METHODDEF    \
-    {"isspace", (PyCFunction)unicode_isspace, METH_NOARGS, unicode_isspace__doc__},
+    {"isspace", unicode_isspace, METH_NOARGS, unicode_isspace__doc__},
 
 static PyObject *
 unicode_isspace_impl(PyObject *self);
@@ -589,7 +589,7 @@ PyDoc_STRVAR(unicode_isalpha__doc__,
 "is at least one character in the string.");
 
 #define UNICODE_ISALPHA_METHODDEF    \
-    {"isalpha", (PyCFunction)unicode_isalpha, METH_NOARGS, unicode_isalpha__doc__},
+    {"isalpha", unicode_isalpha, METH_NOARGS, unicode_isalpha__doc__},
 
 static PyObject *
 unicode_isalpha_impl(PyObject *self);
@@ -610,7 +610,7 @@ PyDoc_STRVAR(unicode_isalnum__doc__,
 "there is at least one character in the string.");
 
 #define UNICODE_ISALNUM_METHODDEF    \
-    {"isalnum", (PyCFunction)unicode_isalnum, METH_NOARGS, unicode_isalnum__doc__},
+    {"isalnum", unicode_isalnum, METH_NOARGS, unicode_isalnum__doc__},
 
 static PyObject *
 unicode_isalnum_impl(PyObject *self);
@@ -631,7 +631,7 @@ PyDoc_STRVAR(unicode_isdecimal__doc__,
 "there is at least one character in the string.");
 
 #define UNICODE_ISDECIMAL_METHODDEF    \
-    {"isdecimal", (PyCFunction)unicode_isdecimal, METH_NOARGS, unicode_isdecimal__doc__},
+    {"isdecimal", unicode_isdecimal, METH_NOARGS, unicode_isdecimal__doc__},
 
 static PyObject *
 unicode_isdecimal_impl(PyObject *self);
@@ -652,7 +652,7 @@ PyDoc_STRVAR(unicode_isdigit__doc__,
 "is at least one character in the string.");
 
 #define UNICODE_ISDIGIT_METHODDEF    \
-    {"isdigit", (PyCFunction)unicode_isdigit, METH_NOARGS, unicode_isdigit__doc__},
+    {"isdigit", unicode_isdigit, METH_NOARGS, unicode_isdigit__doc__},
 
 static PyObject *
 unicode_isdigit_impl(PyObject *self);
@@ -673,7 +673,7 @@ PyDoc_STRVAR(unicode_isnumeric__doc__,
 "least one character in the string.");
 
 #define UNICODE_ISNUMERIC_METHODDEF    \
-    {"isnumeric", (PyCFunction)unicode_isnumeric, METH_NOARGS, unicode_isnumeric__doc__},
+    {"isnumeric", unicode_isnumeric, METH_NOARGS, unicode_isnumeric__doc__},
 
 static PyObject *
 unicode_isnumeric_impl(PyObject *self);
@@ -694,7 +694,7 @@ PyDoc_STRVAR(unicode_isidentifier__doc__,
 "such as \"def\" or \"class\".");
 
 #define UNICODE_ISIDENTIFIER_METHODDEF    \
-    {"isidentifier", (PyCFunction)unicode_isidentifier, METH_NOARGS, unicode_isidentifier__doc__},
+    {"isidentifier", unicode_isidentifier, METH_NOARGS, unicode_isidentifier__doc__},
 
 static PyObject *
 unicode_isidentifier_impl(PyObject *self);
@@ -714,7 +714,7 @@ PyDoc_STRVAR(unicode_isprintable__doc__,
 "A character is printable if repr() may use it in its output.");
 
 #define UNICODE_ISPRINTABLE_METHODDEF    \
-    {"isprintable", (PyCFunction)unicode_isprintable, METH_NOARGS, unicode_isprintable__doc__},
+    {"isprintable", unicode_isprintable, METH_NOARGS, unicode_isprintable__doc__},
 
 static PyObject *
 unicode_isprintable_impl(PyObject *self);
@@ -737,7 +737,7 @@ PyDoc_STRVAR(unicode_join__doc__,
 "Example: \'.\'.join([\'ab\', \'pq\', \'rs\']) -> \'ab.pq.rs\'");
 
 #define UNICODE_JOIN_METHODDEF    \
-    {"join", (PyCFunction)unicode_join, METH_O, unicode_join__doc__},
+    {"join", unicode_join, METH_O, unicode_join__doc__},
 
 PyDoc_STRVAR(unicode_ljust__doc__,
 "ljust($self, width, fillchar=\' \', /)\n"
@@ -795,7 +795,7 @@ PyDoc_STRVAR(unicode_lower__doc__,
 "Return a copy of the string converted to lowercase.");
 
 #define UNICODE_LOWER_METHODDEF    \
-    {"lower", (PyCFunction)unicode_lower, METH_NOARGS, unicode_lower__doc__},
+    {"lower", unicode_lower, METH_NOARGS, unicode_lower__doc__},
 
 static PyObject *
 unicode_lower_impl(PyObject *self);
@@ -1012,7 +1012,7 @@ PyDoc_STRVAR(unicode_removeprefix__doc__,
 "Otherwise, return a copy of the original string.");
 
 #define UNICODE_REMOVEPREFIX_METHODDEF    \
-    {"removeprefix", (PyCFunction)unicode_removeprefix, METH_O, unicode_removeprefix__doc__},
+    {"removeprefix", unicode_removeprefix, METH_O, unicode_removeprefix__doc__},
 
 static PyObject *
 unicode_removeprefix_impl(PyObject *self, PyObject *prefix);
@@ -1045,7 +1045,7 @@ PyDoc_STRVAR(unicode_removesuffix__doc__,
 "string.");
 
 #define UNICODE_REMOVESUFFIX_METHODDEF    \
-    {"removesuffix", (PyCFunction)unicode_removesuffix, METH_O, unicode_removesuffix__doc__},
+    {"removesuffix", unicode_removesuffix, METH_O, unicode_removesuffix__doc__},
 
 static PyObject *
 unicode_removesuffix_impl(PyObject *self, PyObject *suffix);
@@ -1339,7 +1339,7 @@ PyDoc_STRVAR(unicode_partition__doc__,
 "and two empty strings.");
 
 #define UNICODE_PARTITION_METHODDEF    \
-    {"partition", (PyCFunction)unicode_partition, METH_O, unicode_partition__doc__},
+    {"partition", unicode_partition, METH_O, unicode_partition__doc__},
 
 PyDoc_STRVAR(unicode_rpartition__doc__,
 "rpartition($self, sep, /)\n"
@@ -1355,7 +1355,7 @@ PyDoc_STRVAR(unicode_rpartition__doc__,
 "and the original string.");
 
 #define UNICODE_RPARTITION_METHODDEF    \
-    {"rpartition", (PyCFunction)unicode_rpartition, METH_O, unicode_rpartition__doc__},
+    {"rpartition", unicode_rpartition, METH_O, unicode_rpartition__doc__},
 
 PyDoc_STRVAR(unicode_rsplit__doc__,
 "rsplit($self, /, sep=None, maxsplit=-1)\n"
@@ -1526,7 +1526,7 @@ PyDoc_STRVAR(unicode_swapcase__doc__,
 "Convert uppercase characters to lowercase and lowercase characters to uppercase.");
 
 #define UNICODE_SWAPCASE_METHODDEF    \
-    {"swapcase", (PyCFunction)unicode_swapcase, METH_NOARGS, unicode_swapcase__doc__},
+    {"swapcase", unicode_swapcase, METH_NOARGS, unicode_swapcase__doc__},
 
 static PyObject *
 unicode_swapcase_impl(PyObject *self);
@@ -1607,7 +1607,7 @@ PyDoc_STRVAR(unicode_translate__doc__,
 "left untouched.  Characters mapped to None are deleted.");
 
 #define UNICODE_TRANSLATE_METHODDEF    \
-    {"translate", (PyCFunction)unicode_translate, METH_O, unicode_translate__doc__},
+    {"translate", unicode_translate, METH_O, unicode_translate__doc__},
 
 PyDoc_STRVAR(unicode_upper__doc__,
 "upper($self, /)\n"
@@ -1616,7 +1616,7 @@ PyDoc_STRVAR(unicode_upper__doc__,
 "Return a copy of the string converted to uppercase.");
 
 #define UNICODE_UPPER_METHODDEF    \
-    {"upper", (PyCFunction)unicode_upper, METH_NOARGS, unicode_upper__doc__},
+    {"upper", unicode_upper, METH_NOARGS, unicode_upper__doc__},
 
 static PyObject *
 unicode_upper_impl(PyObject *self);
@@ -1636,7 +1636,7 @@ PyDoc_STRVAR(unicode_zfill__doc__,
 "The string is never truncated.");
 
 #define UNICODE_ZFILL_METHODDEF    \
-    {"zfill", (PyCFunction)unicode_zfill, METH_O, unicode_zfill__doc__},
+    {"zfill", unicode_zfill, METH_O, unicode_zfill__doc__},
 
 static PyObject *
 unicode_zfill_impl(PyObject *self, Py_ssize_t width);
@@ -1774,7 +1774,7 @@ PyDoc_STRVAR(unicode___format____doc__,
 "Return a formatted version of the string as described by format_spec.");
 
 #define UNICODE___FORMAT___METHODDEF    \
-    {"__format__", (PyCFunction)unicode___format__, METH_O, unicode___format____doc__},
+    {"__format__", unicode___format__, METH_O, unicode___format____doc__},
 
 static PyObject *
 unicode___format___impl(PyObject *self, PyObject *format_spec);
@@ -1803,7 +1803,7 @@ PyDoc_STRVAR(unicode_sizeof__doc__,
 "Return the size of the string in memory, in bytes.");
 
 #define UNICODE_SIZEOF_METHODDEF    \
-    {"__sizeof__", (PyCFunction)unicode_sizeof, METH_NOARGS, unicode_sizeof__doc__},
+    {"__sizeof__", unicode_sizeof, METH_NOARGS, unicode_sizeof__doc__},
 
 static PyObject *
 unicode_sizeof_impl(PyObject *self);
@@ -1908,4 +1908,4 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=238917fe66120bde input=a9049054013a1b77]*/
+/*[clinic end generated code: output=eb2850a085edcb55 input=a9049054013a1b77]*/
diff --git a/Objects/stringlib/clinic/transmogrify.h.h b/Objects/stringlib/clinic/transmogrify.h.h
index 588fc101dbb5e3..95dbf5180b2bcb 100644
--- a/Objects/stringlib/clinic/transmogrify.h.h
+++ b/Objects/stringlib/clinic/transmogrify.h.h
@@ -296,7 +296,7 @@ PyDoc_STRVAR(stringlib_zfill__doc__,
 "The original string is never truncated.");
 
 #define STRINGLIB_ZFILL_METHODDEF    \
-    {"zfill", (PyCFunction)stringlib_zfill, METH_O, stringlib_zfill__doc__},
+    {"zfill", stringlib_zfill, METH_O, stringlib_zfill__doc__},
 
 static PyObject *
 stringlib_zfill_impl(PyObject *self, Py_ssize_t width);
@@ -324,4 +324,4 @@ stringlib_zfill(PyObject *self, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=8363b4b6cdaad556 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c5c534216c232492 input=a9049054013a1b77]*/
diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h
index a77d0855af293f..a13903a7331bd9 100644
--- a/PC/clinic/msvcrtmodule.c.h
+++ b/PC/clinic/msvcrtmodule.c.h
@@ -14,7 +14,7 @@ PyDoc_STRVAR(msvcrt_heapmin__doc__,
 "to the operating system. On failure, this raises OSError.");
 
 #define MSVCRT_HEAPMIN_METHODDEF    \
-    {"heapmin", (PyCFunction)msvcrt_heapmin, METH_NOARGS, msvcrt_heapmin__doc__},
+    {"heapmin", msvcrt_heapmin, METH_NOARGS, msvcrt_heapmin__doc__},
 
 static PyObject *
 msvcrt_heapmin_impl(PyObject *module);
@@ -173,7 +173,7 @@ PyDoc_STRVAR(msvcrt_get_osfhandle__doc__,
 "Raises OSError if fd is not recognized.");
 
 #define MSVCRT_GET_OSFHANDLE_METHODDEF    \
-    {"get_osfhandle", (PyCFunction)msvcrt_get_osfhandle, METH_O, msvcrt_get_osfhandle__doc__},
+    {"get_osfhandle", msvcrt_get_osfhandle, METH_O, msvcrt_get_osfhandle__doc__},
 
 static void *
 msvcrt_get_osfhandle_impl(PyObject *module, int fd);
@@ -206,7 +206,7 @@ PyDoc_STRVAR(msvcrt_kbhit__doc__,
 "Returns a nonzero value if a keypress is waiting to be read. Otherwise, return 0.");
 
 #define MSVCRT_KBHIT_METHODDEF    \
-    {"kbhit", (PyCFunction)msvcrt_kbhit, METH_NOARGS, msvcrt_kbhit__doc__},
+    {"kbhit", msvcrt_kbhit, METH_NOARGS, msvcrt_kbhit__doc__},
 
 static long
 msvcrt_kbhit_impl(PyObject *module);
@@ -240,7 +240,7 @@ PyDoc_STRVAR(msvcrt_getch__doc__,
 "cannot be read with this function.");
 
 #define MSVCRT_GETCH_METHODDEF    \
-    {"getch", (PyCFunction)msvcrt_getch, METH_NOARGS, msvcrt_getch__doc__},
+    {"getch", msvcrt_getch, METH_NOARGS, msvcrt_getch__doc__},
 
 static int
 msvcrt_getch_impl(PyObject *module);
@@ -266,7 +266,7 @@ PyDoc_STRVAR(msvcrt_getwch__doc__,
 "Wide char variant of getch(), returning a Unicode value.");
 
 #define MSVCRT_GETWCH_METHODDEF    \
-    {"getwch", (PyCFunction)msvcrt_getwch, METH_NOARGS, msvcrt_getwch__doc__},
+    {"getwch", msvcrt_getwch, METH_NOARGS, msvcrt_getwch__doc__},
 
 static wchar_t
 msvcrt_getwch_impl(PyObject *module);
@@ -292,7 +292,7 @@ PyDoc_STRVAR(msvcrt_getche__doc__,
 "Similar to getch(), but the keypress will be echoed if possible.");
 
 #define MSVCRT_GETCHE_METHODDEF    \
-    {"getche", (PyCFunction)msvcrt_getche, METH_NOARGS, msvcrt_getche__doc__},
+    {"getche", msvcrt_getche, METH_NOARGS, msvcrt_getche__doc__},
 
 static int
 msvcrt_getche_impl(PyObject *module);
@@ -318,7 +318,7 @@ PyDoc_STRVAR(msvcrt_getwche__doc__,
 "Wide char variant of getche(), returning a Unicode value.");
 
 #define MSVCRT_GETWCHE_METHODDEF    \
-    {"getwche", (PyCFunction)msvcrt_getwche, METH_NOARGS, msvcrt_getwche__doc__},
+    {"getwche", msvcrt_getwche, METH_NOARGS, msvcrt_getwche__doc__},
 
 static wchar_t
 msvcrt_getwche_impl(PyObject *module);
@@ -344,7 +344,7 @@ PyDoc_STRVAR(msvcrt_putch__doc__,
 "Print the byte string char to the console without buffering.");
 
 #define MSVCRT_PUTCH_METHODDEF    \
-    {"putch", (PyCFunction)msvcrt_putch, METH_O, msvcrt_putch__doc__},
+    {"putch", msvcrt_putch, METH_O, msvcrt_putch__doc__},
 
 static PyObject *
 msvcrt_putch_impl(PyObject *module, char char_value);
@@ -394,7 +394,7 @@ PyDoc_STRVAR(msvcrt_putwch__doc__,
 "Wide char variant of putch(), accepting a Unicode value.");
 
 #define MSVCRT_PUTWCH_METHODDEF    \
-    {"putwch", (PyCFunction)msvcrt_putwch, METH_O, msvcrt_putwch__doc__},
+    {"putwch", msvcrt_putwch, METH_O, msvcrt_putwch__doc__},
 
 static PyObject *
 msvcrt_putwch_impl(PyObject *module, int unicode_char);
@@ -436,7 +436,7 @@ PyDoc_STRVAR(msvcrt_ungetch__doc__,
 "getch() or getche().");
 
 #define MSVCRT_UNGETCH_METHODDEF    \
-    {"ungetch", (PyCFunction)msvcrt_ungetch, METH_O, msvcrt_ungetch__doc__},
+    {"ungetch", msvcrt_ungetch, METH_O, msvcrt_ungetch__doc__},
 
 static PyObject *
 msvcrt_ungetch_impl(PyObject *module, char char_value);
@@ -486,7 +486,7 @@ PyDoc_STRVAR(msvcrt_ungetwch__doc__,
 "Wide char variant of ungetch(), accepting a Unicode value.");
 
 #define MSVCRT_UNGETWCH_METHODDEF    \
-    {"ungetwch", (PyCFunction)msvcrt_ungetwch, METH_O, msvcrt_ungetwch__doc__},
+    {"ungetwch", msvcrt_ungetwch, METH_O, msvcrt_ungetwch__doc__},
 
 static PyObject *
 msvcrt_ungetwch_impl(PyObject *module, int unicode_char);
@@ -622,7 +622,7 @@ PyDoc_STRVAR(msvcrt_set_error_mode__doc__,
 "Only available on Debug builds.");
 
 #define MSVCRT_SET_ERROR_MODE_METHODDEF    \
-    {"set_error_mode", (PyCFunction)msvcrt_set_error_mode, METH_O, msvcrt_set_error_mode__doc__},
+    {"set_error_mode", msvcrt_set_error_mode, METH_O, msvcrt_set_error_mode__doc__},
 
 static long
 msvcrt_set_error_mode_impl(PyObject *module, int mode);
@@ -659,7 +659,7 @@ PyDoc_STRVAR(msvcrt_GetErrorMode__doc__,
 "Wrapper around GetErrorMode.");
 
 #define MSVCRT_GETERRORMODE_METHODDEF    \
-    {"GetErrorMode", (PyCFunction)msvcrt_GetErrorMode, METH_NOARGS, msvcrt_GetErrorMode__doc__},
+    {"GetErrorMode", msvcrt_GetErrorMode, METH_NOARGS, msvcrt_GetErrorMode__doc__},
 
 static PyObject *
 msvcrt_GetErrorMode_impl(PyObject *module);
@@ -679,7 +679,7 @@ PyDoc_STRVAR(msvcrt_SetErrorMode__doc__,
 "Wrapper around SetErrorMode.");
 
 #define MSVCRT_SETERRORMODE_METHODDEF    \
-    {"SetErrorMode", (PyCFunction)msvcrt_SetErrorMode, METH_O, msvcrt_SetErrorMode__doc__},
+    {"SetErrorMode", msvcrt_SetErrorMode, METH_O, msvcrt_SetErrorMode__doc__},
 
 static PyObject *
 msvcrt_SetErrorMode_impl(PyObject *module, unsigned int mode);
@@ -731,4 +731,4 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg)
 #ifndef MSVCRT_GETERRORMODE_METHODDEF
     #define MSVCRT_GETERRORMODE_METHODDEF
 #endif /* !defined(MSVCRT_GETERRORMODE_METHODDEF) */
-/*[clinic end generated code: output=692c6f52bb9193ce input=a9049054013a1b77]*/
+/*[clinic end generated code: output=849e852d970e7b24 input=a9049054013a1b77]*/
diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h
index 45d54e3c90289a..78bd537af91483 100644
--- a/PC/clinic/winreg.c.h
+++ b/PC/clinic/winreg.c.h
@@ -20,7 +20,7 @@ PyDoc_STRVAR(winreg_HKEYType_Close__doc__,
 "If the handle is already closed, no error is raised.");
 
 #define WINREG_HKEYTYPE_CLOSE_METHODDEF    \
-    {"Close", (PyCFunction)winreg_HKEYType_Close, METH_NOARGS, winreg_HKEYType_Close__doc__},
+    {"Close", winreg_HKEYType_Close, METH_NOARGS, winreg_HKEYType_Close__doc__},
 
 static PyObject *
 winreg_HKEYType_Close_impl(PyHKEYObject *self);
@@ -50,7 +50,7 @@ PyDoc_STRVAR(winreg_HKEYType_Detach__doc__,
 "handle object.");
 
 #define WINREG_HKEYTYPE_DETACH_METHODDEF    \
-    {"Detach", (PyCFunction)winreg_HKEYType_Detach, METH_NOARGS, winreg_HKEYType_Detach__doc__},
+    {"Detach", winreg_HKEYType_Detach, METH_NOARGS, winreg_HKEYType_Detach__doc__},
 
 static PyObject *
 winreg_HKEYType_Detach_impl(PyHKEYObject *self);
@@ -71,7 +71,7 @@ PyDoc_STRVAR(winreg_HKEYType___enter____doc__,
 "\n");
 
 #define WINREG_HKEYTYPE___ENTER___METHODDEF    \
-    {"__enter__", (PyCFunction)winreg_HKEYType___enter__, METH_NOARGS, winreg_HKEYType___enter____doc__},
+    {"__enter__", winreg_HKEYType___enter__, METH_NOARGS, winreg_HKEYType___enter____doc__},
 
 static PyHKEYObject *
 winreg_HKEYType___enter___impl(PyHKEYObject *self);
@@ -141,7 +141,7 @@ PyDoc_STRVAR(winreg_CloseKey__doc__,
 "closed when the hkey object is destroyed by Python.");
 
 #define WINREG_CLOSEKEY_METHODDEF    \
-    {"CloseKey", (PyCFunction)winreg_CloseKey, METH_O, winreg_CloseKey__doc__},
+    {"CloseKey", winreg_CloseKey, METH_O, winreg_CloseKey__doc__},
 
 #endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
 
@@ -753,7 +753,7 @@ PyDoc_STRVAR(winreg_ExpandEnvironmentStrings__doc__,
 "Expand environment vars.");
 
 #define WINREG_EXPANDENVIRONMENTSTRINGS_METHODDEF    \
-    {"ExpandEnvironmentStrings", (PyCFunction)winreg_ExpandEnvironmentStrings, METH_O, winreg_ExpandEnvironmentStrings__doc__},
+    {"ExpandEnvironmentStrings", winreg_ExpandEnvironmentStrings, METH_O, winreg_ExpandEnvironmentStrings__doc__},
 
 static PyObject *
 winreg_ExpandEnvironmentStrings_impl(PyObject *module, const wchar_t *string);
@@ -805,7 +805,7 @@ PyDoc_STRVAR(winreg_FlushKey__doc__,
 "a FlushKey() call is required, it probably isn\'t.");
 
 #define WINREG_FLUSHKEY_METHODDEF    \
-    {"FlushKey", (PyCFunction)winreg_FlushKey, METH_O, winreg_FlushKey__doc__},
+    {"FlushKey", winreg_FlushKey, METH_O, winreg_FlushKey__doc__},
 
 static PyObject *
 winreg_FlushKey_impl(PyObject *module, HKEY key);
@@ -1165,7 +1165,7 @@ PyDoc_STRVAR(winreg_QueryInfoKey__doc__,
 "as 100\'s of nanoseconds since Jan 1, 1600.");
 
 #define WINREG_QUERYINFOKEY_METHODDEF    \
-    {"QueryInfoKey", (PyCFunction)winreg_QueryInfoKey, METH_O, winreg_QueryInfoKey__doc__},
+    {"QueryInfoKey", winreg_QueryInfoKey, METH_O, winreg_QueryInfoKey__doc__},
 
 static PyObject *
 winreg_QueryInfoKey_impl(PyObject *module, HKEY key);
@@ -1571,7 +1571,7 @@ PyDoc_STRVAR(winreg_DisableReflectionKey__doc__,
 "of any subkeys.");
 
 #define WINREG_DISABLEREFLECTIONKEY_METHODDEF    \
-    {"DisableReflectionKey", (PyCFunction)winreg_DisableReflectionKey, METH_O, winreg_DisableReflectionKey__doc__},
+    {"DisableReflectionKey", winreg_DisableReflectionKey, METH_O, winreg_DisableReflectionKey__doc__},
 
 static PyObject *
 winreg_DisableReflectionKey_impl(PyObject *module, HKEY key);
@@ -1609,7 +1609,7 @@ PyDoc_STRVAR(winreg_EnableReflectionKey__doc__,
 "subkeys.");
 
 #define WINREG_ENABLEREFLECTIONKEY_METHODDEF    \
-    {"EnableReflectionKey", (PyCFunction)winreg_EnableReflectionKey, METH_O, winreg_EnableReflectionKey__doc__},
+    {"EnableReflectionKey", winreg_EnableReflectionKey, METH_O, winreg_EnableReflectionKey__doc__},
 
 static PyObject *
 winreg_EnableReflectionKey_impl(PyObject *module, HKEY key);
@@ -1645,7 +1645,7 @@ PyDoc_STRVAR(winreg_QueryReflectionKey__doc__,
 "Will generally raise NotImplementedError if executed on a 32bit OS.");
 
 #define WINREG_QUERYREFLECTIONKEY_METHODDEF    \
-    {"QueryReflectionKey", (PyCFunction)winreg_QueryReflectionKey, METH_O, winreg_QueryReflectionKey__doc__},
+    {"QueryReflectionKey", winreg_QueryReflectionKey, METH_O, winreg_QueryReflectionKey__doc__},
 
 static PyObject *
 winreg_QueryReflectionKey_impl(PyObject *module, HKEY key);
@@ -1774,4 +1774,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=be4b6857b95558b5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=136c97a3b5201dd9 input=a9049054013a1b77]*/
diff --git a/Python/clinic/_contextvars.c.h b/Python/clinic/_contextvars.c.h
index b1885e41c355d2..74fbc90b87bcce 100644
--- a/Python/clinic/_contextvars.c.h
+++ b/Python/clinic/_contextvars.c.h
@@ -8,7 +8,7 @@ PyDoc_STRVAR(_contextvars_copy_context__doc__,
 "\n");
 
 #define _CONTEXTVARS_COPY_CONTEXT_METHODDEF    \
-    {"copy_context", (PyCFunction)_contextvars_copy_context, METH_NOARGS, _contextvars_copy_context__doc__},
+    {"copy_context", _contextvars_copy_context, METH_NOARGS, _contextvars_copy_context__doc__},
 
 static PyObject *
 _contextvars_copy_context_impl(PyObject *module);
@@ -18,4 +18,4 @@ _contextvars_copy_context(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return _contextvars_copy_context_impl(module);
 }
-/*[clinic end generated code: output=26e07024451baf52 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3ae2d989e71f46d0 input=a9049054013a1b77]*/
diff --git a/Python/clinic/_warnings.c.h b/Python/clinic/_warnings.c.h
index 8bda830ccb924e..c195161db8f138 100644
--- a/Python/clinic/_warnings.c.h
+++ b/Python/clinic/_warnings.c.h
@@ -15,7 +15,7 @@ PyDoc_STRVAR(warnings_acquire_lock__doc__,
 "\n");
 
 #define WARNINGS_ACQUIRE_LOCK_METHODDEF    \
-    {"_acquire_lock", (PyCFunction)warnings_acquire_lock, METH_NOARGS, warnings_acquire_lock__doc__},
+    {"_acquire_lock", warnings_acquire_lock, METH_NOARGS, warnings_acquire_lock__doc__},
 
 static PyObject *
 warnings_acquire_lock_impl(PyObject *module);
@@ -32,7 +32,7 @@ PyDoc_STRVAR(warnings_release_lock__doc__,
 "\n");
 
 #define WARNINGS_RELEASE_LOCK_METHODDEF    \
-    {"_release_lock", (PyCFunction)warnings_release_lock, METH_NOARGS, warnings_release_lock__doc__},
+    {"_release_lock", warnings_release_lock, METH_NOARGS, warnings_release_lock__doc__},
 
 static PyObject *
 warnings_release_lock_impl(PyObject *module);
@@ -274,7 +274,7 @@ PyDoc_STRVAR(warnings_filters_mutated_lock_held__doc__,
 "\n");
 
 #define WARNINGS_FILTERS_MUTATED_LOCK_HELD_METHODDEF    \
-    {"_filters_mutated_lock_held", (PyCFunction)warnings_filters_mutated_lock_held, METH_NOARGS, warnings_filters_mutated_lock_held__doc__},
+    {"_filters_mutated_lock_held", warnings_filters_mutated_lock_held, METH_NOARGS, warnings_filters_mutated_lock_held__doc__},
 
 static PyObject *
 warnings_filters_mutated_lock_held_impl(PyObject *module);
@@ -284,4 +284,4 @@ warnings_filters_mutated_lock_held(PyObject *module, PyObject *Py_UNUSED(ignored
 {
     return warnings_filters_mutated_lock_held_impl(module);
 }
-/*[clinic end generated code: output=610ed5764bf40bb5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=289bccf7196c7add input=a9049054013a1b77]*/
diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h
index c826a5724f769c..06fdc6bb39ceda 100644
--- a/Python/clinic/bltinmodule.c.h
+++ b/Python/clinic/bltinmodule.c.h
@@ -120,7 +120,7 @@ PyDoc_STRVAR(builtin_abs__doc__,
 "Return the absolute value of the argument.");
 
 #define BUILTIN_ABS_METHODDEF    \
-    {"abs", (PyCFunction)builtin_abs, METH_O, builtin_abs__doc__},
+    {"abs", builtin_abs, METH_O, builtin_abs__doc__},
 
 PyDoc_STRVAR(builtin_all__doc__,
 "all($module, iterable, /)\n"
@@ -131,7 +131,7 @@ PyDoc_STRVAR(builtin_all__doc__,
 "If the iterable is empty, return True.");
 
 #define BUILTIN_ALL_METHODDEF    \
-    {"all", (PyCFunction)builtin_all, METH_O, builtin_all__doc__},
+    {"all", builtin_all, METH_O, builtin_all__doc__},
 
 PyDoc_STRVAR(builtin_any__doc__,
 "any($module, iterable, /)\n"
@@ -142,7 +142,7 @@ PyDoc_STRVAR(builtin_any__doc__,
 "If the iterable is empty, return False.");
 
 #define BUILTIN_ANY_METHODDEF    \
-    {"any", (PyCFunction)builtin_any, METH_O, builtin_any__doc__},
+    {"any", builtin_any, METH_O, builtin_any__doc__},
 
 PyDoc_STRVAR(builtin_ascii__doc__,
 "ascii($module, obj, /)\n"
@@ -156,7 +156,7 @@ PyDoc_STRVAR(builtin_ascii__doc__,
 "to that returned by repr() in Python 2.");
 
 #define BUILTIN_ASCII_METHODDEF    \
-    {"ascii", (PyCFunction)builtin_ascii, METH_O, builtin_ascii__doc__},
+    {"ascii", builtin_ascii, METH_O, builtin_ascii__doc__},
 
 PyDoc_STRVAR(builtin_bin__doc__,
 "bin($module, number, /)\n"
@@ -168,7 +168,7 @@ PyDoc_STRVAR(builtin_bin__doc__,
 "   \'0b1010101010101010101010\'");
 
 #define BUILTIN_BIN_METHODDEF    \
-    {"bin", (PyCFunction)builtin_bin, METH_O, builtin_bin__doc__},
+    {"bin", builtin_bin, METH_O, builtin_bin__doc__},
 
 PyDoc_STRVAR(builtin_callable__doc__,
 "callable($module, obj, /)\n"
@@ -180,7 +180,7 @@ PyDoc_STRVAR(builtin_callable__doc__,
 "__call__() method.");
 
 #define BUILTIN_CALLABLE_METHODDEF    \
-    {"callable", (PyCFunction)builtin_callable, METH_O, builtin_callable__doc__},
+    {"callable", builtin_callable, METH_O, builtin_callable__doc__},
 
 PyDoc_STRVAR(builtin_format__doc__,
 "format($module, value, format_spec=\'\', /)\n"
@@ -234,7 +234,7 @@ PyDoc_STRVAR(builtin_chr__doc__,
 "Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff.");
 
 #define BUILTIN_CHR_METHODDEF    \
-    {"chr", (PyCFunction)builtin_chr, METH_O, builtin_chr__doc__},
+    {"chr", builtin_chr, METH_O, builtin_chr__doc__},
 
 PyDoc_STRVAR(builtin_compile__doc__,
 "compile($module, /, source, filename, mode, flags=0,\n"
@@ -581,7 +581,7 @@ PyDoc_STRVAR(builtin_globals__doc__,
 "global scope and vice-versa.");
 
 #define BUILTIN_GLOBALS_METHODDEF    \
-    {"globals", (PyCFunction)builtin_globals, METH_NOARGS, builtin_globals__doc__},
+    {"globals", builtin_globals, METH_NOARGS, builtin_globals__doc__},
 
 static PyObject *
 builtin_globals_impl(PyObject *module);
@@ -634,7 +634,7 @@ PyDoc_STRVAR(builtin_id__doc__,
 "(CPython uses the object\'s memory address.)");
 
 #define BUILTIN_ID_METHODDEF    \
-    {"id", (PyCFunction)builtin_id, METH_O, builtin_id__doc__},
+    {"id", builtin_id, METH_O, builtin_id__doc__},
 
 static PyObject *
 builtin_id_impl(PyModuleDef *self, PyObject *v);
@@ -726,7 +726,7 @@ PyDoc_STRVAR(builtin_hash__doc__,
 "reverse is not necessarily true.");
 
 #define BUILTIN_HASH_METHODDEF    \
-    {"hash", (PyCFunction)builtin_hash, METH_O, builtin_hash__doc__},
+    {"hash", builtin_hash, METH_O, builtin_hash__doc__},
 
 PyDoc_STRVAR(builtin_hex__doc__,
 "hex($module, number, /)\n"
@@ -738,7 +738,7 @@ PyDoc_STRVAR(builtin_hex__doc__,
 "   \'0xc0ffee\'");
 
 #define BUILTIN_HEX_METHODDEF    \
-    {"hex", (PyCFunction)builtin_hex, METH_O, builtin_hex__doc__},
+    {"hex", builtin_hex, METH_O, builtin_hex__doc__},
 
 PyDoc_STRVAR(builtin_aiter__doc__,
 "aiter($module, async_iterable, /)\n"
@@ -747,7 +747,7 @@ PyDoc_STRVAR(builtin_aiter__doc__,
 "Return an AsyncIterator for an AsyncIterable object.");
 
 #define BUILTIN_AITER_METHODDEF    \
-    {"aiter", (PyCFunction)builtin_aiter, METH_O, builtin_aiter__doc__},
+    {"aiter", builtin_aiter, METH_O, builtin_aiter__doc__},
 
 PyDoc_STRVAR(builtin_anext__doc__,
 "anext($module, aiterator, default=<unrepresentable>, /)\n"
@@ -794,7 +794,7 @@ PyDoc_STRVAR(builtin_len__doc__,
 "Return the number of items in a container.");
 
 #define BUILTIN_LEN_METHODDEF    \
-    {"len", (PyCFunction)builtin_len, METH_O, builtin_len__doc__},
+    {"len", builtin_len, METH_O, builtin_len__doc__},
 
 PyDoc_STRVAR(builtin_locals__doc__,
 "locals($module, /)\n"
@@ -807,7 +807,7 @@ PyDoc_STRVAR(builtin_locals__doc__,
 "covered by any backwards compatibility guarantees.");
 
 #define BUILTIN_LOCALS_METHODDEF    \
-    {"locals", (PyCFunction)builtin_locals, METH_NOARGS, builtin_locals__doc__},
+    {"locals", builtin_locals, METH_NOARGS, builtin_locals__doc__},
 
 static PyObject *
 builtin_locals_impl(PyObject *module);
@@ -828,7 +828,7 @@ PyDoc_STRVAR(builtin_oct__doc__,
 "   \'0o1234567\'");
 
 #define BUILTIN_OCT_METHODDEF    \
-    {"oct", (PyCFunction)builtin_oct, METH_O, builtin_oct__doc__},
+    {"oct", builtin_oct, METH_O, builtin_oct__doc__},
 
 PyDoc_STRVAR(builtin_ord__doc__,
 "ord($module, c, /)\n"
@@ -837,7 +837,7 @@ PyDoc_STRVAR(builtin_ord__doc__,
 "Return the Unicode code point for a one-character string.");
 
 #define BUILTIN_ORD_METHODDEF    \
-    {"ord", (PyCFunction)builtin_ord, METH_O, builtin_ord__doc__},
+    {"ord", builtin_ord, METH_O, builtin_ord__doc__},
 
 PyDoc_STRVAR(builtin_pow__doc__,
 "pow($module, /, base, exp, mod=None)\n"
@@ -1060,7 +1060,7 @@ PyDoc_STRVAR(builtin_repr__doc__,
 "For many object types, including most builtins, eval(repr(obj)) == obj.");
 
 #define BUILTIN_REPR_METHODDEF    \
-    {"repr", (PyCFunction)builtin_repr, METH_O, builtin_repr__doc__},
+    {"repr", builtin_repr, METH_O, builtin_repr__doc__},
 
 PyDoc_STRVAR(builtin_round__doc__,
 "round($module, /, number, ndigits=None)\n"
@@ -1268,4 +1268,4 @@ builtin_issubclass(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=e7a5d0851d7f2cfb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fdb5375085176ad5 input=a9049054013a1b77]*/
diff --git a/Python/clinic/context.c.h b/Python/clinic/context.c.h
index 5ed74e6e6ddb6b..77f1762e4a3dd8 100644
--- a/Python/clinic/context.c.h
+++ b/Python/clinic/context.c.h
@@ -51,7 +51,7 @@ PyDoc_STRVAR(_contextvars_Context_items__doc__,
 "The result is returned as a list of 2-tuples (variable, value).");
 
 #define _CONTEXTVARS_CONTEXT_ITEMS_METHODDEF    \
-    {"items", (PyCFunction)_contextvars_Context_items, METH_NOARGS, _contextvars_Context_items__doc__},
+    {"items", _contextvars_Context_items, METH_NOARGS, _contextvars_Context_items__doc__},
 
 static PyObject *
 _contextvars_Context_items_impl(PyContext *self);
@@ -69,7 +69,7 @@ PyDoc_STRVAR(_contextvars_Context_keys__doc__,
 "Return a list of all variables in the context object.");
 
 #define _CONTEXTVARS_CONTEXT_KEYS_METHODDEF    \
-    {"keys", (PyCFunction)_contextvars_Context_keys, METH_NOARGS, _contextvars_Context_keys__doc__},
+    {"keys", _contextvars_Context_keys, METH_NOARGS, _contextvars_Context_keys__doc__},
 
 static PyObject *
 _contextvars_Context_keys_impl(PyContext *self);
@@ -87,7 +87,7 @@ PyDoc_STRVAR(_contextvars_Context_values__doc__,
 "Return a list of all variables\' values in the context object.");
 
 #define _CONTEXTVARS_CONTEXT_VALUES_METHODDEF    \
-    {"values", (PyCFunction)_contextvars_Context_values, METH_NOARGS, _contextvars_Context_values__doc__},
+    {"values", _contextvars_Context_values, METH_NOARGS, _contextvars_Context_values__doc__},
 
 static PyObject *
 _contextvars_Context_values_impl(PyContext *self);
@@ -105,7 +105,7 @@ PyDoc_STRVAR(_contextvars_Context_copy__doc__,
 "Return a shallow copy of the context object.");
 
 #define _CONTEXTVARS_CONTEXT_COPY_METHODDEF    \
-    {"copy", (PyCFunction)_contextvars_Context_copy, METH_NOARGS, _contextvars_Context_copy__doc__},
+    {"copy", _contextvars_Context_copy, METH_NOARGS, _contextvars_Context_copy__doc__},
 
 static PyObject *
 _contextvars_Context_copy_impl(PyContext *self);
@@ -166,7 +166,7 @@ PyDoc_STRVAR(_contextvars_ContextVar_set__doc__,
 "value via the `ContextVar.reset()` method.");
 
 #define _CONTEXTVARS_CONTEXTVAR_SET_METHODDEF    \
-    {"set", (PyCFunction)_contextvars_ContextVar_set, METH_O, _contextvars_ContextVar_set__doc__},
+    {"set", _contextvars_ContextVar_set, METH_O, _contextvars_ContextVar_set__doc__},
 
 static PyObject *
 _contextvars_ContextVar_set_impl(PyContextVar *self, PyObject *value);
@@ -191,7 +191,7 @@ PyDoc_STRVAR(_contextvars_ContextVar_reset__doc__,
 "created the token was used.");
 
 #define _CONTEXTVARS_CONTEXTVAR_RESET_METHODDEF    \
-    {"reset", (PyCFunction)_contextvars_ContextVar_reset, METH_O, _contextvars_ContextVar_reset__doc__},
+    {"reset", _contextvars_ContextVar_reset, METH_O, _contextvars_ContextVar_reset__doc__},
 
 static PyObject *
 _contextvars_ContextVar_reset_impl(PyContextVar *self, PyObject *token);
@@ -213,7 +213,7 @@ PyDoc_STRVAR(token_enter__doc__,
 "Enter into Token context manager.");
 
 #define TOKEN_ENTER_METHODDEF    \
-    {"__enter__", (PyCFunction)token_enter, METH_NOARGS, token_enter__doc__},
+    {"__enter__", token_enter, METH_NOARGS, token_enter__doc__},
 
 static PyObject *
 token_enter_impl(PyContextToken *self);
@@ -256,4 +256,4 @@ token_exit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3a04b2fddf24c3e9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7c953506c4fc86ec input=a9049054013a1b77]*/
diff --git a/Python/clinic/import.c.h b/Python/clinic/import.c.h
index 9bbb13f7566517..a4ae64056bcb2d 100644
--- a/Python/clinic/import.c.h
+++ b/Python/clinic/import.c.h
@@ -17,7 +17,7 @@ PyDoc_STRVAR(_imp_lock_held__doc__,
 "On platforms without threads, return False.");
 
 #define _IMP_LOCK_HELD_METHODDEF    \
-    {"lock_held", (PyCFunction)_imp_lock_held, METH_NOARGS, _imp_lock_held__doc__},
+    {"lock_held", _imp_lock_held, METH_NOARGS, _imp_lock_held__doc__},
 
 static PyObject *
 _imp_lock_held_impl(PyObject *module);
@@ -38,7 +38,7 @@ PyDoc_STRVAR(_imp_acquire_lock__doc__,
 "modules. On platforms without threads, this function does nothing.");
 
 #define _IMP_ACQUIRE_LOCK_METHODDEF    \
-    {"acquire_lock", (PyCFunction)_imp_acquire_lock, METH_NOARGS, _imp_acquire_lock__doc__},
+    {"acquire_lock", _imp_acquire_lock, METH_NOARGS, _imp_acquire_lock__doc__},
 
 static PyObject *
 _imp_acquire_lock_impl(PyObject *module);
@@ -58,7 +58,7 @@ PyDoc_STRVAR(_imp_release_lock__doc__,
 "On platforms without threads, this function does nothing.");
 
 #define _IMP_RELEASE_LOCK_METHODDEF    \
-    {"release_lock", (PyCFunction)_imp_release_lock, METH_NOARGS, _imp_release_lock__doc__},
+    {"release_lock", _imp_release_lock, METH_NOARGS, _imp_release_lock__doc__},
 
 static PyObject *
 _imp_release_lock_impl(PyObject *module);
@@ -120,7 +120,7 @@ PyDoc_STRVAR(_imp_create_builtin__doc__,
 "Create an extension module.");
 
 #define _IMP_CREATE_BUILTIN_METHODDEF    \
-    {"create_builtin", (PyCFunction)_imp_create_builtin, METH_O, _imp_create_builtin__doc__},
+    {"create_builtin", _imp_create_builtin, METH_O, _imp_create_builtin__doc__},
 
 PyDoc_STRVAR(_imp_extension_suffixes__doc__,
 "extension_suffixes($module, /)\n"
@@ -129,7 +129,7 @@ PyDoc_STRVAR(_imp_extension_suffixes__doc__,
 "Returns the list of file suffixes used to identify extension modules.");
 
 #define _IMP_EXTENSION_SUFFIXES_METHODDEF    \
-    {"extension_suffixes", (PyCFunction)_imp_extension_suffixes, METH_NOARGS, _imp_extension_suffixes__doc__},
+    {"extension_suffixes", _imp_extension_suffixes, METH_NOARGS, _imp_extension_suffixes__doc__},
 
 static PyObject *
 _imp_extension_suffixes_impl(PyObject *module);
@@ -147,7 +147,7 @@ PyDoc_STRVAR(_imp_init_frozen__doc__,
 "Initializes a frozen module.");
 
 #define _IMP_INIT_FROZEN_METHODDEF    \
-    {"init_frozen", (PyCFunction)_imp_init_frozen, METH_O, _imp_init_frozen__doc__},
+    {"init_frozen", _imp_init_frozen, METH_O, _imp_init_frozen__doc__},
 
 static PyObject *
 _imp_init_frozen_impl(PyObject *module, PyObject *name);
@@ -295,7 +295,7 @@ PyDoc_STRVAR(_imp_is_frozen_package__doc__,
 "Returns True if the module name is of a frozen package.");
 
 #define _IMP_IS_FROZEN_PACKAGE_METHODDEF    \
-    {"is_frozen_package", (PyCFunction)_imp_is_frozen_package, METH_O, _imp_is_frozen_package__doc__},
+    {"is_frozen_package", _imp_is_frozen_package, METH_O, _imp_is_frozen_package__doc__},
 
 static PyObject *
 _imp_is_frozen_package_impl(PyObject *module, PyObject *name);
@@ -324,7 +324,7 @@ PyDoc_STRVAR(_imp_is_builtin__doc__,
 "Returns True if the module name corresponds to a built-in module.");
 
 #define _IMP_IS_BUILTIN_METHODDEF    \
-    {"is_builtin", (PyCFunction)_imp_is_builtin, METH_O, _imp_is_builtin__doc__},
+    {"is_builtin", _imp_is_builtin, METH_O, _imp_is_builtin__doc__},
 
 static PyObject *
 _imp_is_builtin_impl(PyObject *module, PyObject *name);
@@ -353,7 +353,7 @@ PyDoc_STRVAR(_imp_is_frozen__doc__,
 "Returns True if the module name corresponds to a frozen module.");
 
 #define _IMP_IS_FROZEN_METHODDEF    \
-    {"is_frozen", (PyCFunction)_imp_is_frozen, METH_O, _imp_is_frozen__doc__},
+    {"is_frozen", _imp_is_frozen, METH_O, _imp_is_frozen__doc__},
 
 static PyObject *
 _imp_is_frozen_impl(PyObject *module, PyObject *name);
@@ -382,7 +382,7 @@ PyDoc_STRVAR(_imp__frozen_module_names__doc__,
 "Returns the list of available frozen modules.");
 
 #define _IMP__FROZEN_MODULE_NAMES_METHODDEF    \
-    {"_frozen_module_names", (PyCFunction)_imp__frozen_module_names, METH_NOARGS, _imp__frozen_module_names__doc__},
+    {"_frozen_module_names", _imp__frozen_module_names, METH_NOARGS, _imp__frozen_module_names__doc__},
 
 static PyObject *
 _imp__frozen_module_names_impl(PyObject *module);
@@ -403,7 +403,7 @@ PyDoc_STRVAR(_imp__override_frozen_modules_for_tests__doc__,
 "See frozen_modules() in Lib/test/support/import_helper.py.");
 
 #define _IMP__OVERRIDE_FROZEN_MODULES_FOR_TESTS_METHODDEF    \
-    {"_override_frozen_modules_for_tests", (PyCFunction)_imp__override_frozen_modules_for_tests, METH_O, _imp__override_frozen_modules_for_tests__doc__},
+    {"_override_frozen_modules_for_tests", _imp__override_frozen_modules_for_tests, METH_O, _imp__override_frozen_modules_for_tests__doc__},
 
 static PyObject *
 _imp__override_frozen_modules_for_tests_impl(PyObject *module, int override);
@@ -433,7 +433,7 @@ PyDoc_STRVAR(_imp__override_multi_interp_extensions_check__doc__,
 "(-1: \"never\", 1: \"always\", 0: no override)");
 
 #define _IMP__OVERRIDE_MULTI_INTERP_EXTENSIONS_CHECK_METHODDEF    \
-    {"_override_multi_interp_extensions_check", (PyCFunction)_imp__override_multi_interp_extensions_check, METH_O, _imp__override_multi_interp_extensions_check__doc__},
+    {"_override_multi_interp_extensions_check", _imp__override_multi_interp_extensions_check, METH_O, _imp__override_multi_interp_extensions_check__doc__},
 
 static PyObject *
 _imp__override_multi_interp_extensions_check_impl(PyObject *module,
@@ -502,7 +502,7 @@ PyDoc_STRVAR(_imp_exec_dynamic__doc__,
 "Initialize an extension module.");
 
 #define _IMP_EXEC_DYNAMIC_METHODDEF    \
-    {"exec_dynamic", (PyCFunction)_imp_exec_dynamic, METH_O, _imp_exec_dynamic__doc__},
+    {"exec_dynamic", _imp_exec_dynamic, METH_O, _imp_exec_dynamic__doc__},
 
 static int
 _imp_exec_dynamic_impl(PyObject *module, PyObject *mod);
@@ -532,7 +532,7 @@ PyDoc_STRVAR(_imp_exec_builtin__doc__,
 "Initialize a built-in module.");
 
 #define _IMP_EXEC_BUILTIN_METHODDEF    \
-    {"exec_builtin", (PyCFunction)_imp_exec_builtin, METH_O, _imp_exec_builtin__doc__},
+    {"exec_builtin", _imp_exec_builtin, METH_O, _imp_exec_builtin__doc__},
 
 static int
 _imp_exec_builtin_impl(PyObject *module, PyObject *mod);
@@ -629,4 +629,4 @@ _imp_source_hash(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
 #ifndef _IMP_EXEC_DYNAMIC_METHODDEF
     #define _IMP_EXEC_DYNAMIC_METHODDEF
 #endif /* !defined(_IMP_EXEC_DYNAMIC_METHODDEF) */
-/*[clinic end generated code: output=24f597d6b0f3feed input=a9049054013a1b77]*/
+/*[clinic end generated code: output=12edde2fe98f3e55 input=a9049054013a1b77]*/
diff --git a/Python/clinic/instruction_sequence.c.h b/Python/clinic/instruction_sequence.c.h
index f780627bae6ed8..1d910e5e5704b7 100644
--- a/Python/clinic/instruction_sequence.c.h
+++ b/Python/clinic/instruction_sequence.c.h
@@ -195,7 +195,7 @@ PyDoc_STRVAR(InstructionSequenceType_new_label__doc__,
 "Return a new label.");
 
 #define INSTRUCTIONSEQUENCETYPE_NEW_LABEL_METHODDEF    \
-    {"new_label", (PyCFunction)InstructionSequenceType_new_label, METH_NOARGS, InstructionSequenceType_new_label__doc__},
+    {"new_label", InstructionSequenceType_new_label, METH_NOARGS, InstructionSequenceType_new_label__doc__},
 
 static int
 InstructionSequenceType_new_label_impl(_PyInstructionSequence *self);
@@ -282,7 +282,7 @@ PyDoc_STRVAR(InstructionSequenceType_get_nested__doc__,
 "Add a nested sequence.");
 
 #define INSTRUCTIONSEQUENCETYPE_GET_NESTED_METHODDEF    \
-    {"get_nested", (PyCFunction)InstructionSequenceType_get_nested, METH_NOARGS, InstructionSequenceType_get_nested__doc__},
+    {"get_nested", InstructionSequenceType_get_nested, METH_NOARGS, InstructionSequenceType_get_nested__doc__},
 
 static PyObject *
 InstructionSequenceType_get_nested_impl(_PyInstructionSequence *self);
@@ -300,7 +300,7 @@ PyDoc_STRVAR(InstructionSequenceType_get_instructions__doc__,
 "Return the instructions as a list of tuples or labels.");
 
 #define INSTRUCTIONSEQUENCETYPE_GET_INSTRUCTIONS_METHODDEF    \
-    {"get_instructions", (PyCFunction)InstructionSequenceType_get_instructions, METH_NOARGS, InstructionSequenceType_get_instructions__doc__},
+    {"get_instructions", InstructionSequenceType_get_instructions, METH_NOARGS, InstructionSequenceType_get_instructions__doc__},
 
 static PyObject *
 InstructionSequenceType_get_instructions_impl(_PyInstructionSequence *self);
@@ -310,4 +310,4 @@ InstructionSequenceType_get_instructions(PyObject *self, PyObject *Py_UNUSED(ign
 {
     return InstructionSequenceType_get_instructions_impl((_PyInstructionSequence *)self);
 }
-/*[clinic end generated code: output=c80501a59a1a1103 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=294ffcd6a7c5f171 input=a9049054013a1b77]*/
diff --git a/Python/clinic/instrumentation.c.h b/Python/clinic/instrumentation.c.h
index 9b3373bc1a67a5..7fee9c3b3628cf 100644
--- a/Python/clinic/instrumentation.c.h
+++ b/Python/clinic/instrumentation.c.h
@@ -42,7 +42,7 @@ PyDoc_STRVAR(monitoring_clear_tool_id__doc__,
 "\n");
 
 #define MONITORING_CLEAR_TOOL_ID_METHODDEF    \
-    {"clear_tool_id", (PyCFunction)monitoring_clear_tool_id, METH_O, monitoring_clear_tool_id__doc__},
+    {"clear_tool_id", monitoring_clear_tool_id, METH_O, monitoring_clear_tool_id__doc__},
 
 static PyObject *
 monitoring_clear_tool_id_impl(PyObject *module, int tool_id);
@@ -69,7 +69,7 @@ PyDoc_STRVAR(monitoring_free_tool_id__doc__,
 "\n");
 
 #define MONITORING_FREE_TOOL_ID_METHODDEF    \
-    {"free_tool_id", (PyCFunction)monitoring_free_tool_id, METH_O, monitoring_free_tool_id__doc__},
+    {"free_tool_id", monitoring_free_tool_id, METH_O, monitoring_free_tool_id__doc__},
 
 static PyObject *
 monitoring_free_tool_id_impl(PyObject *module, int tool_id);
@@ -96,7 +96,7 @@ PyDoc_STRVAR(monitoring_get_tool__doc__,
 "\n");
 
 #define MONITORING_GET_TOOL_METHODDEF    \
-    {"get_tool", (PyCFunction)monitoring_get_tool, METH_O, monitoring_get_tool__doc__},
+    {"get_tool", monitoring_get_tool, METH_O, monitoring_get_tool__doc__},
 
 static PyObject *
 monitoring_get_tool_impl(PyObject *module, int tool_id);
@@ -161,7 +161,7 @@ PyDoc_STRVAR(monitoring_get_events__doc__,
 "\n");
 
 #define MONITORING_GET_EVENTS_METHODDEF    \
-    {"get_events", (PyCFunction)monitoring_get_events, METH_O, monitoring_get_events__doc__},
+    {"get_events", monitoring_get_events, METH_O, monitoring_get_events__doc__},
 
 static int
 monitoring_get_events_impl(PyObject *module, int tool_id);
@@ -304,7 +304,7 @@ PyDoc_STRVAR(monitoring_restart_events__doc__,
 "\n");
 
 #define MONITORING_RESTART_EVENTS_METHODDEF    \
-    {"restart_events", (PyCFunction)monitoring_restart_events, METH_NOARGS, monitoring_restart_events__doc__},
+    {"restart_events", monitoring_restart_events, METH_NOARGS, monitoring_restart_events__doc__},
 
 static PyObject *
 monitoring_restart_events_impl(PyObject *module);
@@ -321,7 +321,7 @@ PyDoc_STRVAR(monitoring__all_events__doc__,
 "\n");
 
 #define MONITORING__ALL_EVENTS_METHODDEF    \
-    {"_all_events", (PyCFunction)monitoring__all_events, METH_NOARGS, monitoring__all_events__doc__},
+    {"_all_events", monitoring__all_events, METH_NOARGS, monitoring__all_events__doc__},
 
 static PyObject *
 monitoring__all_events_impl(PyObject *module);
@@ -331,4 +331,4 @@ monitoring__all_events(PyObject *module, PyObject *Py_UNUSED(ignored))
 {
     return monitoring__all_events_impl(module);
 }
-/*[clinic end generated code: output=8f81876c6aba9be8 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c67603c41007f5ba input=a9049054013a1b77]*/
diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h
index 8b73ccefc30ee5..adc904d7f20c36 100644
--- a/Python/clinic/sysmodule.c.h
+++ b/Python/clinic/sysmodule.c.h
@@ -122,7 +122,7 @@ PyDoc_STRVAR(sys_displayhook__doc__,
 "Print an object to sys.stdout and also save it in builtins._");
 
 #define SYS_DISPLAYHOOK_METHODDEF    \
-    {"displayhook", (PyCFunction)sys_displayhook, METH_O, sys_displayhook__doc__},
+    {"displayhook", sys_displayhook, METH_O, sys_displayhook__doc__},
 
 PyDoc_STRVAR(sys_excepthook__doc__,
 "excepthook($module, exctype, value, traceback, /)\n"
@@ -168,7 +168,7 @@ PyDoc_STRVAR(sys_exception__doc__,
 "if no such exception exists.");
 
 #define SYS_EXCEPTION_METHODDEF    \
-    {"exception", (PyCFunction)sys_exception, METH_NOARGS, sys_exception__doc__},
+    {"exception", sys_exception, METH_NOARGS, sys_exception__doc__},
 
 static PyObject *
 sys_exception_impl(PyObject *module);
@@ -189,7 +189,7 @@ PyDoc_STRVAR(sys_exc_info__doc__,
 "clause in the current stack frame or in an older stack frame.");
 
 #define SYS_EXC_INFO_METHODDEF    \
-    {"exc_info", (PyCFunction)sys_exc_info, METH_NOARGS, sys_exc_info__doc__},
+    {"exc_info", sys_exc_info, METH_NOARGS, sys_exc_info__doc__},
 
 static PyObject *
 sys_exc_info_impl(PyObject *module);
@@ -215,7 +215,7 @@ PyDoc_STRVAR(sys_unraisablehook__doc__,
 "* object: Object causing the exception, can be None.");
 
 #define SYS_UNRAISABLEHOOK_METHODDEF    \
-    {"unraisablehook", (PyCFunction)sys_unraisablehook, METH_O, sys_unraisablehook__doc__},
+    {"unraisablehook", sys_unraisablehook, METH_O, sys_unraisablehook__doc__},
 
 PyDoc_STRVAR(sys_exit__doc__,
 "exit($module, status=None, /)\n"
@@ -261,7 +261,7 @@ PyDoc_STRVAR(sys_getdefaultencoding__doc__,
 "Return the current default encoding used by the Unicode implementation.");
 
 #define SYS_GETDEFAULTENCODING_METHODDEF    \
-    {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding, METH_NOARGS, sys_getdefaultencoding__doc__},
+    {"getdefaultencoding", sys_getdefaultencoding, METH_NOARGS, sys_getdefaultencoding__doc__},
 
 static PyObject *
 sys_getdefaultencoding_impl(PyObject *module);
@@ -279,7 +279,7 @@ PyDoc_STRVAR(sys_getfilesystemencoding__doc__,
 "Return the encoding used to convert Unicode filenames to OS filenames.");
 
 #define SYS_GETFILESYSTEMENCODING_METHODDEF    \
-    {"getfilesystemencoding", (PyCFunction)sys_getfilesystemencoding, METH_NOARGS, sys_getfilesystemencoding__doc__},
+    {"getfilesystemencoding", sys_getfilesystemencoding, METH_NOARGS, sys_getfilesystemencoding__doc__},
 
 static PyObject *
 sys_getfilesystemencoding_impl(PyObject *module);
@@ -297,7 +297,7 @@ PyDoc_STRVAR(sys_getfilesystemencodeerrors__doc__,
 "Return the error mode used Unicode to OS filename conversion.");
 
 #define SYS_GETFILESYSTEMENCODEERRORS_METHODDEF    \
-    {"getfilesystemencodeerrors", (PyCFunction)sys_getfilesystemencodeerrors, METH_NOARGS, sys_getfilesystemencodeerrors__doc__},
+    {"getfilesystemencodeerrors", sys_getfilesystemencodeerrors, METH_NOARGS, sys_getfilesystemencodeerrors__doc__},
 
 static PyObject *
 sys_getfilesystemencodeerrors_impl(PyObject *module);
@@ -319,7 +319,7 @@ PyDoc_STRVAR(sys_intern__doc__,
 "the previously interned string object with the same value.");
 
 #define SYS_INTERN_METHODDEF    \
-    {"intern", (PyCFunction)sys_intern, METH_O, sys_intern__doc__},
+    {"intern", sys_intern, METH_O, sys_intern__doc__},
 
 static PyObject *
 sys_intern_impl(PyObject *module, PyObject *s);
@@ -348,7 +348,7 @@ PyDoc_STRVAR(sys__is_interned__doc__,
 "Return True if the given string is \"interned\".");
 
 #define SYS__IS_INTERNED_METHODDEF    \
-    {"_is_interned", (PyCFunction)sys__is_interned, METH_O, sys__is_interned__doc__},
+    {"_is_interned", sys__is_interned, METH_O, sys__is_interned__doc__},
 
 static int
 sys__is_interned_impl(PyObject *module, PyObject *string);
@@ -384,7 +384,7 @@ PyDoc_STRVAR(sys__is_immortal__doc__,
 "This function should be used for specialized purposes only.");
 
 #define SYS__IS_IMMORTAL_METHODDEF    \
-    {"_is_immortal", (PyCFunction)sys__is_immortal, METH_O, sys__is_immortal__doc__},
+    {"_is_immortal", sys__is_immortal, METH_O, sys__is_immortal__doc__},
 
 static int
 sys__is_immortal_impl(PyObject *module, PyObject *op);
@@ -415,7 +415,7 @@ PyDoc_STRVAR(sys_settrace__doc__,
 "in the library manual.");
 
 #define SYS_SETTRACE_METHODDEF    \
-    {"settrace", (PyCFunction)sys_settrace, METH_O, sys_settrace__doc__},
+    {"settrace", sys_settrace, METH_O, sys_settrace__doc__},
 
 PyDoc_STRVAR(sys__settraceallthreads__doc__,
 "_settraceallthreads($module, function, /)\n"
@@ -427,7 +427,7 @@ PyDoc_STRVAR(sys__settraceallthreads__doc__,
 "in the library manual.");
 
 #define SYS__SETTRACEALLTHREADS_METHODDEF    \
-    {"_settraceallthreads", (PyCFunction)sys__settraceallthreads, METH_O, sys__settraceallthreads__doc__},
+    {"_settraceallthreads", sys__settraceallthreads, METH_O, sys__settraceallthreads__doc__},
 
 PyDoc_STRVAR(sys_gettrace__doc__,
 "gettrace($module, /)\n"
@@ -438,7 +438,7 @@ PyDoc_STRVAR(sys_gettrace__doc__,
 "See the debugger chapter in the library manual.");
 
 #define SYS_GETTRACE_METHODDEF    \
-    {"gettrace", (PyCFunction)sys_gettrace, METH_NOARGS, sys_gettrace__doc__},
+    {"gettrace", sys_gettrace, METH_NOARGS, sys_gettrace__doc__},
 
 static PyObject *
 sys_gettrace_impl(PyObject *module);
@@ -459,7 +459,7 @@ PyDoc_STRVAR(sys_setprofile__doc__,
 "chapter in the library manual.");
 
 #define SYS_SETPROFILE_METHODDEF    \
-    {"setprofile", (PyCFunction)sys_setprofile, METH_O, sys_setprofile__doc__},
+    {"setprofile", sys_setprofile, METH_O, sys_setprofile__doc__},
 
 PyDoc_STRVAR(sys__setprofileallthreads__doc__,
 "_setprofileallthreads($module, function, /)\n"
@@ -471,7 +471,7 @@ PyDoc_STRVAR(sys__setprofileallthreads__doc__,
 "chapter in the library manual.");
 
 #define SYS__SETPROFILEALLTHREADS_METHODDEF    \
-    {"_setprofileallthreads", (PyCFunction)sys__setprofileallthreads, METH_O, sys__setprofileallthreads__doc__},
+    {"_setprofileallthreads", sys__setprofileallthreads, METH_O, sys__setprofileallthreads__doc__},
 
 PyDoc_STRVAR(sys_getprofile__doc__,
 "getprofile($module, /)\n"
@@ -482,7 +482,7 @@ PyDoc_STRVAR(sys_getprofile__doc__,
 "See the profiler chapter in the library manual.");
 
 #define SYS_GETPROFILE_METHODDEF    \
-    {"getprofile", (PyCFunction)sys_getprofile, METH_NOARGS, sys_getprofile__doc__},
+    {"getprofile", sys_getprofile, METH_NOARGS, sys_getprofile__doc__},
 
 static PyObject *
 sys_getprofile_impl(PyObject *module);
@@ -507,7 +507,7 @@ PyDoc_STRVAR(sys_setswitchinterval__doc__,
 "A typical value is 0.005 (5 milliseconds).");
 
 #define SYS_SETSWITCHINTERVAL_METHODDEF    \
-    {"setswitchinterval", (PyCFunction)sys_setswitchinterval, METH_O, sys_setswitchinterval__doc__},
+    {"setswitchinterval", sys_setswitchinterval, METH_O, sys_setswitchinterval__doc__},
 
 static PyObject *
 sys_setswitchinterval_impl(PyObject *module, double interval);
@@ -541,7 +541,7 @@ PyDoc_STRVAR(sys_getswitchinterval__doc__,
 "Return the current thread switch interval; see sys.setswitchinterval().");
 
 #define SYS_GETSWITCHINTERVAL_METHODDEF    \
-    {"getswitchinterval", (PyCFunction)sys_getswitchinterval, METH_NOARGS, sys_getswitchinterval__doc__},
+    {"getswitchinterval", sys_getswitchinterval, METH_NOARGS, sys_getswitchinterval__doc__},
 
 static double
 sys_getswitchinterval_impl(PyObject *module);
@@ -573,7 +573,7 @@ PyDoc_STRVAR(sys_setrecursionlimit__doc__,
 "dependent.");
 
 #define SYS_SETRECURSIONLIMIT_METHODDEF    \
-    {"setrecursionlimit", (PyCFunction)sys_setrecursionlimit, METH_O, sys_setrecursionlimit__doc__},
+    {"setrecursionlimit", sys_setrecursionlimit, METH_O, sys_setrecursionlimit__doc__},
 
 static PyObject *
 sys_setrecursionlimit_impl(PyObject *module, int new_limit);
@@ -667,7 +667,7 @@ PyDoc_STRVAR(sys_get_coroutine_origin_tracking_depth__doc__,
 "Check status of origin tracking for coroutine objects in this thread.");
 
 #define SYS_GET_COROUTINE_ORIGIN_TRACKING_DEPTH_METHODDEF    \
-    {"get_coroutine_origin_tracking_depth", (PyCFunction)sys_get_coroutine_origin_tracking_depth, METH_NOARGS, sys_get_coroutine_origin_tracking_depth__doc__},
+    {"get_coroutine_origin_tracking_depth", sys_get_coroutine_origin_tracking_depth, METH_NOARGS, sys_get_coroutine_origin_tracking_depth__doc__},
 
 static int
 sys_get_coroutine_origin_tracking_depth_impl(PyObject *module);
@@ -697,7 +697,7 @@ PyDoc_STRVAR(sys_get_asyncgen_hooks__doc__,
 "This returns a namedtuple of the form (firstiter, finalizer).");
 
 #define SYS_GET_ASYNCGEN_HOOKS_METHODDEF    \
-    {"get_asyncgen_hooks", (PyCFunction)sys_get_asyncgen_hooks, METH_NOARGS, sys_get_asyncgen_hooks__doc__},
+    {"get_asyncgen_hooks", sys_get_asyncgen_hooks, METH_NOARGS, sys_get_asyncgen_hooks__doc__},
 
 static PyObject *
 sys_get_asyncgen_hooks_impl(PyObject *module);
@@ -719,7 +719,7 @@ PyDoc_STRVAR(sys_getrecursionlimit__doc__,
 "of the C stack and crashing Python.");
 
 #define SYS_GETRECURSIONLIMIT_METHODDEF    \
-    {"getrecursionlimit", (PyCFunction)sys_getrecursionlimit, METH_NOARGS, sys_getrecursionlimit__doc__},
+    {"getrecursionlimit", sys_getrecursionlimit, METH_NOARGS, sys_getrecursionlimit__doc__},
 
 static PyObject *
 sys_getrecursionlimit_impl(PyObject *module);
@@ -749,7 +749,7 @@ PyDoc_STRVAR(sys_getwindowsversion__doc__,
 "intended for identifying the OS rather than feature detection.");
 
 #define SYS_GETWINDOWSVERSION_METHODDEF    \
-    {"getwindowsversion", (PyCFunction)sys_getwindowsversion, METH_NOARGS, sys_getwindowsversion__doc__},
+    {"getwindowsversion", sys_getwindowsversion, METH_NOARGS, sys_getwindowsversion__doc__},
 
 static PyObject *
 sys_getwindowsversion_impl(PyObject *module);
@@ -777,7 +777,7 @@ PyDoc_STRVAR(sys__enablelegacywindowsfsencoding__doc__,
 "environment variable before launching Python.");
 
 #define SYS__ENABLELEGACYWINDOWSFSENCODING_METHODDEF    \
-    {"_enablelegacywindowsfsencoding", (PyCFunction)sys__enablelegacywindowsfsencoding, METH_NOARGS, sys__enablelegacywindowsfsencoding__doc__},
+    {"_enablelegacywindowsfsencoding", sys__enablelegacywindowsfsencoding, METH_NOARGS, sys__enablelegacywindowsfsencoding__doc__},
 
 static PyObject *
 sys__enablelegacywindowsfsencoding_impl(PyObject *module);
@@ -807,7 +807,7 @@ PyDoc_STRVAR(sys_setdlopenflags__doc__,
 "os.RTLD_LAZY).");
 
 #define SYS_SETDLOPENFLAGS_METHODDEF    \
-    {"setdlopenflags", (PyCFunction)sys_setdlopenflags, METH_O, sys_setdlopenflags__doc__},
+    {"setdlopenflags", sys_setdlopenflags, METH_O, sys_setdlopenflags__doc__},
 
 static PyObject *
 sys_setdlopenflags_impl(PyObject *module, int new_val);
@@ -841,7 +841,7 @@ PyDoc_STRVAR(sys_getdlopenflags__doc__,
 "The flag constants are defined in the os module.");
 
 #define SYS_GETDLOPENFLAGS_METHODDEF    \
-    {"getdlopenflags", (PyCFunction)sys_getdlopenflags, METH_NOARGS, sys_getdlopenflags__doc__},
+    {"getdlopenflags", sys_getdlopenflags, METH_NOARGS, sys_getdlopenflags__doc__},
 
 static PyObject *
 sys_getdlopenflags_impl(PyObject *module);
@@ -862,7 +862,7 @@ PyDoc_STRVAR(sys_mdebug__doc__,
 "\n");
 
 #define SYS_MDEBUG_METHODDEF    \
-    {"mdebug", (PyCFunction)sys_mdebug, METH_O, sys_mdebug__doc__},
+    {"mdebug", sys_mdebug, METH_O, sys_mdebug__doc__},
 
 static PyObject *
 sys_mdebug_impl(PyObject *module, int flag);
@@ -892,7 +892,7 @@ PyDoc_STRVAR(sys_get_int_max_str_digits__doc__,
 "Return the maximum string digits limit for non-binary int<->str conversions.");
 
 #define SYS_GET_INT_MAX_STR_DIGITS_METHODDEF    \
-    {"get_int_max_str_digits", (PyCFunction)sys_get_int_max_str_digits, METH_NOARGS, sys_get_int_max_str_digits__doc__},
+    {"get_int_max_str_digits", sys_get_int_max_str_digits, METH_NOARGS, sys_get_int_max_str_digits__doc__},
 
 static PyObject *
 sys_get_int_max_str_digits_impl(PyObject *module);
@@ -975,7 +975,7 @@ PyDoc_STRVAR(sys_getrefcount__doc__,
 "getrefcount().");
 
 #define SYS_GETREFCOUNT_METHODDEF    \
-    {"getrefcount", (PyCFunction)sys_getrefcount, METH_O, sys_getrefcount__doc__},
+    {"getrefcount", sys_getrefcount, METH_O, sys_getrefcount__doc__},
 
 static Py_ssize_t
 sys_getrefcount_impl(PyObject *module, PyObject *object);
@@ -1004,7 +1004,7 @@ PyDoc_STRVAR(sys_gettotalrefcount__doc__,
 "\n");
 
 #define SYS_GETTOTALREFCOUNT_METHODDEF    \
-    {"gettotalrefcount", (PyCFunction)sys_gettotalrefcount, METH_NOARGS, sys_gettotalrefcount__doc__},
+    {"gettotalrefcount", sys_gettotalrefcount, METH_NOARGS, sys_gettotalrefcount__doc__},
 
 static Py_ssize_t
 sys_gettotalrefcount_impl(PyObject *module);
@@ -1034,7 +1034,7 @@ PyDoc_STRVAR(sys_getallocatedblocks__doc__,
 "Return the number of memory blocks currently allocated.");
 
 #define SYS_GETALLOCATEDBLOCKS_METHODDEF    \
-    {"getallocatedblocks", (PyCFunction)sys_getallocatedblocks, METH_NOARGS, sys_getallocatedblocks__doc__},
+    {"getallocatedblocks", sys_getallocatedblocks, METH_NOARGS, sys_getallocatedblocks__doc__},
 
 static Py_ssize_t
 sys_getallocatedblocks_impl(PyObject *module);
@@ -1178,7 +1178,7 @@ PyDoc_STRVAR(sys__current_frames__doc__,
 "This function should be used for specialized purposes only.");
 
 #define SYS__CURRENT_FRAMES_METHODDEF    \
-    {"_current_frames", (PyCFunction)sys__current_frames, METH_NOARGS, sys__current_frames__doc__},
+    {"_current_frames", sys__current_frames, METH_NOARGS, sys__current_frames__doc__},
 
 static PyObject *
 sys__current_frames_impl(PyObject *module);
@@ -1198,7 +1198,7 @@ PyDoc_STRVAR(sys__current_exceptions__doc__,
 "This function should be used for specialized purposes only.");
 
 #define SYS__CURRENT_EXCEPTIONS_METHODDEF    \
-    {"_current_exceptions", (PyCFunction)sys__current_exceptions, METH_NOARGS, sys__current_exceptions__doc__},
+    {"_current_exceptions", sys__current_exceptions, METH_NOARGS, sys__current_exceptions__doc__},
 
 static PyObject *
 sys__current_exceptions_impl(PyObject *module);
@@ -1257,7 +1257,7 @@ PyDoc_STRVAR(sys__debugmallocstats__doc__,
 "checks.");
 
 #define SYS__DEBUGMALLOCSTATS_METHODDEF    \
-    {"_debugmallocstats", (PyCFunction)sys__debugmallocstats, METH_NOARGS, sys__debugmallocstats__doc__},
+    {"_debugmallocstats", sys__debugmallocstats, METH_NOARGS, sys__debugmallocstats__doc__},
 
 static PyObject *
 sys__debugmallocstats_impl(PyObject *module);
@@ -1275,7 +1275,7 @@ PyDoc_STRVAR(sys__clear_type_cache__doc__,
 "Clear the internal type lookup cache.");
 
 #define SYS__CLEAR_TYPE_CACHE_METHODDEF    \
-    {"_clear_type_cache", (PyCFunction)sys__clear_type_cache, METH_NOARGS, sys__clear_type_cache__doc__},
+    {"_clear_type_cache", sys__clear_type_cache, METH_NOARGS, sys__clear_type_cache__doc__},
 
 static PyObject *
 sys__clear_type_cache_impl(PyObject *module);
@@ -1293,7 +1293,7 @@ PyDoc_STRVAR(sys__clear_internal_caches__doc__,
 "Clear all internal performance-related caches.");
 
 #define SYS__CLEAR_INTERNAL_CACHES_METHODDEF    \
-    {"_clear_internal_caches", (PyCFunction)sys__clear_internal_caches, METH_NOARGS, sys__clear_internal_caches__doc__},
+    {"_clear_internal_caches", sys__clear_internal_caches, METH_NOARGS, sys__clear_internal_caches__doc__},
 
 static PyObject *
 sys__clear_internal_caches_impl(PyObject *module);
@@ -1311,7 +1311,7 @@ PyDoc_STRVAR(sys_is_finalizing__doc__,
 "Return True if Python is exiting.");
 
 #define SYS_IS_FINALIZING_METHODDEF    \
-    {"is_finalizing", (PyCFunction)sys_is_finalizing, METH_NOARGS, sys_is_finalizing__doc__},
+    {"is_finalizing", sys_is_finalizing, METH_NOARGS, sys_is_finalizing__doc__},
 
 static PyObject *
 sys_is_finalizing_impl(PyObject *module);
@@ -1331,7 +1331,7 @@ PyDoc_STRVAR(sys__stats_on__doc__,
 "Turns on stats gathering (stats gathering is off by default).");
 
 #define SYS__STATS_ON_METHODDEF    \
-    {"_stats_on", (PyCFunction)sys__stats_on, METH_NOARGS, sys__stats_on__doc__},
+    {"_stats_on", sys__stats_on, METH_NOARGS, sys__stats_on__doc__},
 
 static PyObject *
 sys__stats_on_impl(PyObject *module);
@@ -1353,7 +1353,7 @@ PyDoc_STRVAR(sys__stats_off__doc__,
 "Turns off stats gathering (stats gathering is off by default).");
 
 #define SYS__STATS_OFF_METHODDEF    \
-    {"_stats_off", (PyCFunction)sys__stats_off, METH_NOARGS, sys__stats_off__doc__},
+    {"_stats_off", sys__stats_off, METH_NOARGS, sys__stats_off__doc__},
 
 static PyObject *
 sys__stats_off_impl(PyObject *module);
@@ -1375,7 +1375,7 @@ PyDoc_STRVAR(sys__stats_clear__doc__,
 "Clears the stats.");
 
 #define SYS__STATS_CLEAR_METHODDEF    \
-    {"_stats_clear", (PyCFunction)sys__stats_clear, METH_NOARGS, sys__stats_clear__doc__},
+    {"_stats_clear", sys__stats_clear, METH_NOARGS, sys__stats_clear__doc__},
 
 static PyObject *
 sys__stats_clear_impl(PyObject *module);
@@ -1399,7 +1399,7 @@ PyDoc_STRVAR(sys__stats_dump__doc__,
 "Return False if no statistics were not dumped because stats gathering was off.");
 
 #define SYS__STATS_DUMP_METHODDEF    \
-    {"_stats_dump", (PyCFunction)sys__stats_dump, METH_NOARGS, sys__stats_dump__doc__},
+    {"_stats_dump", sys__stats_dump, METH_NOARGS, sys__stats_dump__doc__},
 
 static int
 sys__stats_dump_impl(PyObject *module);
@@ -1431,7 +1431,7 @@ PyDoc_STRVAR(sys_getandroidapilevel__doc__,
 "Return the build time API version of Android as an integer.");
 
 #define SYS_GETANDROIDAPILEVEL_METHODDEF    \
-    {"getandroidapilevel", (PyCFunction)sys_getandroidapilevel, METH_NOARGS, sys_getandroidapilevel__doc__},
+    {"getandroidapilevel", sys_getandroidapilevel, METH_NOARGS, sys_getandroidapilevel__doc__},
 
 static PyObject *
 sys_getandroidapilevel_impl(PyObject *module);
@@ -1451,7 +1451,7 @@ PyDoc_STRVAR(sys_activate_stack_trampoline__doc__,
 "Activate stack profiler trampoline *backend*.");
 
 #define SYS_ACTIVATE_STACK_TRAMPOLINE_METHODDEF    \
-    {"activate_stack_trampoline", (PyCFunction)sys_activate_stack_trampoline, METH_O, sys_activate_stack_trampoline__doc__},
+    {"activate_stack_trampoline", sys_activate_stack_trampoline, METH_O, sys_activate_stack_trampoline__doc__},
 
 static PyObject *
 sys_activate_stack_trampoline_impl(PyObject *module, const char *backend);
@@ -1490,7 +1490,7 @@ PyDoc_STRVAR(sys_deactivate_stack_trampoline__doc__,
 "If no stack profiler is activated, this function has no effect.");
 
 #define SYS_DEACTIVATE_STACK_TRAMPOLINE_METHODDEF    \
-    {"deactivate_stack_trampoline", (PyCFunction)sys_deactivate_stack_trampoline, METH_NOARGS, sys_deactivate_stack_trampoline__doc__},
+    {"deactivate_stack_trampoline", sys_deactivate_stack_trampoline, METH_NOARGS, sys_deactivate_stack_trampoline__doc__},
 
 static PyObject *
 sys_deactivate_stack_trampoline_impl(PyObject *module);
@@ -1508,7 +1508,7 @@ PyDoc_STRVAR(sys_is_stack_trampoline_active__doc__,
 "Return *True* if a stack profiler trampoline is active.");
 
 #define SYS_IS_STACK_TRAMPOLINE_ACTIVE_METHODDEF    \
-    {"is_stack_trampoline_active", (PyCFunction)sys_is_stack_trampoline_active, METH_NOARGS, sys_is_stack_trampoline_active__doc__},
+    {"is_stack_trampoline_active", sys_is_stack_trampoline_active, METH_NOARGS, sys_is_stack_trampoline_active__doc__},
 
 static PyObject *
 sys_is_stack_trampoline_active_impl(PyObject *module);
@@ -1526,7 +1526,7 @@ PyDoc_STRVAR(sys_is_remote_debug_enabled__doc__,
 "Return True if remote debugging is enabled, False otherwise.");
 
 #define SYS_IS_REMOTE_DEBUG_ENABLED_METHODDEF    \
-    {"is_remote_debug_enabled", (PyCFunction)sys_is_remote_debug_enabled, METH_NOARGS, sys_is_remote_debug_enabled__doc__},
+    {"is_remote_debug_enabled", sys_is_remote_debug_enabled, METH_NOARGS, sys_is_remote_debug_enabled__doc__},
 
 static PyObject *
 sys_is_remote_debug_enabled_impl(PyObject *module);
@@ -1754,7 +1754,7 @@ PyDoc_STRVAR(sys__get_cpu_count_config__doc__,
 "Private function for getting PyConfig.cpu_count");
 
 #define SYS__GET_CPU_COUNT_CONFIG_METHODDEF    \
-    {"_get_cpu_count_config", (PyCFunction)sys__get_cpu_count_config, METH_NOARGS, sys__get_cpu_count_config__doc__},
+    {"_get_cpu_count_config", sys__get_cpu_count_config, METH_NOARGS, sys__get_cpu_count_config__doc__},
 
 static int
 sys__get_cpu_count_config_impl(PyObject *module);
@@ -1782,7 +1782,7 @@ PyDoc_STRVAR(sys__baserepl__doc__,
 "Private function for getting the base REPL");
 
 #define SYS__BASEREPL_METHODDEF    \
-    {"_baserepl", (PyCFunction)sys__baserepl, METH_NOARGS, sys__baserepl__doc__},
+    {"_baserepl", sys__baserepl, METH_NOARGS, sys__baserepl__doc__},
 
 static PyObject *
 sys__baserepl_impl(PyObject *module);
@@ -1800,7 +1800,7 @@ PyDoc_STRVAR(sys__is_gil_enabled__doc__,
 "Return True if the GIL is currently enabled and False otherwise.");
 
 #define SYS__IS_GIL_ENABLED_METHODDEF    \
-    {"_is_gil_enabled", (PyCFunction)sys__is_gil_enabled, METH_NOARGS, sys__is_gil_enabled__doc__},
+    {"_is_gil_enabled", sys__is_gil_enabled, METH_NOARGS, sys__is_gil_enabled__doc__},
 
 static int
 sys__is_gil_enabled_impl(PyObject *module);
@@ -1864,4 +1864,4 @@ sys__is_gil_enabled(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef SYS_GETANDROIDAPILEVEL_METHODDEF
     #define SYS_GETANDROIDAPILEVEL_METHODDEF
 #endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */
-/*[clinic end generated code: output=1aca52cefbeb800f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5b82be89e8d0bfd5 input=a9049054013a1b77]*/
diff --git a/Python/clinic/traceback.c.h b/Python/clinic/traceback.c.h
index deae2efa3eb28d..6cbc1230d402f4 100644
--- a/Python/clinic/traceback.c.h
+++ b/Python/clinic/traceback.c.h
@@ -88,9 +88,9 @@ tb_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 #endif
 #if defined(TRACEBACK_TB_NEXT_GETSETDEF)
 #  undef TRACEBACK_TB_NEXT_GETSETDEF
-#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", (getter)traceback_tb_next_get, (setter)traceback_tb_next_set, traceback_tb_next_DOCSTR},
+#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", traceback_tb_next_get, traceback_tb_next_set, traceback_tb_next_DOCSTR},
 #else
-#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", (getter)traceback_tb_next_get, NULL, traceback_tb_next_DOCSTR},
+#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", traceback_tb_next_get, NULL, traceback_tb_next_DOCSTR},
 #endif
 
 static PyObject *
@@ -113,9 +113,9 @@ traceback_tb_next_get(PyObject *self, void *Py_UNUSED(context))
 #endif
 #if defined(TRACEBACK_TB_NEXT_GETSETDEF)
 #  undef TRACEBACK_TB_NEXT_GETSETDEF
-#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", (getter)traceback_tb_next_get, (setter)traceback_tb_next_set, traceback_tb_next_DOCSTR},
+#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", traceback_tb_next_get, traceback_tb_next_set, traceback_tb_next_DOCSTR},
 #else
-#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", NULL, (setter)traceback_tb_next_set, NULL},
+#  define TRACEBACK_TB_NEXT_GETSETDEF {"tb_next", NULL, traceback_tb_next_set, NULL},
 #endif
 
 static int
@@ -132,4 +132,4 @@ traceback_tb_next_set(PyObject *self, PyObject *value, void *Py_UNUSED(context))
 
     return return_value;
 }
-/*[clinic end generated code: output=5361141395da963e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0299839a87b2b51e input=a9049054013a1b77]*/
diff --git a/Tools/clinic/libclinic/parse_args.py b/Tools/clinic/libclinic/parse_args.py
index 0e15d2f163b816..8bacef9156ccd0 100644
--- a/Tools/clinic/libclinic/parse_args.py
+++ b/Tools/clinic/libclinic/parse_args.py
@@ -167,9 +167,9 @@ def declare_parser(
     #endif
     #if defined({getset_name}_GETSETDEF)
     #  undef {getset_name}_GETSETDEF
-    #  define {getset_name}_GETSETDEF {{"{name}", (getter){getset_basename}_get, (setter){getset_basename}_set, {getset_basename}_DOCSTR}},
+    #  define {getset_name}_GETSETDEF {{"{name}", {getset_basename}_get, {getset_basename}_set, {getset_basename}_DOCSTR}},
     #else
-    #  define {getset_name}_GETSETDEF {{"{name}", (getter){getset_basename}_get, NULL, {getset_basename}_DOCSTR}},
+    #  define {getset_name}_GETSETDEF {{"{name}", {getset_basename}_get, NULL, {getset_basename}_DOCSTR}},
     #endif
 """)
 SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
@@ -178,9 +178,9 @@ def declare_parser(
     #endif
     #if defined({getset_name}_GETSETDEF)
     #  undef {getset_name}_GETSETDEF
-    #  define {getset_name}_GETSETDEF {{"{name}", (getter){getset_basename}_get, (setter){getset_basename}_set, {getset_basename}_DOCSTR}},
+    #  define {getset_name}_GETSETDEF {{"{name}", {getset_basename}_get, {getset_basename}_set, {getset_basename}_DOCSTR}},
     #else
-    #  define {getset_name}_GETSETDEF {{"{name}", NULL, (setter){getset_basename}_set, NULL}},
+    #  define {getset_name}_GETSETDEF {{"{name}", NULL, {getset_basename}_set, NULL}},
     #endif
 """)
 METHODDEF_PROTOTYPE_IFNDEF: Final[str] = libclinic.normalize_snippet("""
@@ -836,9 +836,9 @@ def handle_new_or_init(self) -> None:
     def process_methoddef(self, clang: CLanguage) -> None:
         methoddef_cast_end = ""
         if self.flags in ('METH_NOARGS', 'METH_O', 'METH_VARARGS'):
-            methoddef_cast = "(PyCFunction)"
+            methoddef_cast = ""  # no need for a PyCFunction cast
         elif self.func.kind is GETTER:
-            methoddef_cast = "" # This should end up unused
+            methoddef_cast = ""  # this should end up unused
         elif self.limited_capi:
             methoddef_cast = "(PyCFunction)(void(*)(void))"
         else:

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/131665.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/131665.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/131665.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/131665.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>