diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index 83c3a3b..3e7f187 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -391,8 +391,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_ConnectNamedPipe_impl(PyModuleDef *module, HANDLE handle, int use_overlapped)
-/*[clinic end generated code: output=d9a64e59c27e10f6 input=edc83da007ebf3be]*/
+_winapi_ConnectNamedPipe_impl(PyModuleDef *module, HANDLE handle,
+                              int use_overlapped)
+/*[clinic end generated code: output=fed3b165d1bca95a input=edc83da007ebf3be]*/
 {
     BOOL success;
     OverlappedObject *overlapped = NULL;
@@ -442,8 +443,12 @@
 [clinic start generated code]*/
 
 static HANDLE
-_winapi_CreateFile_impl(PyModuleDef *module, LPCTSTR file_name, DWORD desired_access, DWORD share_mode, LPSECURITY_ATTRIBUTES security_attributes, DWORD creation_disposition, DWORD flags_and_attributes, HANDLE template_file)
-/*[clinic end generated code: output=f8649129a4959288 input=6423c3e40372dbd5]*/
+_winapi_CreateFile_impl(PyModuleDef *module, LPCTSTR file_name,
+                        DWORD desired_access, DWORD share_mode,
+                        LPSECURITY_ATTRIBUTES security_attributes,
+                        DWORD creation_disposition,
+                        DWORD flags_and_attributes, HANDLE template_file)
+/*[clinic end generated code: output=c6e1d78f8affd10c input=6423c3e40372dbd5]*/
 {
     HANDLE handle;
 
@@ -469,8 +474,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_CreateJunction_impl(PyModuleDef *module, LPWSTR src_path, LPWSTR dst_path)
-/*[clinic end generated code: output=df22af7be7045584 input=8cd1f9964b6e3d36]*/
+_winapi_CreateJunction_impl(PyModuleDef *module, LPWSTR src_path,
+                            LPWSTR dst_path)
+/*[clinic end generated code: output=eccae9364e46f6da input=8cd1f9964b6e3d36]*/
 {
     /* Privilege adjustment */
     HANDLE token = NULL;
@@ -611,8 +617,12 @@
 [clinic start generated code]*/
 
 static HANDLE
-_winapi_CreateNamedPipe_impl(PyModuleDef *module, LPCTSTR name, DWORD open_mode, DWORD pipe_mode, DWORD max_instances, DWORD out_buffer_size, DWORD in_buffer_size, DWORD default_timeout, LPSECURITY_ATTRIBUTES security_attributes)
-/*[clinic end generated code: output=711e231639c25c24 input=5a73530b84d8bc37]*/
+_winapi_CreateNamedPipe_impl(PyModuleDef *module, LPCTSTR name,
+                             DWORD open_mode, DWORD pipe_mode,
+                             DWORD max_instances, DWORD out_buffer_size,
+                             DWORD in_buffer_size, DWORD default_timeout,
+                             LPSECURITY_ATTRIBUTES security_attributes)
+/*[clinic end generated code: output=44ca2a06a219b523 input=5a73530b84d8bc37]*/
 {
     HANDLE handle;
 
@@ -643,8 +653,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_CreatePipe_impl(PyModuleDef *module, PyObject *pipe_attrs, DWORD size)
-/*[clinic end generated code: output=ed09baf1d43086df input=c4f2cfa56ef68d90]*/
+_winapi_CreatePipe_impl(PyModuleDef *module, PyObject *pipe_attrs,
+                        DWORD size)
+/*[clinic end generated code: output=fef99f3b4222bc78 input=c4f2cfa56ef68d90]*/
 {
     HANDLE read_pipe;
     HANDLE write_pipe;
@@ -783,8 +794,8 @@
 /*[clinic input]
 _winapi.CreateProcess
 
-    application_name: Py_UNICODE(nullable=True)
-    command_line: Py_UNICODE(nullable=True)
+    application_name: Py_UNICODE(accept={str, NoneType})
+    command_line: Py_UNICODE(accept={str, NoneType})
     proc_attrs: object
         Ignored internally, can be None.
     thread_attrs: object
@@ -792,7 +803,7 @@
     inherit_handles: BOOL
     creation_flags: DWORD
     env_mapping: object
-    current_directory: Py_UNICODE(nullable=True)
+    current_directory: Py_UNICODE(accept={str, NoneType})
     startup_info: object
     /
 
@@ -803,8 +814,13 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_CreateProcess_impl(PyModuleDef *module, Py_UNICODE *application_name, Py_UNICODE *command_line, PyObject *proc_attrs, PyObject *thread_attrs, BOOL inherit_handles, DWORD creation_flags, PyObject *env_mapping, Py_UNICODE *current_directory, PyObject *startup_info)
-/*[clinic end generated code: output=c279c1271b4c45cf input=6667ea0bc7036472]*/
+_winapi_CreateProcess_impl(PyModuleDef *module, Py_UNICODE *application_name,
+                           Py_UNICODE *command_line, PyObject *proc_attrs,
+                           PyObject *thread_attrs, BOOL inherit_handles,
+                           DWORD creation_flags, PyObject *env_mapping,
+                           Py_UNICODE *current_directory,
+                           PyObject *startup_info)
+/*[clinic end generated code: output=874bb350ff9ed4ef input=4a43b05038d639bb]*/
 {
     BOOL result;
     PROCESS_INFORMATION pi;
@@ -884,8 +900,13 @@
 [clinic start generated code]*/
 
 static HANDLE
-_winapi_DuplicateHandle_impl(PyModuleDef *module, HANDLE source_process_handle, HANDLE source_handle, HANDLE target_process_handle, DWORD desired_access, BOOL inherit_handle, DWORD options)
-/*[clinic end generated code: output=24a7836ca4d94aba input=b933e3f2356a8c12]*/
+_winapi_DuplicateHandle_impl(PyModuleDef *module,
+                             HANDLE source_process_handle,
+                             HANDLE source_handle,
+                             HANDLE target_process_handle,
+                             DWORD desired_access, BOOL inherit_handle,
+                             DWORD options)
+/*[clinic end generated code: output=0799515b68b5237b input=b933e3f2356a8c12]*/
 {
     HANDLE target_handle;
     BOOL result;
@@ -1074,8 +1095,9 @@
 [clinic start generated code]*/
 
 static HANDLE
-_winapi_OpenProcess_impl(PyModuleDef *module, DWORD desired_access, BOOL inherit_handle, DWORD process_id)
-/*[clinic end generated code: output=2a7be5336f16f63c input=ec98c4cf4ea2ec36]*/
+_winapi_OpenProcess_impl(PyModuleDef *module, DWORD desired_access,
+                         BOOL inherit_handle, DWORD process_id)
+/*[clinic end generated code: output=6bc52eda82a3d226 input=ec98c4cf4ea2ec36]*/
 {
     HANDLE handle;
 
@@ -1145,8 +1167,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_ReadFile_impl(PyModuleDef *module, HANDLE handle, int size, int use_overlapped)
-/*[clinic end generated code: output=5a087be0ff44479a input=8dd810194e86ac7d]*/
+_winapi_ReadFile_impl(PyModuleDef *module, HANDLE handle, int size,
+                      int use_overlapped)
+/*[clinic end generated code: output=d7695db4db97b135 input=8dd810194e86ac7d]*/
 {
     DWORD nread;
     PyObject *buf;
@@ -1206,8 +1229,11 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_SetNamedPipeHandleState_impl(PyModuleDef *module, HANDLE named_pipe, PyObject *mode, PyObject *max_collection_count, PyObject *collect_data_timeout)
-/*[clinic end generated code: output=327efd18ff0c30ec input=9142d72163d0faa6]*/
+_winapi_SetNamedPipeHandleState_impl(PyModuleDef *module, HANDLE named_pipe,
+                                     PyObject *mode,
+                                     PyObject *max_collection_count,
+                                     PyObject *collect_data_timeout)
+/*[clinic end generated code: output=25aa3c28dee223ce input=9142d72163d0faa6]*/
 {
     PyObject *oArgs[3] = {mode, max_collection_count, collect_data_timeout};
     DWORD dwArgs[3], *pArgs[3] = {NULL, NULL, NULL};
@@ -1242,8 +1268,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_TerminateProcess_impl(PyModuleDef *module, HANDLE handle, UINT exit_code)
-/*[clinic end generated code: output=1559f0f6500c2283 input=d6bc0aa1ee3bb4df]*/
+_winapi_TerminateProcess_impl(PyModuleDef *module, HANDLE handle,
+                              UINT exit_code)
+/*[clinic end generated code: output=937c1bb6219aca8b input=d6bc0aa1ee3bb4df]*/
 {
     BOOL result;
 
@@ -1289,8 +1316,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_WaitForMultipleObjects_impl(PyModuleDef *module, PyObject *handle_seq, BOOL wait_flag, DWORD milliseconds)
-/*[clinic end generated code: output=e3efee6b505dd48e input=36f76ca057cd28a0]*/
+_winapi_WaitForMultipleObjects_impl(PyModuleDef *module,
+                                    PyObject *handle_seq, BOOL wait_flag,
+                                    DWORD milliseconds)
+/*[clinic end generated code: output=acb440728d06d130 input=36f76ca057cd28a0]*/
 {
     DWORD result;
     HANDLE handles[MAXIMUM_WAIT_OBJECTS];
@@ -1364,8 +1393,9 @@
 [clinic start generated code]*/
 
 static long
-_winapi_WaitForSingleObject_impl(PyModuleDef *module, HANDLE handle, DWORD milliseconds)
-/*[clinic end generated code: output=0c75bcc6eec6b973 input=443d1ab076edc7b1]*/
+_winapi_WaitForSingleObject_impl(PyModuleDef *module, HANDLE handle,
+                                 DWORD milliseconds)
+/*[clinic end generated code: output=34ae40c269749c48 input=443d1ab076edc7b1]*/
 {
     DWORD result;
 
@@ -1390,8 +1420,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_WriteFile_impl(PyModuleDef *module, HANDLE handle, PyObject *buffer, int use_overlapped)
-/*[clinic end generated code: output=37bd88e293079b2c input=51846a5af52053fd]*/
+_winapi_WriteFile_impl(PyModuleDef *module, HANDLE handle, PyObject *buffer,
+                       int use_overlapped)
+/*[clinic end generated code: output=65e70ea41f4d2a1d input=51846a5af52053fd]*/
 {
     Py_buffer _buf, *buf;
     DWORD len, written;
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h
index c568f0f..34518e8 100644
--- a/Modules/clinic/_winapi.c.h
+++ b/Modules/clinic/_winapi.c.h
@@ -19,9 +19,7 @@
     PyObject *return_value = NULL;
     int wait;
 
-    if (!PyArg_Parse(arg,
-        "p:GetOverlappedResult",
-        &wait))
+    if (!PyArg_Parse(arg, "p:GetOverlappedResult", &wait))
         goto exit;
     return_value = _winapi_Overlapped_GetOverlappedResult_impl(self, wait);
 
@@ -81,9 +79,7 @@
     PyObject *return_value = NULL;
     HANDLE handle;
 
-    if (!PyArg_Parse(arg,
-        "" F_HANDLE ":CloseHandle",
-        &handle))
+    if (!PyArg_Parse(arg, "" F_HANDLE ":CloseHandle", &handle))
         goto exit;
     return_value = _winapi_CloseHandle_impl(module, handle);
 
@@ -100,7 +96,8 @@
     {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_VARARGS|METH_KEYWORDS, _winapi_ConnectNamedPipe__doc__},
 
 static PyObject *
-_winapi_ConnectNamedPipe_impl(PyModuleDef *module, HANDLE handle, int use_overlapped);
+_winapi_ConnectNamedPipe_impl(PyModuleDef *module, HANDLE handle,
+                              int use_overlapped);
 
 static PyObject *
 _winapi_ConnectNamedPipe(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -110,8 +107,7 @@
     HANDLE handle;
     int use_overlapped = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "" F_HANDLE "|i:ConnectNamedPipe", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" F_HANDLE "|i:ConnectNamedPipe", _keywords,
         &handle, &use_overlapped))
         goto exit;
     return_value = _winapi_ConnectNamedPipe_impl(module, handle, use_overlapped);
@@ -131,7 +127,11 @@
     {"CreateFile", (PyCFunction)_winapi_CreateFile, METH_VARARGS, _winapi_CreateFile__doc__},
 
 static HANDLE
-_winapi_CreateFile_impl(PyModuleDef *module, LPCTSTR file_name, DWORD desired_access, DWORD share_mode, LPSECURITY_ATTRIBUTES security_attributes, DWORD creation_disposition, DWORD flags_and_attributes, HANDLE template_file);
+_winapi_CreateFile_impl(PyModuleDef *module, LPCTSTR file_name,
+                        DWORD desired_access, DWORD share_mode,
+                        LPSECURITY_ATTRIBUTES security_attributes,
+                        DWORD creation_disposition,
+                        DWORD flags_and_attributes, HANDLE template_file);
 
 static PyObject *
 _winapi_CreateFile(PyModuleDef *module, PyObject *args)
@@ -146,8 +146,7 @@
     HANDLE template_file;
     HANDLE _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "skk" F_POINTER "kk" F_HANDLE ":CreateFile",
+    if (!PyArg_ParseTuple(args, "skk" F_POINTER "kk" F_HANDLE ":CreateFile",
         &file_name, &desired_access, &share_mode, &security_attributes, &creation_disposition, &flags_and_attributes, &template_file))
         goto exit;
     _return_value = _winapi_CreateFile_impl(module, file_name, desired_access, share_mode, security_attributes, creation_disposition, flags_and_attributes, template_file);
@@ -170,7 +169,8 @@
     {"CreateJunction", (PyCFunction)_winapi_CreateJunction, METH_VARARGS, _winapi_CreateJunction__doc__},
 
 static PyObject *
-_winapi_CreateJunction_impl(PyModuleDef *module, LPWSTR src_path, LPWSTR dst_path);
+_winapi_CreateJunction_impl(PyModuleDef *module, LPWSTR src_path,
+                            LPWSTR dst_path);
 
 static PyObject *
 _winapi_CreateJunction(PyModuleDef *module, PyObject *args)
@@ -179,8 +179,7 @@
     LPWSTR src_path;
     LPWSTR dst_path;
 
-    if (!PyArg_ParseTuple(args,
-        "uu:CreateJunction",
+    if (!PyArg_ParseTuple(args, "uu:CreateJunction",
         &src_path, &dst_path))
         goto exit;
     return_value = _winapi_CreateJunction_impl(module, src_path, dst_path);
@@ -200,7 +199,11 @@
     {"CreateNamedPipe", (PyCFunction)_winapi_CreateNamedPipe, METH_VARARGS, _winapi_CreateNamedPipe__doc__},
 
 static HANDLE
-_winapi_CreateNamedPipe_impl(PyModuleDef *module, LPCTSTR name, DWORD open_mode, DWORD pipe_mode, DWORD max_instances, DWORD out_buffer_size, DWORD in_buffer_size, DWORD default_timeout, LPSECURITY_ATTRIBUTES security_attributes);
+_winapi_CreateNamedPipe_impl(PyModuleDef *module, LPCTSTR name,
+                             DWORD open_mode, DWORD pipe_mode,
+                             DWORD max_instances, DWORD out_buffer_size,
+                             DWORD in_buffer_size, DWORD default_timeout,
+                             LPSECURITY_ATTRIBUTES security_attributes);
 
 static PyObject *
 _winapi_CreateNamedPipe(PyModuleDef *module, PyObject *args)
@@ -216,8 +219,7 @@
     LPSECURITY_ATTRIBUTES security_attributes;
     HANDLE _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "skkkkkk" F_POINTER ":CreateNamedPipe",
+    if (!PyArg_ParseTuple(args, "skkkkkk" F_POINTER ":CreateNamedPipe",
         &name, &open_mode, &pipe_mode, &max_instances, &out_buffer_size, &in_buffer_size, &default_timeout, &security_attributes))
         goto exit;
     _return_value = _winapi_CreateNamedPipe_impl(module, name, open_mode, pipe_mode, max_instances, out_buffer_size, in_buffer_size, default_timeout, security_attributes);
@@ -246,7 +248,8 @@
     {"CreatePipe", (PyCFunction)_winapi_CreatePipe, METH_VARARGS, _winapi_CreatePipe__doc__},
 
 static PyObject *
-_winapi_CreatePipe_impl(PyModuleDef *module, PyObject *pipe_attrs, DWORD size);
+_winapi_CreatePipe_impl(PyModuleDef *module, PyObject *pipe_attrs,
+                        DWORD size);
 
 static PyObject *
 _winapi_CreatePipe(PyModuleDef *module, PyObject *args)
@@ -255,8 +258,7 @@
     PyObject *pipe_attrs;
     DWORD size;
 
-    if (!PyArg_ParseTuple(args,
-        "Ok:CreatePipe",
+    if (!PyArg_ParseTuple(args, "Ok:CreatePipe",
         &pipe_attrs, &size))
         goto exit;
     return_value = _winapi_CreatePipe_impl(module, pipe_attrs, size);
@@ -285,7 +287,12 @@
     {"CreateProcess", (PyCFunction)_winapi_CreateProcess, METH_VARARGS, _winapi_CreateProcess__doc__},
 
 static PyObject *
-_winapi_CreateProcess_impl(PyModuleDef *module, Py_UNICODE *application_name, Py_UNICODE *command_line, PyObject *proc_attrs, PyObject *thread_attrs, BOOL inherit_handles, DWORD creation_flags, PyObject *env_mapping, Py_UNICODE *current_directory, PyObject *startup_info);
+_winapi_CreateProcess_impl(PyModuleDef *module, Py_UNICODE *application_name,
+                           Py_UNICODE *command_line, PyObject *proc_attrs,
+                           PyObject *thread_attrs, BOOL inherit_handles,
+                           DWORD creation_flags, PyObject *env_mapping,
+                           Py_UNICODE *current_directory,
+                           PyObject *startup_info);
 
 static PyObject *
 _winapi_CreateProcess(PyModuleDef *module, PyObject *args)
@@ -301,8 +308,7 @@
     Py_UNICODE *current_directory;
     PyObject *startup_info;
 
-    if (!PyArg_ParseTuple(args,
-        "ZZOOikOZO:CreateProcess",
+    if (!PyArg_ParseTuple(args, "ZZOOikOZO:CreateProcess",
         &application_name, &command_line, &proc_attrs, &thread_attrs, &inherit_handles, &creation_flags, &env_mapping, &current_directory, &startup_info))
         goto exit;
     return_value = _winapi_CreateProcess_impl(module, application_name, command_line, proc_attrs, thread_attrs, inherit_handles, creation_flags, env_mapping, current_directory, startup_info);
@@ -327,7 +333,12 @@
     {"DuplicateHandle", (PyCFunction)_winapi_DuplicateHandle, METH_VARARGS, _winapi_DuplicateHandle__doc__},
 
 static HANDLE
-_winapi_DuplicateHandle_impl(PyModuleDef *module, HANDLE source_process_handle, HANDLE source_handle, HANDLE target_process_handle, DWORD desired_access, BOOL inherit_handle, DWORD options);
+_winapi_DuplicateHandle_impl(PyModuleDef *module,
+                             HANDLE source_process_handle,
+                             HANDLE source_handle,
+                             HANDLE target_process_handle,
+                             DWORD desired_access, BOOL inherit_handle,
+                             DWORD options);
 
 static PyObject *
 _winapi_DuplicateHandle(PyModuleDef *module, PyObject *args)
@@ -341,8 +352,7 @@
     DWORD options = 0;
     HANDLE _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "" F_HANDLE "" F_HANDLE "" F_HANDLE "ki|k:DuplicateHandle",
+    if (!PyArg_ParseTuple(args, "" F_HANDLE "" F_HANDLE "" F_HANDLE "ki|k:DuplicateHandle",
         &source_process_handle, &source_handle, &target_process_handle, &desired_access, &inherit_handle, &options))
         goto exit;
     _return_value = _winapi_DuplicateHandle_impl(module, source_process_handle, source_handle, target_process_handle, desired_access, inherit_handle, options);
@@ -373,9 +383,7 @@
     PyObject *return_value = NULL;
     UINT ExitCode;
 
-    if (!PyArg_Parse(arg,
-        "I:ExitProcess",
-        &ExitCode))
+    if (!PyArg_Parse(arg, "I:ExitProcess", &ExitCode))
         goto exit;
     return_value = _winapi_ExitProcess_impl(module, ExitCode);
 
@@ -431,9 +439,7 @@
     HANDLE process;
     DWORD _return_value;
 
-    if (!PyArg_Parse(arg,
-        "" F_HANDLE ":GetExitCodeProcess",
-        &process))
+    if (!PyArg_Parse(arg, "" F_HANDLE ":GetExitCodeProcess", &process))
         goto exit;
     _return_value = _winapi_GetExitCodeProcess_impl(module, process);
     if ((_return_value == DWORD_MAX) && PyErr_Occurred())
@@ -495,9 +501,7 @@
     PyObject *return_value = NULL;
     HMODULE module_handle;
 
-    if (!PyArg_Parse(arg,
-        "" F_HANDLE ":GetModuleFileName",
-        &module_handle))
+    if (!PyArg_Parse(arg, "" F_HANDLE ":GetModuleFileName", &module_handle))
         goto exit;
     return_value = _winapi_GetModuleFileName_impl(module, module_handle);
 
@@ -529,9 +533,7 @@
     DWORD std_handle;
     HANDLE _return_value;
 
-    if (!PyArg_Parse(arg,
-        "k:GetStdHandle",
-        &std_handle))
+    if (!PyArg_Parse(arg, "k:GetStdHandle", &std_handle))
         goto exit;
     _return_value = _winapi_GetStdHandle_impl(module, std_handle);
     if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred())
@@ -580,7 +582,8 @@
     {"OpenProcess", (PyCFunction)_winapi_OpenProcess, METH_VARARGS, _winapi_OpenProcess__doc__},
 
 static HANDLE
-_winapi_OpenProcess_impl(PyModuleDef *module, DWORD desired_access, BOOL inherit_handle, DWORD process_id);
+_winapi_OpenProcess_impl(PyModuleDef *module, DWORD desired_access,
+                         BOOL inherit_handle, DWORD process_id);
 
 static PyObject *
 _winapi_OpenProcess(PyModuleDef *module, PyObject *args)
@@ -591,8 +594,7 @@
     DWORD process_id;
     HANDLE _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "kik:OpenProcess",
+    if (!PyArg_ParseTuple(args, "kik:OpenProcess",
         &desired_access, &inherit_handle, &process_id))
         goto exit;
     _return_value = _winapi_OpenProcess_impl(module, desired_access, inherit_handle, process_id);
@@ -624,8 +626,7 @@
     HANDLE handle;
     int size = 0;
 
-    if (!PyArg_ParseTuple(args,
-        "" F_HANDLE "|i:PeekNamedPipe",
+    if (!PyArg_ParseTuple(args, "" F_HANDLE "|i:PeekNamedPipe",
         &handle, &size))
         goto exit;
     return_value = _winapi_PeekNamedPipe_impl(module, handle, size);
@@ -643,7 +644,8 @@
     {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_VARARGS|METH_KEYWORDS, _winapi_ReadFile__doc__},
 
 static PyObject *
-_winapi_ReadFile_impl(PyModuleDef *module, HANDLE handle, int size, int use_overlapped);
+_winapi_ReadFile_impl(PyModuleDef *module, HANDLE handle, int size,
+                      int use_overlapped);
 
 static PyObject *
 _winapi_ReadFile(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -654,8 +656,7 @@
     int size;
     int use_overlapped = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "" F_HANDLE "i|i:ReadFile", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" F_HANDLE "i|i:ReadFile", _keywords,
         &handle, &size, &use_overlapped))
         goto exit;
     return_value = _winapi_ReadFile_impl(module, handle, size, use_overlapped);
@@ -674,7 +675,10 @@
     {"SetNamedPipeHandleState", (PyCFunction)_winapi_SetNamedPipeHandleState, METH_VARARGS, _winapi_SetNamedPipeHandleState__doc__},
 
 static PyObject *
-_winapi_SetNamedPipeHandleState_impl(PyModuleDef *module, HANDLE named_pipe, PyObject *mode, PyObject *max_collection_count, PyObject *collect_data_timeout);
+_winapi_SetNamedPipeHandleState_impl(PyModuleDef *module, HANDLE named_pipe,
+                                     PyObject *mode,
+                                     PyObject *max_collection_count,
+                                     PyObject *collect_data_timeout);
 
 static PyObject *
 _winapi_SetNamedPipeHandleState(PyModuleDef *module, PyObject *args)
@@ -685,8 +689,7 @@
     PyObject *max_collection_count;
     PyObject *collect_data_timeout;
 
-    if (!PyArg_ParseTuple(args,
-        "" F_HANDLE "OOO:SetNamedPipeHandleState",
+    if (!PyArg_ParseTuple(args, "" F_HANDLE "OOO:SetNamedPipeHandleState",
         &named_pipe, &mode, &max_collection_count, &collect_data_timeout))
         goto exit;
     return_value = _winapi_SetNamedPipeHandleState_impl(module, named_pipe, mode, max_collection_count, collect_data_timeout);
@@ -705,7 +708,8 @@
     {"TerminateProcess", (PyCFunction)_winapi_TerminateProcess, METH_VARARGS, _winapi_TerminateProcess__doc__},
 
 static PyObject *
-_winapi_TerminateProcess_impl(PyModuleDef *module, HANDLE handle, UINT exit_code);
+_winapi_TerminateProcess_impl(PyModuleDef *module, HANDLE handle,
+                              UINT exit_code);
 
 static PyObject *
 _winapi_TerminateProcess(PyModuleDef *module, PyObject *args)
@@ -714,8 +718,7 @@
     HANDLE handle;
     UINT exit_code;
 
-    if (!PyArg_ParseTuple(args,
-        "" F_HANDLE "I:TerminateProcess",
+    if (!PyArg_ParseTuple(args, "" F_HANDLE "I:TerminateProcess",
         &handle, &exit_code))
         goto exit;
     return_value = _winapi_TerminateProcess_impl(module, handle, exit_code);
@@ -742,8 +745,7 @@
     LPCTSTR name;
     DWORD timeout;
 
-    if (!PyArg_ParseTuple(args,
-        "sk:WaitNamedPipe",
+    if (!PyArg_ParseTuple(args, "sk:WaitNamedPipe",
         &name, &timeout))
         goto exit;
     return_value = _winapi_WaitNamedPipe_impl(module, name, timeout);
@@ -762,7 +764,9 @@
     {"WaitForMultipleObjects", (PyCFunction)_winapi_WaitForMultipleObjects, METH_VARARGS, _winapi_WaitForMultipleObjects__doc__},
 
 static PyObject *
-_winapi_WaitForMultipleObjects_impl(PyModuleDef *module, PyObject *handle_seq, BOOL wait_flag, DWORD milliseconds);
+_winapi_WaitForMultipleObjects_impl(PyModuleDef *module,
+                                    PyObject *handle_seq, BOOL wait_flag,
+                                    DWORD milliseconds);
 
 static PyObject *
 _winapi_WaitForMultipleObjects(PyModuleDef *module, PyObject *args)
@@ -772,8 +776,7 @@
     BOOL wait_flag;
     DWORD milliseconds = INFINITE;
 
-    if (!PyArg_ParseTuple(args,
-        "Oi|k:WaitForMultipleObjects",
+    if (!PyArg_ParseTuple(args, "Oi|k:WaitForMultipleObjects",
         &handle_seq, &wait_flag, &milliseconds))
         goto exit;
     return_value = _winapi_WaitForMultipleObjects_impl(module, handle_seq, wait_flag, milliseconds);
@@ -796,7 +799,8 @@
     {"WaitForSingleObject", (PyCFunction)_winapi_WaitForSingleObject, METH_VARARGS, _winapi_WaitForSingleObject__doc__},
 
 static long
-_winapi_WaitForSingleObject_impl(PyModuleDef *module, HANDLE handle, DWORD milliseconds);
+_winapi_WaitForSingleObject_impl(PyModuleDef *module, HANDLE handle,
+                                 DWORD milliseconds);
 
 static PyObject *
 _winapi_WaitForSingleObject(PyModuleDef *module, PyObject *args)
@@ -806,8 +810,7 @@
     DWORD milliseconds;
     long _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "" F_HANDLE "k:WaitForSingleObject",
+    if (!PyArg_ParseTuple(args, "" F_HANDLE "k:WaitForSingleObject",
         &handle, &milliseconds))
         goto exit;
     _return_value = _winapi_WaitForSingleObject_impl(module, handle, milliseconds);
@@ -828,7 +831,8 @@
     {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_VARARGS|METH_KEYWORDS, _winapi_WriteFile__doc__},
 
 static PyObject *
-_winapi_WriteFile_impl(PyModuleDef *module, HANDLE handle, PyObject *buffer, int use_overlapped);
+_winapi_WriteFile_impl(PyModuleDef *module, HANDLE handle, PyObject *buffer,
+                       int use_overlapped);
 
 static PyObject *
 _winapi_WriteFile(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -839,8 +843,7 @@
     PyObject *buffer;
     int use_overlapped = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "" F_HANDLE "O|i:WriteFile", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" F_HANDLE "O|i:WriteFile", _keywords,
         &handle, &buffer, &use_overlapped))
         goto exit;
     return_value = _winapi_WriteFile_impl(module, handle, buffer, use_overlapped);
@@ -848,4 +851,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=107b73892f62ff3c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=98771c6584056d19 input=a9049054013a1b77]*/
diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h
index de6fa29..51923fc 100644
--- a/PC/clinic/msvcrtmodule.c.h
+++ b/PC/clinic/msvcrtmodule.c.h
@@ -50,8 +50,7 @@
     int mode;
     long nbytes;
 
-    if (!PyArg_ParseTuple(args,
-        "iil:locking",
+    if (!PyArg_ParseTuple(args, "iil:locking",
         &fd, &mode, &nbytes))
         goto exit;
     return_value = msvcrt_locking_impl(module, fd, mode, nbytes);
@@ -85,8 +84,7 @@
     int flags;
     long _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "ii:setmode",
+    if (!PyArg_ParseTuple(args, "ii:setmode",
         &fd, &flags))
         goto exit;
     _return_value = msvcrt_setmode_impl(module, fd, flags);
@@ -112,7 +110,8 @@
     {"open_osfhandle", (PyCFunction)msvcrt_open_osfhandle, METH_VARARGS, msvcrt_open_osfhandle__doc__},
 
 static long
-msvcrt_open_osfhandle_impl(PyModuleDef *module, Py_intptr_t handle, int flags);
+msvcrt_open_osfhandle_impl(PyModuleDef *module, Py_intptr_t handle,
+                           int flags);
 
 static PyObject *
 msvcrt_open_osfhandle(PyModuleDef *module, PyObject *args)
@@ -122,8 +121,7 @@
     int flags;
     long _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        ""_Py_PARSE_INTPTR"i:open_osfhandle",
+    if (!PyArg_ParseTuple(args, ""_Py_PARSE_INTPTR"i:open_osfhandle",
         &handle, &flags))
         goto exit;
     _return_value = msvcrt_open_osfhandle_impl(module, handle, flags);
@@ -156,9 +154,7 @@
     int fd;
     Py_intptr_t _return_value;
 
-    if (!PyArg_Parse(arg,
-        "i:get_osfhandle",
-        &fd))
+    if (!PyArg_Parse(arg, "i:get_osfhandle", &fd))
         goto exit;
     _return_value = msvcrt_get_osfhandle_impl(module, fd);
     if ((_return_value == -1) && PyErr_Occurred())
@@ -324,9 +320,7 @@
     PyObject *return_value = NULL;
     char char_value;
 
-    if (!PyArg_Parse(arg,
-        "c:putch",
-        &char_value))
+    if (!PyArg_Parse(arg, "c:putch", &char_value))
         goto exit;
     return_value = msvcrt_putch_impl(module, char_value);
 
@@ -354,9 +348,7 @@
     PyObject *return_value = NULL;
     int unicode_char;
 
-    if (!PyArg_Parse(arg,
-        "C:putwch",
-        &unicode_char))
+    if (!PyArg_Parse(arg, "C:putwch", &unicode_char))
         goto exit;
     return_value = msvcrt_putwch_impl(module, unicode_char);
 
@@ -388,9 +380,7 @@
     PyObject *return_value = NULL;
     char char_value;
 
-    if (!PyArg_Parse(arg,
-        "c:ungetch",
-        &char_value))
+    if (!PyArg_Parse(arg, "c:ungetch", &char_value))
         goto exit;
     return_value = msvcrt_ungetch_impl(module, char_value);
 
@@ -418,9 +408,7 @@
     PyObject *return_value = NULL;
     int unicode_char;
 
-    if (!PyArg_Parse(arg,
-        "C:ungetwch",
-        &unicode_char))
+    if (!PyArg_Parse(arg, "C:ungetwch", &unicode_char))
         goto exit;
     return_value = msvcrt_ungetwch_impl(module, unicode_char);
 
@@ -454,8 +442,7 @@
     int file;
     long _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "ii:CrtSetReportFile",
+    if (!PyArg_ParseTuple(args, "ii:CrtSetReportFile",
         &type, &file))
         goto exit;
     _return_value = msvcrt_CrtSetReportFile_impl(module, type, file);
@@ -493,8 +480,7 @@
     int mode;
     long _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "ii:CrtSetReportMode",
+    if (!PyArg_ParseTuple(args, "ii:CrtSetReportMode",
         &type, &mode))
         goto exit;
     _return_value = msvcrt_CrtSetReportMode_impl(module, type, mode);
@@ -531,9 +517,7 @@
     int mode;
     long _return_value;
 
-    if (!PyArg_Parse(arg,
-        "i:set_error_mode",
-        &mode))
+    if (!PyArg_Parse(arg, "i:set_error_mode", &mode))
         goto exit;
     _return_value = msvcrt_set_error_mode_impl(module, mode);
     if ((_return_value == -1) && PyErr_Occurred())
@@ -564,9 +548,7 @@
     PyObject *return_value = NULL;
     unsigned int mode;
 
-    if (!PyArg_Parse(arg,
-        "I:SetErrorMode",
-        &mode))
+    if (!PyArg_Parse(arg, "I:SetErrorMode", &mode))
         goto exit;
     return_value = msvcrt_SetErrorMode_impl(module, mode);
 
@@ -601,4 +583,4 @@
 #ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
     #define MSVCRT_SET_ERROR_MODE_METHODDEF
 #endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
-/*[clinic end generated code: output=41dfb6ca722afa4f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=72468bb32006a11b input=a9049054013a1b77]*/
diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h
index 6aff424b8..22b332f 100644
--- a/PC/clinic/winreg.c.h
+++ b/PC/clinic/winreg.c.h
@@ -80,7 +80,8 @@
     {"__exit__", (PyCFunction)winreg_HKEYType___exit__, METH_VARARGS|METH_KEYWORDS, winreg_HKEYType___exit____doc__},
 
 static PyObject *
-winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type, PyObject *exc_value, PyObject *traceback);
+winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type,
+                              PyObject *exc_value, PyObject *traceback);
 
 static PyObject *
 winreg_HKEYType___exit__(PyHKEYObject *self, PyObject *args, PyObject *kwargs)
@@ -91,8 +92,7 @@
     PyObject *exc_value;
     PyObject *traceback;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "OOO:__exit__", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OOO:__exit__", _keywords,
         &exc_type, &exc_value, &traceback))
         goto exit;
     return_value = winreg_HKEYType___exit___impl(self, exc_type, exc_value, traceback);
@@ -135,7 +135,8 @@
     {"ConnectRegistry", (PyCFunction)winreg_ConnectRegistry, METH_VARARGS, winreg_ConnectRegistry__doc__},
 
 static HKEY
-winreg_ConnectRegistry_impl(PyModuleDef *module, Py_UNICODE *computer_name, HKEY key);
+winreg_ConnectRegistry_impl(PyModuleDef *module, Py_UNICODE *computer_name,
+                            HKEY key);
 
 static PyObject *
 winreg_ConnectRegistry(PyModuleDef *module, PyObject *args)
@@ -145,8 +146,7 @@
     HKEY key;
     HKEY _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "ZO&:ConnectRegistry",
+    if (!PyArg_ParseTuple(args, "ZO&:ConnectRegistry",
         &computer_name, clinic_HKEY_converter, &key))
         goto exit;
     _return_value = winreg_ConnectRegistry_impl(module, computer_name, key);
@@ -191,8 +191,7 @@
     Py_UNICODE *sub_key;
     HKEY _return_value;
 
-    if (!PyArg_ParseTuple(args,
-        "O&Z:CreateKey",
+    if (!PyArg_ParseTuple(args, "O&Z:CreateKey",
         clinic_HKEY_converter, &key, &sub_key))
         goto exit;
     _return_value = winreg_CreateKey_impl(module, key, sub_key);
@@ -233,7 +232,8 @@
     {"CreateKeyEx", (PyCFunction)winreg_CreateKeyEx, METH_VARARGS|METH_KEYWORDS, winreg_CreateKeyEx__doc__},
 
 static HKEY
-winreg_CreateKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access);
+winreg_CreateKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                        int reserved, REGSAM access);
 
 static PyObject *
 winreg_CreateKeyEx(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -246,8 +246,7 @@
     REGSAM access = KEY_WRITE;
     HKEY _return_value;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "O&Z|ii:CreateKeyEx", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&Z|ii:CreateKeyEx", _keywords,
         clinic_HKEY_converter, &key, &sub_key, &reserved, &access))
         goto exit;
     _return_value = winreg_CreateKeyEx_impl(module, key, sub_key, reserved, access);
@@ -290,8 +289,7 @@
     HKEY key;
     Py_UNICODE *sub_key;
 
-    if (!PyArg_ParseTuple(args,
-        "O&u:DeleteKey",
+    if (!PyArg_ParseTuple(args, "O&u:DeleteKey",
         clinic_HKEY_converter, &key, &sub_key))
         goto exit;
     return_value = winreg_DeleteKey_impl(module, key, sub_key);
@@ -329,7 +327,8 @@
     {"DeleteKeyEx", (PyCFunction)winreg_DeleteKeyEx, METH_VARARGS|METH_KEYWORDS, winreg_DeleteKeyEx__doc__},
 
 static PyObject *
-winreg_DeleteKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, REGSAM access, int reserved);
+winreg_DeleteKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                        REGSAM access, int reserved);
 
 static PyObject *
 winreg_DeleteKeyEx(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -341,8 +340,7 @@
     REGSAM access = KEY_WOW64_64KEY;
     int reserved = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "O&u|ii:DeleteKeyEx", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&u|ii:DeleteKeyEx", _keywords,
         clinic_HKEY_converter, &key, &sub_key, &access, &reserved))
         goto exit;
     return_value = winreg_DeleteKeyEx_impl(module, key, sub_key, access, reserved);
@@ -375,8 +373,7 @@
     HKEY key;
     Py_UNICODE *value;
 
-    if (!PyArg_ParseTuple(args,
-        "O&Z:DeleteValue",
+    if (!PyArg_ParseTuple(args, "O&Z:DeleteValue",
         clinic_HKEY_converter, &key, &value))
         goto exit;
     return_value = winreg_DeleteValue_impl(module, key, value);
@@ -413,8 +410,7 @@
     HKEY key;
     int index;
 
-    if (!PyArg_ParseTuple(args,
-        "O&i:EnumKey",
+    if (!PyArg_ParseTuple(args, "O&i:EnumKey",
         clinic_HKEY_converter, &key, &index))
         goto exit;
     return_value = winreg_EnumKey_impl(module, key, index);
@@ -460,8 +456,7 @@
     HKEY key;
     int index;
 
-    if (!PyArg_ParseTuple(args,
-        "O&i:EnumValue",
+    if (!PyArg_ParseTuple(args, "O&i:EnumValue",
         clinic_HKEY_converter, &key, &index))
         goto exit;
     return_value = winreg_EnumValue_impl(module, key, index);
@@ -488,9 +483,7 @@
     PyObject *return_value = NULL;
     Py_UNICODE *string;
 
-    if (!PyArg_Parse(arg,
-        "u:ExpandEnvironmentStrings",
-        &string))
+    if (!PyArg_Parse(arg, "u:ExpandEnvironmentStrings", &string))
         goto exit;
     return_value = winreg_ExpandEnvironmentStrings_impl(module, string);
 
@@ -529,9 +522,7 @@
     PyObject *return_value = NULL;
     HKEY key;
 
-    if (!PyArg_Parse(arg,
-        "O&:FlushKey",
-        clinic_HKEY_converter, &key))
+    if (!PyArg_Parse(arg, "O&:FlushKey", clinic_HKEY_converter, &key))
         goto exit;
     return_value = winreg_FlushKey_impl(module, key);
 
@@ -571,7 +562,8 @@
     {"LoadKey", (PyCFunction)winreg_LoadKey, METH_VARARGS, winreg_LoadKey__doc__},
 
 static PyObject *
-winreg_LoadKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, Py_UNICODE *file_name);
+winreg_LoadKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                    Py_UNICODE *file_name);
 
 static PyObject *
 winreg_LoadKey(PyModuleDef *module, PyObject *args)
@@ -581,8 +573,7 @@
     Py_UNICODE *sub_key;
     Py_UNICODE *file_name;
 
-    if (!PyArg_ParseTuple(args,
-        "O&uu:LoadKey",
+    if (!PyArg_ParseTuple(args, "O&uu:LoadKey",
         clinic_HKEY_converter, &key, &sub_key, &file_name))
         goto exit;
     return_value = winreg_LoadKey_impl(module, key, sub_key, file_name);
@@ -614,7 +605,8 @@
     {"OpenKey", (PyCFunction)winreg_OpenKey, METH_VARARGS|METH_KEYWORDS, winreg_OpenKey__doc__},
 
 static HKEY
-winreg_OpenKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access);
+winreg_OpenKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                    int reserved, REGSAM access);
 
 static PyObject *
 winreg_OpenKey(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -627,8 +619,7 @@
     REGSAM access = KEY_READ;
     HKEY _return_value;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "O&Z|ii:OpenKey", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&Z|ii:OpenKey", _keywords,
         clinic_HKEY_converter, &key, &sub_key, &reserved, &access))
         goto exit;
     _return_value = winreg_OpenKey_impl(module, key, sub_key, reserved, access);
@@ -663,7 +654,8 @@
     {"OpenKeyEx", (PyCFunction)winreg_OpenKeyEx, METH_VARARGS|METH_KEYWORDS, winreg_OpenKeyEx__doc__},
 
 static HKEY
-winreg_OpenKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access);
+winreg_OpenKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                      int reserved, REGSAM access);
 
 static PyObject *
 winreg_OpenKeyEx(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -676,8 +668,7 @@
     REGSAM access = KEY_READ;
     HKEY _return_value;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "O&Z|ii:OpenKeyEx", _keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&Z|ii:OpenKeyEx", _keywords,
         clinic_HKEY_converter, &key, &sub_key, &reserved, &access))
         goto exit;
     _return_value = winreg_OpenKeyEx_impl(module, key, sub_key, reserved, access);
@@ -716,9 +707,7 @@
     PyObject *return_value = NULL;
     HKEY key;
 
-    if (!PyArg_Parse(arg,
-        "O&:QueryInfoKey",
-        clinic_HKEY_converter, &key))
+    if (!PyArg_Parse(arg, "O&:QueryInfoKey", clinic_HKEY_converter, &key))
         goto exit;
     return_value = winreg_QueryInfoKey_impl(module, key);
 
@@ -759,8 +748,7 @@
     HKEY key;
     Py_UNICODE *sub_key;
 
-    if (!PyArg_ParseTuple(args,
-        "O&Z:QueryValue",
+    if (!PyArg_ParseTuple(args, "O&Z:QueryValue",
         clinic_HKEY_converter, &key, &sub_key))
         goto exit;
     return_value = winreg_QueryValue_impl(module, key, sub_key);
@@ -798,8 +786,7 @@
     HKEY key;
     Py_UNICODE *name;
 
-    if (!PyArg_ParseTuple(args,
-        "O&Z:QueryValueEx",
+    if (!PyArg_ParseTuple(args, "O&Z:QueryValueEx",
         clinic_HKEY_converter, &key, &name))
         goto exit;
     return_value = winreg_QueryValueEx_impl(module, key, name);
@@ -842,8 +829,7 @@
     HKEY key;
     Py_UNICODE *file_name;
 
-    if (!PyArg_ParseTuple(args,
-        "O&u:SaveKey",
+    if (!PyArg_ParseTuple(args, "O&u:SaveKey",
         clinic_HKEY_converter, &key, &file_name))
         goto exit;
     return_value = winreg_SaveKey_impl(module, key, file_name);
@@ -882,7 +868,9 @@
     {"SetValue", (PyCFunction)winreg_SetValue, METH_VARARGS, winreg_SetValue__doc__},
 
 static PyObject *
-winreg_SetValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, DWORD type, Py_UNICODE *value, Py_ssize_clean_t value_length);
+winreg_SetValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                     DWORD type, Py_UNICODE *value,
+                     Py_ssize_clean_t value_length);
 
 static PyObject *
 winreg_SetValue(PyModuleDef *module, PyObject *args)
@@ -894,8 +882,7 @@
     Py_UNICODE *value;
     Py_ssize_clean_t value_length;
 
-    if (!PyArg_ParseTuple(args,
-        "O&Zku#:SetValue",
+    if (!PyArg_ParseTuple(args, "O&Zku#:SetValue",
         clinic_HKEY_converter, &key, &sub_key, &type, &value, &value_length))
         goto exit;
     return_value = winreg_SetValue_impl(module, key, sub_key, type, value, value_length);
@@ -949,7 +936,8 @@
     {"SetValueEx", (PyCFunction)winreg_SetValueEx, METH_VARARGS, winreg_SetValueEx__doc__},
 
 static PyObject *
-winreg_SetValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value_name, PyObject *reserved, DWORD type, PyObject *value);
+winreg_SetValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value_name,
+                       PyObject *reserved, DWORD type, PyObject *value);
 
 static PyObject *
 winreg_SetValueEx(PyModuleDef *module, PyObject *args)
@@ -961,8 +949,7 @@
     DWORD type;
     PyObject *value;
 
-    if (!PyArg_ParseTuple(args,
-        "O&ZOkO:SetValueEx",
+    if (!PyArg_ParseTuple(args, "O&ZOkO:SetValueEx",
         clinic_HKEY_converter, &key, &value_name, &reserved, &type, &value))
         goto exit;
     return_value = winreg_SetValueEx_impl(module, key, value_name, reserved, type, value);
@@ -998,9 +985,7 @@
     PyObject *return_value = NULL;
     HKEY key;
 
-    if (!PyArg_Parse(arg,
-        "O&:DisableReflectionKey",
-        clinic_HKEY_converter, &key))
+    if (!PyArg_Parse(arg, "O&:DisableReflectionKey", clinic_HKEY_converter, &key))
         goto exit;
     return_value = winreg_DisableReflectionKey_impl(module, key);
 
@@ -1033,9 +1018,7 @@
     PyObject *return_value = NULL;
     HKEY key;
 
-    if (!PyArg_Parse(arg,
-        "O&:EnableReflectionKey",
-        clinic_HKEY_converter, &key))
+    if (!PyArg_Parse(arg, "O&:EnableReflectionKey", clinic_HKEY_converter, &key))
         goto exit;
     return_value = winreg_EnableReflectionKey_impl(module, key);
 
@@ -1066,13 +1049,11 @@
     PyObject *return_value = NULL;
     HKEY key;
 
-    if (!PyArg_Parse(arg,
-        "O&:QueryReflectionKey",
-        clinic_HKEY_converter, &key))
+    if (!PyArg_Parse(arg, "O&:QueryReflectionKey", clinic_HKEY_converter, &key))
         goto exit;
     return_value = winreg_QueryReflectionKey_impl(module, key);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=be6e50b901570878 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=71f5bc30b646807b input=a9049054013a1b77]*/
diff --git a/PC/clinic/winsound.c.h b/PC/clinic/winsound.c.h
index 065ed62..dca5a42 100644
--- a/PC/clinic/winsound.c.h
+++ b/PC/clinic/winsound.c.h
@@ -26,8 +26,7 @@
     Py_UNICODE *sound;
     int flags;
 
-    if (!PyArg_ParseTuple(args,
-        "Zi:PlaySound",
+    if (!PyArg_ParseTuple(args, "Zi:PlaySound",
         &sound, &flags))
         goto exit;
     return_value = winsound_PlaySound_impl(module, sound, flags);
@@ -61,8 +60,7 @@
     int frequency;
     int duration;
 
-    if (!PyArg_ParseTuple(args,
-        "ii:Beep",
+    if (!PyArg_ParseTuple(args, "ii:Beep",
         &frequency, &duration))
         goto exit;
     return_value = winsound_Beep_impl(module, frequency, duration);
@@ -91,8 +89,7 @@
     PyObject *return_value = NULL;
     int x = MB_OK;
 
-    if (!PyArg_ParseTuple(args,
-        "|i:MessageBeep",
+    if (!PyArg_ParseTuple(args, "|i:MessageBeep",
         &x))
         goto exit;
     return_value = winsound_MessageBeep_impl(module, x);
@@ -100,4 +97,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=89c85ed36c3af2fd input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c5b018ac9dc1f500 input=a9049054013a1b77]*/
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index 0779ac7..6f2eff6 100644
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -160,8 +160,9 @@
 [clinic start generated code]*/
 
 static long
-msvcrt_open_osfhandle_impl(PyModuleDef *module, Py_intptr_t handle, int flags)
-/*[clinic end generated code: output=8cda35b8e4ea4178 input=4d8516ed32db8f65]*/
+msvcrt_open_osfhandle_impl(PyModuleDef *module, Py_intptr_t handle,
+                           int flags)
+/*[clinic end generated code: output=86bce32582c49c06 input=4d8516ed32db8f65]*/
 {
     int fd;
 
@@ -320,7 +321,7 @@
 /*[clinic input]
 msvcrt.putwch
 
-    unicode_char: int(types='str')
+    unicode_char: int(accept={str})
     /
 
 Wide char variant of putch(), accepting a Unicode value.
@@ -328,7 +329,7 @@
 
 static PyObject *
 msvcrt_putwch_impl(PyModuleDef *module, int unicode_char)
-/*[clinic end generated code: output=c216a73694ca73dd input=74377c932af728a4]*/
+/*[clinic end generated code: output=c216a73694ca73dd input=996ccd0bbcbac4c3]*/
 {
     _putwch(unicode_char);
     Py_RETURN_NONE;
@@ -362,7 +363,7 @@
 /*[clinic input]
 msvcrt.ungetwch
 
-    unicode_char: int(types='str')
+    unicode_char: int(accept={str})
     /
 
 Wide char variant of ungetch(), accepting a Unicode value.
@@ -370,7 +371,7 @@
 
 static PyObject *
 msvcrt_ungetwch_impl(PyModuleDef *module, int unicode_char)
-/*[clinic end generated code: output=1ee7674710322bd1 input=6bcd16276e035902]*/
+/*[clinic end generated code: output=1ee7674710322bd1 input=83ec0492be04d564]*/
 {
     if (_ungetwch(unicode_char) == WEOF)
         return PyErr_SetFromErrno(PyExc_IOError);
diff --git a/PC/winreg.c b/PC/winreg.c
index 605c234..3313202 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -319,8 +319,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type, PyObject *exc_value, PyObject *traceback)
-/*[clinic end generated code: output=51adcc1522e9c847 input=fb32489ee92403c7]*/
+winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type,
+                              PyObject *exc_value, PyObject *traceback)
+/*[clinic end generated code: output=923ebe7389e6a263 input=fb32489ee92403c7]*/
 {
     if (!PyHKEY_Close((PyObject *)self))
         return NULL;
@@ -784,7 +785,7 @@
 /*[clinic input]
 winreg.ConnectRegistry -> HKEY
 
-    computer_name: Py_UNICODE(nullable=True)
+    computer_name: Py_UNICODE(accept={str, NoneType})
         The name of the remote computer, of the form r"\\computername".  If
         None, the local computer is used.
     key: HKEY
@@ -798,8 +799,9 @@
 [clinic start generated code]*/
 
 static HKEY
-winreg_ConnectRegistry_impl(PyModuleDef *module, Py_UNICODE *computer_name, HKEY key)
-/*[clinic end generated code: output=bce735a41d767290 input=dcea2c433af51576]*/
+winreg_ConnectRegistry_impl(PyModuleDef *module, Py_UNICODE *computer_name,
+                            HKEY key)
+/*[clinic end generated code: output=5c52f6f7ba6e7b46 input=9a056558ce318433]*/
 {
     HKEY retKey;
     long rc;
@@ -818,7 +820,7 @@
 
     key: HKEY
         An already open key, or one of the predefined HKEY_* constants.
-    sub_key: Py_UNICODE(nullable=True)
+    sub_key: Py_UNICODE(accept={str, NoneType})
         The name of the key this method opens or creates.
     /
 
@@ -835,7 +837,7 @@
 
 static HKEY
 winreg_CreateKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key)
-/*[clinic end generated code: output=cd6843f30a73fc0e input=8014b171a5682fe7]*/
+/*[clinic end generated code: output=cd6843f30a73fc0e input=3cdd1622488acea2]*/
 {
     HKEY retKey;
     long rc;
@@ -853,7 +855,7 @@
 
     key: HKEY
         An already open key, or one of the predefined HKEY_* constants.
-    sub_key: Py_UNICODE(nullable=True)
+    sub_key: Py_UNICODE(accept={str, NoneType})
         The name of the key this method opens or creates.
     reserved: int = 0
         A reserved integer, and must be zero.  Default is zero.
@@ -873,8 +875,9 @@
 [clinic start generated code]*/
 
 static HKEY
-winreg_CreateKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access)
-/*[clinic end generated code: output=543d176b19183749 input=4322acd5c7f2e787]*/
+winreg_CreateKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                        int reserved, REGSAM access)
+/*[clinic end generated code: output=db835d5be84e72b2 input=42c2b03f98406b66]*/
 {
     HKEY retKey;
     long rc;
@@ -942,8 +945,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-winreg_DeleteKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, REGSAM access, int reserved)
-/*[clinic end generated code: output=8b8a20684a59a902 input=711d9d89e7ecbed7]*/
+winreg_DeleteKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                        REGSAM access, int reserved)
+/*[clinic end generated code: output=0362a0ac6502379f input=711d9d89e7ecbed7]*/
 {
     HMODULE hMod;
     typedef LONG (WINAPI *RDKEFunc)(HKEY, const wchar_t*, REGSAM, int);
@@ -975,7 +979,7 @@
 
     key: HKEY
         An already open key, or any one of the predefined HKEY_* constants.
-    value: Py_UNICODE(nullable=True)
+    value: Py_UNICODE(accept={str, NoneType})
         A string that identifies the value to remove.
     /
 
@@ -984,7 +988,7 @@
 
 static PyObject *
 winreg_DeleteValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value)
-/*[clinic end generated code: output=308550b8cdcfd8e1 input=417a5c1005cbbddc]*/
+/*[clinic end generated code: output=308550b8cdcfd8e1 input=a78d3407a4197b21]*/
 {
     long rc;
     Py_BEGIN_ALLOW_THREADS
@@ -1244,8 +1248,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-winreg_LoadKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, Py_UNICODE *file_name)
-/*[clinic end generated code: output=53b22607f8e73d34 input=e3b5b45ade311582]*/
+winreg_LoadKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                    Py_UNICODE *file_name)
+/*[clinic end generated code: output=b8b700e39c695b90 input=e3b5b45ade311582]*/
 {
     long rc;
 
@@ -1262,7 +1267,7 @@
 
     key: HKEY
         An already open key, or any one of the predefined HKEY_* constants.
-    sub_key: Py_UNICODE(nullable=True)
+    sub_key: Py_UNICODE(accept={str, NoneType})
         A string that identifies the sub_key to open.
     reserved: int = 0
         A reserved integer that must be zero.  Default is zero.
@@ -1277,8 +1282,9 @@
 [clinic start generated code]*/
 
 static HKEY
-winreg_OpenKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access)
-/*[clinic end generated code: output=8bf50881521469c6 input=dc84a4af4af4d387]*/
+winreg_OpenKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                    int reserved, REGSAM access)
+/*[clinic end generated code: output=79818ea356490a55 input=098505ac36a9ae28]*/
 {
     HKEY retKey;
     long rc;
@@ -1303,8 +1309,9 @@
 [clinic start generated code]*/
 
 static HKEY
-winreg_OpenKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access)
-/*[clinic end generated code: output=f6f7cd4befb9585b input=c6c4972af8622959]*/
+winreg_OpenKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                      int reserved, REGSAM access)
+/*[clinic end generated code: output=2dd9f29e84ea2dbc input=c6c4972af8622959]*/
 {
     return winreg_OpenKey_impl(module, key, sub_key, reserved, access);
 }
@@ -1355,7 +1362,7 @@
 
     key: HKEY
         An already open key, or any one of the predefined HKEY_* constants.
-    sub_key: Py_UNICODE(nullable=True)
+    sub_key: Py_UNICODE(accept={str, NoneType})
         A string that holds the name of the subkey with which the value
         is associated.  If this parameter is None or empty, the function
         retrieves the value set by the SetValue() method for the key
@@ -1373,7 +1380,7 @@
 
 static PyObject *
 winreg_QueryValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key)
-/*[clinic end generated code: output=f91cb6f623c3b65a input=e6ec57bb8d39aaa6]*/
+/*[clinic end generated code: output=f91cb6f623c3b65a input=41cafbbf423b21d6]*/
 {
     long rc;
     PyObject *retStr;
@@ -1426,7 +1433,7 @@
 
     key: HKEY
         An already open key, or any one of the predefined HKEY_* constants.
-    name: Py_UNICODE(nullable=True)
+    name: Py_UNICODE(accept={str, NoneType})
         A string indicating the value to query.
     /
 
@@ -1440,7 +1447,7 @@
 
 static PyObject *
 winreg_QueryValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *name)
-/*[clinic end generated code: output=a4b07f7807194f23 input=4403ae868b44e563]*/
+/*[clinic end generated code: output=a4b07f7807194f23 input=cf366cada4836891]*/
 {
     long rc;
     BYTE *retBuf, *tmp;
@@ -1535,12 +1542,12 @@
 
     key: HKEY
         An already open key, or any one of the predefined HKEY_* constants.
-    sub_key: Py_UNICODE(nullable=True)
+    sub_key: Py_UNICODE(accept={str, NoneType})
         A string that names the subkey with which the value is associated.
     type: DWORD
         An integer that specifies the type of the data.  Currently this must
         be REG_SZ, meaning only strings are supported.
-    value: Py_UNICODE(length=True)
+    value: Py_UNICODE(zeroes=True)
         A string that specifies the new value.
     /
 
@@ -1558,8 +1565,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-winreg_SetValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, DWORD type, Py_UNICODE *value, Py_ssize_clean_t value_length)
-/*[clinic end generated code: output=807274a1c01961b5 input=83ad2fae2ffbb941]*/
+winreg_SetValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key,
+                     DWORD type, Py_UNICODE *value,
+                     Py_ssize_clean_t value_length)
+/*[clinic end generated code: output=3c9c7c2769e8f953 input=2cd2adab79339c53]*/
 {
     long rc;
 
@@ -1582,7 +1591,7 @@
 
     key: HKEY
         An already open key, or any one of the predefined HKEY_* constants.
-    value_name: Py_UNICODE(nullable=True)
+    value_name: Py_UNICODE(accept={str, NoneType})
         A string containing the name of the value to set, or None.
     reserved: object
         Can be anything - zero is always passed to the API.
@@ -1620,8 +1629,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-winreg_SetValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value_name, PyObject *reserved, DWORD type, PyObject *value)
-/*[clinic end generated code: output=a53ac3aecef9b977 input=8fe45d7ac381cf96]*/
+winreg_SetValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value_name,
+                       PyObject *reserved, DWORD type, PyObject *value)
+/*[clinic end generated code: output=ea092a935c361582 input=e73dec535ebeea7d]*/
 {
     BYTE *data;
     DWORD len;
diff --git a/PC/winsound.c b/PC/winsound.c
index a659861..8e77d13 100644
--- a/PC/winsound.c
+++ b/PC/winsound.c
@@ -64,7 +64,7 @@
 /*[clinic input]
 winsound.PlaySound
 
-    sound: Py_UNICODE(nullable=True)
+    sound: Py_UNICODE(accept={str, NoneType})
         The sound to play; a filename, data, or None.
     flags: int
         Flag values, ored together.  See module documentation.
@@ -75,7 +75,7 @@
 
 static PyObject *
 winsound_PlaySound_impl(PyModuleDef *module, Py_UNICODE *sound, int flags)
-/*[clinic end generated code: output=614273784bf59e5c input=c86fab5d8e86f31d]*/
+/*[clinic end generated code: output=614273784bf59e5c input=3411b1b7c1f36d93]*/
 {
     int ok;