diff -r ca2f024ce7cb Include/methodobject.h
--- a/Include/methodobject.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Include/methodobject.h	Mon Feb 06 17:12:36 2017 +0200
@@ -16,10 +16,12 @@ PyAPI_DATA(PyTypeObject) PyCFunction_Typ
 #define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type)
 
 typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
-typedef PyObject *(*_PyCFunctionFast) (PyObject *self, PyObject **args,
-                                       Py_ssize_t nargs, PyObject *kwnames);
+typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject **, Py_ssize_t);
 typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
                                              PyObject *);
+typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *,
+                                                   PyObject **, Py_ssize_t,
+                                                   PyObject *);
 typedef PyObject *(*PyNoArgsFunction)(PyObject *);
 
 PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
diff -r ca2f024ce7cb Modules/_elementtree.c
--- a/Modules/_elementtree.c	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_elementtree.c	Mon Feb 06 17:12:36 2017 +0200
@@ -3712,7 +3712,7 @@ static PyMethodDef element_methods[] = {
     _ELEMENTTREE_ELEMENT_ITERTEXT_METHODDEF
     _ELEMENTTREE_ELEMENT_ITERFIND_METHODDEF
 
-    {"getiterator", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL, _elementtree_Element_iter__doc__},
+    {"getiterator", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_iter__doc__},
     _ELEMENTTREE_ELEMENT_GETCHILDREN_METHODDEF
 
     _ELEMENTTREE_ELEMENT_ITEMS_METHODDEF
diff -r ca2f024ce7cb Modules/_hashopenssl.c
--- a/Modules/_hashopenssl.c	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_hashopenssl.c	Mon Feb 06 17:12:36 2017 +0200
@@ -936,7 +936,7 @@ generate_hash_name_list(void)
 
 /* a PyMethodDef structure for the constructor */
 #define CONSTRUCTOR_METH_DEF(NAME)  \
-    {"openssl_" #NAME, (PyCFunction)EVP_new_ ## NAME, METH_FASTCALL, \
+    {"openssl_" #NAME, (PyCFunction)EVP_new_ ## NAME, METH_FASTCALL | METH_KEYWORDS, \
         PyDoc_STR("Returns a " #NAME \
                   " hash object; optionally initialized with a string") \
     }
diff -r ca2f024ce7cb Modules/_io/clinic/_iomodule.c.h
--- a/Modules/_io/clinic/_iomodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/_iomodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -127,7 +127,7 @@ PyDoc_STRVAR(_io_open__doc__,
 "opened in a binary mode.");
 
 #define _IO_OPEN_METHODDEF    \
-    {"open", (PyCFunction)_io_open, METH_FASTCALL, _io_open__doc__},
+    {"open", (PyCFunction)_io_open, METH_FASTCALL|METH_KEYWORDS, _io_open__doc__},
 
 static PyObject *
 _io_open_impl(PyObject *module, PyObject *file, const char *mode,
@@ -158,4 +158,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=79fd04d9c9d8f28f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a748395f9589de02 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/bufferedio.c.h
--- a/Modules/_io/clinic/bufferedio.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/bufferedio.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -106,10 +106,6 @@ static PyObject *
         &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("peek", kwnames)) {
-        goto exit;
-    }
     return_value = _io__Buffered_peek_impl(self, size);
 
 exit:
@@ -137,10 +133,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &n)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io__Buffered_read_impl(self, n);
 
 exit:
@@ -168,10 +160,6 @@ static PyObject *
         &n)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read1", kwnames)) {
-        goto exit;
-    }
     return_value = _io__Buffered_read1_impl(self, n);
 
 exit:
@@ -261,10 +249,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readline", kwnames)) {
-        goto exit;
-    }
     return_value = _io__Buffered_readline_impl(self, size);
 
 exit:
@@ -293,10 +277,6 @@ static PyObject *
         &targetobj, &whence)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("seek", kwnames)) {
-        goto exit;
-    }
     return_value = _io__Buffered_seek_impl(self, targetobj, whence);
 
 exit:
@@ -325,10 +305,6 @@ static PyObject *
         &pos)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("truncate", kwnames)) {
-        goto exit;
-    }
     return_value = _io__Buffered_truncate_impl(self, pos);
 
 exit:
@@ -500,4 +476,4 @@ static int
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=e37b969b1acaa09c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ece58fbbcf12f86d input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/bytesio.c.h
--- a/Modules/_io/clinic/bytesio.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/bytesio.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -174,10 +174,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io_BytesIO_read_impl(self, arg);
 
 exit:
@@ -210,10 +206,6 @@ static PyObject *
         &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read1", kwnames)) {
-        goto exit;
-    }
     return_value = _io_BytesIO_read1_impl(self, size);
 
 exit:
@@ -247,10 +239,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readline", kwnames)) {
-        goto exit;
-    }
     return_value = _io_BytesIO_readline_impl(self, arg);
 
 exit:
@@ -284,10 +272,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readlines", kwnames)) {
-        goto exit;
-    }
     return_value = _io_BytesIO_readlines_impl(self, arg);
 
 exit:
@@ -355,10 +339,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("truncate", kwnames)) {
-        goto exit;
-    }
     return_value = _io_BytesIO_truncate_impl(self, arg);
 
 exit:
@@ -394,10 +374,6 @@ static PyObject *
         &pos, &whence)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("seek", kwnames)) {
-        goto exit;
-    }
     return_value = _io_BytesIO_seek_impl(self, pos, whence);
 
 exit:
@@ -472,4 +448,4 @@ static int
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=138ee6ad6951bc84 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=77c4441e33045786 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/fileio.c.h
--- a/Modules/_io/clinic/fileio.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/fileio.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -217,10 +217,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io_FileIO_read_impl(self, size);
 
 exit:
@@ -294,10 +290,6 @@ static PyObject *
         &pos, &whence)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("seek", kwnames)) {
-        goto exit;
-    }
     return_value = _io_FileIO_seek_impl(self, pos, whence);
 
 exit:
@@ -352,10 +344,6 @@ static PyObject *
         &posobj)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("truncate", kwnames)) {
-        goto exit;
-    }
     return_value = _io_FileIO_truncate_impl(self, posobj);
 
 exit:
@@ -385,4 +373,4 @@ static PyObject *
 #ifndef _IO_FILEIO_TRUNCATE_METHODDEF
     #define _IO_FILEIO_TRUNCATE_METHODDEF
 #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */
-/*[clinic end generated code: output=034d782a0daa82bd input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e3c651b55b5f801e input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/iobase.c.h
--- a/Modules/_io/clinic/iobase.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/iobase.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -189,10 +189,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &limit)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readline", kwnames)) {
-        goto exit;
-    }
     return_value = _io__IOBase_readline_impl(self, limit);
 
 exit:
@@ -225,10 +221,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &hint)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readlines", kwnames)) {
-        goto exit;
-    }
     return_value = _io__IOBase_readlines_impl(self, hint);
 
 exit:
@@ -264,10 +256,6 @@ static PyObject *
         &n)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io__RawIOBase_read_impl(self, n);
 
 exit:
@@ -291,4 +279,4 @@ static PyObject *
 {
     return _io__RawIOBase_readall_impl(self);
 }
-/*[clinic end generated code: output=1bcece367fc7b0cd input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4b8aaa84d5500e34 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/stringio.c.h
--- a/Modules/_io/clinic/stringio.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/stringio.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -64,10 +64,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io_StringIO_read_impl(self, arg);
 
 exit:
@@ -99,10 +95,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readline", kwnames)) {
-        goto exit;
-    }
     return_value = _io_StringIO_readline_impl(self, arg);
 
 exit:
@@ -136,10 +128,6 @@ static PyObject *
         &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("truncate", kwnames)) {
-        goto exit;
-    }
     return_value = _io_StringIO_truncate_impl(self, arg);
 
 exit:
@@ -175,10 +163,6 @@ static PyObject *
         &pos, &whence)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("seek", kwnames)) {
-        goto exit;
-    }
     return_value = _io_StringIO_seek_impl(self, pos, whence);
 
 exit:
@@ -305,4 +289,4 @@ static PyObject *
 {
     return _io_StringIO_seekable_impl(self);
 }
-/*[clinic end generated code: output=ce8018ec29def422 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e30f6dcfe9bc0af4 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/textio.c.h
--- a/Modules/_io/clinic/textio.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/textio.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -46,7 +46,7 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecod
 "\n");
 
 #define _IO_INCREMENTALNEWLINEDECODER_DECODE_METHODDEF    \
-    {"decode", (PyCFunction)_io_IncrementalNewlineDecoder_decode, METH_FASTCALL, _io_IncrementalNewlineDecoder_decode__doc__},
+    {"decode", (PyCFunction)_io_IncrementalNewlineDecoder_decode, METH_FASTCALL|METH_KEYWORDS, _io_IncrementalNewlineDecoder_decode__doc__},
 
 static PyObject *
 _io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self,
@@ -240,10 +240,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &n)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io_TextIOWrapper_read_impl(self, n);
 
 exit:
@@ -271,10 +267,6 @@ static PyObject *
         &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readline", kwnames)) {
-        goto exit;
-    }
     return_value = _io_TextIOWrapper_readline_impl(self, size);
 
 exit:
@@ -303,10 +295,6 @@ static PyObject *
         &cookieObj, &whence)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("seek", kwnames)) {
-        goto exit;
-    }
     return_value = _io_TextIOWrapper_seek_impl(self, cookieObj, whence);
 
 exit:
@@ -352,10 +340,6 @@ static PyObject *
         &pos)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("truncate", kwnames)) {
-        goto exit;
-    }
     return_value = _io_TextIOWrapper_truncate_impl(self, pos);
 
 exit:
@@ -480,4 +464,4 @@ static PyObject *
 {
     return _io_TextIOWrapper_close_impl(self);
 }
-/*[clinic end generated code: output=67eba50449900a96 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2c10fed27333743d input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_io/clinic/winconsoleio.c.h
--- a/Modules/_io/clinic/winconsoleio.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_io/clinic/winconsoleio.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -224,10 +224,6 @@ static PyObject *
         _PyIO_ConvertSsize_t, &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _io__WindowsConsoleIO_read_impl(self, size);
 
 exit:
@@ -332,4 +328,4 @@ static PyObject *
 #ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
     #define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
 #endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */
-/*[clinic end generated code: output=04dab03363f5e304 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0e99bd39a97f4dcc input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_sha3/clinic/sha3module.c.h
--- a/Modules/_sha3/clinic/sha3module.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_sha3/clinic/sha3module.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -99,7 +99,7 @@ PyDoc_STRVAR(_sha3_shake_128_digest__doc
 "Return the digest value as a string of binary data.");
 
 #define _SHA3_SHAKE_128_DIGEST_METHODDEF    \
-    {"digest", (PyCFunction)_sha3_shake_128_digest, METH_FASTCALL, _sha3_shake_128_digest__doc__},
+    {"digest", (PyCFunction)_sha3_shake_128_digest, METH_FASTCALL|METH_KEYWORDS, _sha3_shake_128_digest__doc__},
 
 static PyObject *
 _sha3_shake_128_digest_impl(SHA3object *self, unsigned long length);
@@ -129,7 +129,7 @@ PyDoc_STRVAR(_sha3_shake_128_hexdigest__
 "Return the digest value as a string of hexadecimal digits.");
 
 #define _SHA3_SHAKE_128_HEXDIGEST_METHODDEF    \
-    {"hexdigest", (PyCFunction)_sha3_shake_128_hexdigest, METH_FASTCALL, _sha3_shake_128_hexdigest__doc__},
+    {"hexdigest", (PyCFunction)_sha3_shake_128_hexdigest, METH_FASTCALL|METH_KEYWORDS, _sha3_shake_128_hexdigest__doc__},
 
 static PyObject *
 _sha3_shake_128_hexdigest_impl(SHA3object *self, unsigned long length);
@@ -151,4 +151,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=f2278bf0852a7850 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7c1ac102411764f2 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/_struct.c
--- a/Modules/_struct.c	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/_struct.c	Mon Feb 06 17:12:36 2017 +0200
@@ -1845,7 +1845,7 @@ to the format string S.format.  See help
 strings.");
 
 static PyObject *
-s_pack(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+s_pack(PyObject *self, PyObject **args, Py_ssize_t nargs)
 {
     PyStructObject *soself;
     PyObject *result;
@@ -1860,9 +1860,6 @@ s_pack(PyObject *self, PyObject **args, 
             "pack expected %zd items for packing (got %zd)", soself->s_len, nargs);
         return NULL;
     }
-    if (!_PyArg_NoStackKeywords("pack", kwnames)) {
-        return NULL;
-    }
 
     /* Allocate a new string */
     result = PyBytes_FromStringAndSize((char *)NULL, soself->s_size);
@@ -1887,7 +1884,7 @@ offset.  Note that the offset is a requi
 help(struct) for more on format strings.");
 
 static PyObject *
-s_pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+s_pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs)
 {
     PyStructObject *soself;
     Py_buffer buffer;
@@ -1914,9 +1911,6 @@ s_pack_into(PyObject *self, PyObject **a
         }
         return NULL;
     }
-    if (!_PyArg_NoStackKeywords("pack_into", kwnames)) {
-        return NULL;
-    }
 
     /* Extract a writable memory buffer from the first argument */
     if (!PyArg_Parse(args[0], "w*", &buffer))
@@ -2124,7 +2118,7 @@ Return a bytes object containing the val
 to the format string.  See help(struct) for more on format strings.");
 
 static PyObject *
-pack(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+pack(PyObject *self, PyObject **args, Py_ssize_t nargs)
 {
     PyObject *s_object = NULL;
     PyObject *format, *result;
@@ -2138,7 +2132,7 @@ pack(PyObject *self, PyObject **args, Py
     if (!cache_struct_converter(format, &s_object)) {
         return NULL;
     }
-    result = s_pack(s_object, args + 1, nargs - 1, kwnames);
+    result = s_pack(s_object, args + 1, nargs - 1);
     Py_DECREF(s_object);
     return result;
 }
@@ -2152,7 +2146,7 @@ that the offset is a required argument. 
 on format strings.");
 
 static PyObject *
-pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs)
 {
     PyObject *s_object = NULL;
     PyObject *format, *result;
@@ -2166,7 +2160,7 @@ pack_into(PyObject *self, PyObject **arg
     if (!cache_struct_converter(format, &s_object)) {
         return NULL;
     }
-    result = s_pack_into(s_object, args + 1, nargs - 1, kwnames);
+    result = s_pack_into(s_object, args + 1, nargs - 1);
     Py_DECREF(s_object);
     return result;
 }
diff -r ca2f024ce7cb Modules/cjkcodecs/clinic/multibytecodec.c.h
--- a/Modules/cjkcodecs/clinic/multibytecodec.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -14,7 +14,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteCo
 "registered with codecs.register_error that can handle UnicodeEncodeErrors.");
 
 #define _MULTIBYTECODEC_MULTIBYTECODEC_ENCODE_METHODDEF    \
-    {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_FASTCALL, _multibytecodec_MultibyteCodec_encode__doc__},
+    {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteCodec_encode__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self,
@@ -52,7 +52,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteCo
 "codecs.register_error that is able to handle UnicodeDecodeErrors.\"");
 
 #define _MULTIBYTECODEC_MULTIBYTECODEC_DECODE_METHODDEF    \
-    {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_FASTCALL, _multibytecodec_MultibyteCodec_decode__doc__},
+    {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteCodec_decode__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self,
@@ -89,7 +89,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIn
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALENCODER_ENCODE_METHODDEF    \
-    {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_FASTCALL, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__},
+    {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self,
@@ -138,7 +138,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIn
 "\n");
 
 #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALDECODER_DECODE_METHODDEF    \
-    {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_FASTCALL, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__},
+    {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__},
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self,
@@ -209,10 +209,6 @@ static PyObject *
         &sizeobj)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _multibytecodec_MultibyteStreamReader_read_impl(self, sizeobj);
 
 exit:
@@ -242,10 +238,6 @@ static PyObject *
         &sizeobj)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readline", kwnames)) {
-        goto exit;
-    }
     return_value = _multibytecodec_MultibyteStreamReader_readline_impl(self, sizeobj);
 
 exit:
@@ -275,10 +267,6 @@ static PyObject *
         &sizehintobj)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readlines", kwnames)) {
-        goto exit;
-    }
     return_value = _multibytecodec_MultibyteStreamReader_readlines_impl(self, sizehintobj);
 
 exit:
@@ -342,4 +330,4 @@ PyDoc_STRVAR(_multibytecodec___create_co
 
 #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF    \
     {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
-/*[clinic end generated code: output=26710ffd4b3c7d7e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3d15ac7e5d406462 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_asynciomodule.c.h
--- a/Modules/clinic/_asynciomodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_asynciomodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -267,7 +267,7 @@ PyDoc_STRVAR(_asyncio_Task_current_task_
 "None is returned when called not in the context of a Task.");
 
 #define _ASYNCIO_TASK_CURRENT_TASK_METHODDEF    \
-    {"current_task", (PyCFunction)_asyncio_Task_current_task, METH_FASTCALL|METH_CLASS, _asyncio_Task_current_task__doc__},
+    {"current_task", (PyCFunction)_asyncio_Task_current_task, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, _asyncio_Task_current_task__doc__},
 
 static PyObject *
 _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop);
@@ -299,7 +299,7 @@ PyDoc_STRVAR(_asyncio_Task_all_tasks__do
 "By default all tasks for the current event loop are returned.");
 
 #define _ASYNCIO_TASK_ALL_TASKS_METHODDEF    \
-    {"all_tasks", (PyCFunction)_asyncio_Task_all_tasks, METH_FASTCALL|METH_CLASS, _asyncio_Task_all_tasks__doc__},
+    {"all_tasks", (PyCFunction)_asyncio_Task_all_tasks, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, _asyncio_Task_all_tasks__doc__},
 
 static PyObject *
 _asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop);
@@ -399,7 +399,7 @@ PyDoc_STRVAR(_asyncio_Task_get_stack__do
 "returned for a suspended coroutine.");
 
 #define _ASYNCIO_TASK_GET_STACK_METHODDEF    \
-    {"get_stack", (PyCFunction)_asyncio_Task_get_stack, METH_FASTCALL, _asyncio_Task_get_stack__doc__},
+    {"get_stack", (PyCFunction)_asyncio_Task_get_stack, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task_get_stack__doc__},
 
 static PyObject *
 _asyncio_Task_get_stack_impl(TaskObj *self, PyObject *limit);
@@ -435,7 +435,7 @@ PyDoc_STRVAR(_asyncio_Task_print_stack__
 "to sys.stderr.");
 
 #define _ASYNCIO_TASK_PRINT_STACK_METHODDEF    \
-    {"print_stack", (PyCFunction)_asyncio_Task_print_stack, METH_FASTCALL, _asyncio_Task_print_stack__doc__},
+    {"print_stack", (PyCFunction)_asyncio_Task_print_stack, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task_print_stack__doc__},
 
 static PyObject *
 _asyncio_Task_print_stack_impl(TaskObj *self, PyObject *limit,
@@ -466,7 +466,7 @@ PyDoc_STRVAR(_asyncio_Task__step__doc__,
 "\n");
 
 #define _ASYNCIO_TASK__STEP_METHODDEF    \
-    {"_step", (PyCFunction)_asyncio_Task__step, METH_FASTCALL, _asyncio_Task__step__doc__},
+    {"_step", (PyCFunction)_asyncio_Task__step, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task__step__doc__},
 
 static PyObject *
 _asyncio_Task__step_impl(TaskObj *self, PyObject *exc);
@@ -495,7 +495,7 @@ PyDoc_STRVAR(_asyncio_Task__wakeup__doc_
 "\n");
 
 #define _ASYNCIO_TASK__WAKEUP_METHODDEF    \
-    {"_wakeup", (PyCFunction)_asyncio_Task__wakeup, METH_FASTCALL, _asyncio_Task__wakeup__doc__},
+    {"_wakeup", (PyCFunction)_asyncio_Task__wakeup, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task__wakeup__doc__},
 
 static PyObject *
 _asyncio_Task__wakeup_impl(TaskObj *self, PyObject *fut);
@@ -517,4 +517,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=07a15bbb28d03edc input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f3b6ace6ef0741b6 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_bz2module.c.h
--- a/Modules/clinic/_bz2module.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_bz2module.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -115,7 +115,7 @@ PyDoc_STRVAR(_bz2_BZ2Decompressor_decomp
 "the unused_data attribute.");
 
 #define _BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_FASTCALL, _bz2_BZ2Decompressor_decompress__doc__},
+    {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_FASTCALL|METH_KEYWORDS, _bz2_BZ2Decompressor_decompress__doc__},
 
 static PyObject *
 _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
@@ -174,4 +174,4 @@ static int
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=0e97a1d716b35a14 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=835673574cf12cc4 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_codecsmodule.c.h
--- a/Modules/clinic/_codecsmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_codecsmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -55,7 +55,7 @@ PyDoc_STRVAR(_codecs_encode__doc__,
 "codecs.register_error that can handle ValueErrors.");
 
 #define _CODECS_ENCODE_METHODDEF    \
-    {"encode", (PyCFunction)_codecs_encode, METH_FASTCALL, _codecs_encode__doc__},
+    {"encode", (PyCFunction)_codecs_encode, METH_FASTCALL|METH_KEYWORDS, _codecs_encode__doc__},
 
 static PyObject *
 _codecs_encode_impl(PyObject *module, PyObject *obj, const char *encoding,
@@ -94,7 +94,7 @@ PyDoc_STRVAR(_codecs_decode__doc__,
 "codecs.register_error that can handle ValueErrors.");
 
 #define _CODECS_DECODE_METHODDEF    \
-    {"decode", (PyCFunction)_codecs_decode, METH_FASTCALL, _codecs_decode__doc__},
+    {"decode", (PyCFunction)_codecs_decode, METH_FASTCALL|METH_KEYWORDS, _codecs_decode__doc__},
 
 static PyObject *
 _codecs_decode_impl(PyObject *module, PyObject *obj, const char *encoding,
@@ -170,10 +170,6 @@ static PyObject *
         &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("escape_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_escape_decode_impl(module, &data, errors);
 
 exit:
@@ -208,10 +204,6 @@ static PyObject *
         &PyBytes_Type, &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("escape_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_escape_encode_impl(module, data, errors);
 
 exit:
@@ -241,10 +233,6 @@ static PyObject *
         &obj, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("unicode_internal_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_unicode_internal_decode_impl(module, obj, errors);
 
 exit:
@@ -275,10 +263,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_7_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_7_decode_impl(module, &data, errors, final);
 
 exit:
@@ -314,10 +298,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_8_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_8_decode_impl(module, &data, errors, final);
 
 exit:
@@ -353,10 +333,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_decode_impl(module, &data, errors, final);
 
 exit:
@@ -392,10 +368,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_le_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_le_decode_impl(module, &data, errors, final);
 
 exit:
@@ -431,10 +403,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_be_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_be_decode_impl(module, &data, errors, final);
 
 exit:
@@ -472,10 +440,6 @@ static PyObject *
         &data, &errors, &byteorder, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_ex_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_ex_decode_impl(module, &data, errors, byteorder, final);
 
 exit:
@@ -511,10 +475,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_decode_impl(module, &data, errors, final);
 
 exit:
@@ -550,10 +510,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_le_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_le_decode_impl(module, &data, errors, final);
 
 exit:
@@ -589,10 +545,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_be_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_be_decode_impl(module, &data, errors, final);
 
 exit:
@@ -630,10 +582,6 @@ static PyObject *
         &data, &errors, &byteorder, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_ex_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_ex_decode_impl(module, &data, errors, byteorder, final);
 
 exit:
@@ -668,10 +616,6 @@ static PyObject *
         &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("unicode_escape_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_unicode_escape_decode_impl(module, &data, errors);
 
 exit:
@@ -706,10 +650,6 @@ static PyObject *
         &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("raw_unicode_escape_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_raw_unicode_escape_decode_impl(module, &data, errors);
 
 exit:
@@ -744,10 +684,6 @@ static PyObject *
         &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("latin_1_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_latin_1_decode_impl(module, &data, errors);
 
 exit:
@@ -782,10 +718,6 @@ static PyObject *
         &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ascii_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_ascii_decode_impl(module, &data, errors);
 
 exit:
@@ -821,10 +753,6 @@ static PyObject *
         &data, &errors, &mapping)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("charmap_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_charmap_decode_impl(module, &data, errors, mapping);
 
 exit:
@@ -862,10 +790,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("mbcs_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_mbcs_decode_impl(module, &data, errors, final);
 
 exit:
@@ -905,10 +829,6 @@ static PyObject *
         &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("oem_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_oem_decode_impl(module, &data, errors, final);
 
 exit:
@@ -949,10 +869,6 @@ static PyObject *
         &codepage, &data, &errors, &final)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("code_page_decode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_code_page_decode_impl(module, codepage, &data, errors, final);
 
 exit:
@@ -989,10 +905,6 @@ static PyObject *
         &data, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readbuffer_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_readbuffer_encode_impl(module, &data, errors);
 
 exit:
@@ -1027,10 +939,6 @@ static PyObject *
         &obj, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("unicode_internal_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_unicode_internal_encode_impl(module, obj, errors);
 
 exit:
@@ -1060,10 +968,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_7_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_7_encode_impl(module, str, errors);
 
 exit:
@@ -1093,10 +997,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_8_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_8_encode_impl(module, str, errors);
 
 exit:
@@ -1127,10 +1027,6 @@ static PyObject *
         &str, &errors, &byteorder)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_encode_impl(module, str, errors, byteorder);
 
 exit:
@@ -1160,10 +1056,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_le_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_le_encode_impl(module, str, errors);
 
 exit:
@@ -1193,10 +1085,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_16_be_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_16_be_encode_impl(module, str, errors);
 
 exit:
@@ -1227,10 +1115,6 @@ static PyObject *
         &str, &errors, &byteorder)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_encode_impl(module, str, errors, byteorder);
 
 exit:
@@ -1260,10 +1144,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_le_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_le_encode_impl(module, str, errors);
 
 exit:
@@ -1293,10 +1173,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("utf_32_be_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_utf_32_be_encode_impl(module, str, errors);
 
 exit:
@@ -1326,10 +1202,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("unicode_escape_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_unicode_escape_encode_impl(module, str, errors);
 
 exit:
@@ -1359,10 +1231,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("raw_unicode_escape_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_raw_unicode_escape_encode_impl(module, str, errors);
 
 exit:
@@ -1392,10 +1260,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("latin_1_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_latin_1_encode_impl(module, str, errors);
 
 exit:
@@ -1425,10 +1289,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ascii_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_ascii_encode_impl(module, str, errors);
 
 exit:
@@ -1459,10 +1319,6 @@ static PyObject *
         &str, &errors, &mapping)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("charmap_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_charmap_encode_impl(module, str, errors, mapping);
 
 exit:
@@ -1519,10 +1375,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("mbcs_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_mbcs_encode_impl(module, str, errors);
 
 exit:
@@ -1555,10 +1407,6 @@ static PyObject *
         &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("oem_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_oem_encode_impl(module, str, errors);
 
 exit:
@@ -1593,10 +1441,6 @@ static PyObject *
         &code_page, &str, &errors)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("code_page_encode", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_code_page_encode_impl(module, code_page, str, errors);
 
 exit:
@@ -1633,10 +1477,6 @@ static PyObject *
         &errors, &handler)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("register_error", kwnames)) {
-        goto exit;
-    }
     return_value = _codecs_register_error_impl(module, errors, handler);
 
 exit:
@@ -1696,4 +1536,4 @@ exit:
 #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF
     #define _CODECS_CODE_PAGE_ENCODE_METHODDEF
 #endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */
-/*[clinic end generated code: output=36fb42f450a3b4dc input=a9049054013a1b77]*/
+/*[clinic end generated code: output=09a72da8388936d9 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_cryptmodule.c.h
--- a/Modules/clinic/_cryptmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_cryptmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -30,13 +30,9 @@ crypt_crypt(PyObject *module, PyObject *
         &word, &salt)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("crypt", kwnames)) {
-        goto exit;
-    }
     return_value = crypt_crypt_impl(module, word, salt);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3fd5d3625a6f32fe input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5e3b44118b471b11 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_datetimemodule.c.h
--- a/Modules/clinic/_datetimemodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_datetimemodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -14,7 +14,7 @@ PyDoc_STRVAR(datetime_datetime_now__doc_
 "If no tz is specified, uses local timezone.");
 
 #define DATETIME_DATETIME_NOW_METHODDEF    \
-    {"now", (PyCFunction)datetime_datetime_now, METH_FASTCALL|METH_CLASS, datetime_datetime_now__doc__},
+    {"now", (PyCFunction)datetime_datetime_now, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, datetime_datetime_now__doc__},
 
 static PyObject *
 datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz);
@@ -36,4 +36,4 @@ datetime_datetime_now(PyTypeObject *type
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=ff78f2f51687e9a9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=93cb014e47dae4b3 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_dbmmodule.c.h
--- a/Modules/clinic/_dbmmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_dbmmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -63,10 +63,6 @@ static PyObject *
         &key, &key_length, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("get", kwnames)) {
-        goto exit;
-    }
     return_value = _dbm_dbm_get_impl(self, key, key_length, default_value);
 
 exit:
@@ -101,10 +97,6 @@ static PyObject *
         &key, &key_length, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setdefault", kwnames)) {
-        goto exit;
-    }
     return_value = _dbm_dbm_setdefault_impl(self, key, key_length, default_value);
 
 exit:
@@ -144,13 +136,9 @@ dbmopen(PyObject *module, PyObject **arg
         &filename, &flags, &mode)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("open", kwnames)) {
-        goto exit;
-    }
     return_value = dbmopen_impl(module, filename, flags, mode);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=4fdb7be8bd03cbce input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6fb5f52ea44a3caf input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_elementtree.c.h
--- a/Modules/clinic/_elementtree.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_elementtree.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -136,7 +136,7 @@ PyDoc_STRVAR(_elementtree_Element_find__
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_FIND_METHODDEF    \
-    {"find", (PyCFunction)_elementtree_Element_find, METH_FASTCALL, _elementtree_Element_find__doc__},
+    {"find", (PyCFunction)_elementtree_Element_find, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_find__doc__},
 
 static PyObject *
 _elementtree_Element_find_impl(ElementObject *self, PyObject *path,
@@ -167,7 +167,7 @@ PyDoc_STRVAR(_elementtree_Element_findte
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_FINDTEXT_METHODDEF    \
-    {"findtext", (PyCFunction)_elementtree_Element_findtext, METH_FASTCALL, _elementtree_Element_findtext__doc__},
+    {"findtext", (PyCFunction)_elementtree_Element_findtext, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_findtext__doc__},
 
 static PyObject *
 _elementtree_Element_findtext_impl(ElementObject *self, PyObject *path,
@@ -200,7 +200,7 @@ PyDoc_STRVAR(_elementtree_Element_findal
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_FINDALL_METHODDEF    \
-    {"findall", (PyCFunction)_elementtree_Element_findall, METH_FASTCALL, _elementtree_Element_findall__doc__},
+    {"findall", (PyCFunction)_elementtree_Element_findall, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_findall__doc__},
 
 static PyObject *
 _elementtree_Element_findall_impl(ElementObject *self, PyObject *path,
@@ -231,7 +231,7 @@ PyDoc_STRVAR(_elementtree_Element_iterfi
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_ITERFIND_METHODDEF    \
-    {"iterfind", (PyCFunction)_elementtree_Element_iterfind, METH_FASTCALL, _elementtree_Element_iterfind__doc__},
+    {"iterfind", (PyCFunction)_elementtree_Element_iterfind, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_iterfind__doc__},
 
 static PyObject *
 _elementtree_Element_iterfind_impl(ElementObject *self, PyObject *path,
@@ -262,7 +262,7 @@ PyDoc_STRVAR(_elementtree_Element_get__d
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_GET_METHODDEF    \
-    {"get", (PyCFunction)_elementtree_Element_get, METH_FASTCALL, _elementtree_Element_get__doc__},
+    {"get", (PyCFunction)_elementtree_Element_get, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_get__doc__},
 
 static PyObject *
 _elementtree_Element_get_impl(ElementObject *self, PyObject *key,
@@ -310,7 +310,7 @@ PyDoc_STRVAR(_elementtree_Element_iter__
 "\n");
 
 #define _ELEMENTTREE_ELEMENT_ITER_METHODDEF    \
-    {"iter", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL, _elementtree_Element_iter__doc__},
+    {"iter", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_iter__doc__},
 
 static PyObject *
 _elementtree_Element_iter_impl(ElementObject *self, PyObject *tag);
@@ -373,10 +373,6 @@ static PyObject *
         &index, &Element_Type, &subelement)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("insert", kwnames)) {
-        goto exit;
-    }
     return_value = _elementtree_Element_insert_impl(self, index, subelement);
 
 exit:
@@ -441,10 +437,6 @@ static PyObject *
         &tag, &attrib)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("makeelement", kwnames)) {
-        goto exit;
-    }
     return_value = _elementtree_Element_makeelement_impl(self, tag, attrib);
 
 exit:
@@ -501,10 +493,6 @@ static PyObject *
         &key, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("set", kwnames)) {
-        goto exit;
-    }
     return_value = _elementtree_Element_set_impl(self, key, value);
 
 exit:
@@ -590,10 +578,6 @@ static PyObject *
         &tag, &attrs)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("start", kwnames)) {
-        goto exit;
-    }
     return_value = _elementtree_TreeBuilder_start_impl(self, tag, attrs);
 
 exit:
@@ -682,10 +666,6 @@ static PyObject *
         &name, &pubid, &system)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("doctype", kwnames)) {
-        goto exit;
-    }
     return_value = _elementtree_XMLParser_doctype_impl(self, name, pubid, system);
 
 exit:
@@ -717,13 +697,9 @@ static PyObject *
         &events_queue, &events_to_report)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("_setevents", kwnames)) {
-        goto exit;
-    }
     return_value = _elementtree_XMLParser__setevents_impl(self, events_queue, events_to_report);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b69fa98c40917f58 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=44a3e83702d8e4b8 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_gdbmmodule.c.h
--- a/Modules/clinic/_gdbmmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_gdbmmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -26,10 +26,6 @@ static PyObject *
         &key, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("get", kwnames)) {
-        goto exit;
-    }
     return_value = _gdbm_gdbm_get_impl(self, key, default_value);
 
 exit:
@@ -61,10 +57,6 @@ static PyObject *
         &key, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setdefault", kwnames)) {
-        goto exit;
-    }
     return_value = _gdbm_gdbm_setdefault_impl(self, key, default_value);
 
 exit:
@@ -256,13 +248,9 @@ dbmopen(PyObject *module, PyObject **arg
         &name, &flags, &mode)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("open", kwnames)) {
-        goto exit;
-    }
     return_value = dbmopen_impl(module, name, flags, mode);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=03a3a63a814ada93 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=dba093a3dafaee1d input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_hashopenssl.c.h
--- a/Modules/clinic/_hashopenssl.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_hashopenssl.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -12,7 +12,7 @@ PyDoc_STRVAR(_hashlib_scrypt__doc__,
 "scrypt password-based key derivation function.");
 
 #define _HASHLIB_SCRYPT_METHODDEF    \
-    {"scrypt", (PyCFunction)_hashlib_scrypt, METH_FASTCALL, _hashlib_scrypt__doc__},
+    {"scrypt", (PyCFunction)_hashlib_scrypt, METH_FASTCALL|METH_KEYWORDS, _hashlib_scrypt__doc__},
 
 static PyObject *
 _hashlib_scrypt_impl(PyObject *module, Py_buffer *password, Py_buffer *salt,
@@ -57,4 +57,4 @@ exit:
 #ifndef _HASHLIB_SCRYPT_METHODDEF
     #define _HASHLIB_SCRYPT_METHODDEF
 #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */
-/*[clinic end generated code: output=71f1e033efe4ac9a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=eda2a998d5b29030 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_lzmamodule.c.h
--- a/Modules/clinic/_lzmamodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_lzmamodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -81,7 +81,7 @@ PyDoc_STRVAR(_lzma_LZMADecompressor_deco
 "the unused_data attribute.");
 
 #define _LZMA_LZMADECOMPRESSOR_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_FASTCALL, _lzma_LZMADecompressor_decompress__doc__},
+    {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_FASTCALL|METH_KEYWORDS, _lzma_LZMADecompressor_decompress__doc__},
 
 static PyObject *
 _lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data,
@@ -246,10 +246,6 @@ static PyObject *
         lzma_vli_converter, &filter_id, &encoded_props)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("_decode_filter_properties", kwnames)) {
-        goto exit;
-    }
     return_value = _lzma__decode_filter_properties_impl(module, filter_id, &encoded_props);
 
 exit:
@@ -260,4 +256,4 @@ exit:
 
     return return_value;
 }
-/*[clinic end generated code: output=5f7a915fb7e41453 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a299a70382fbdc95 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_opcode.c.h
--- a/Modules/clinic/_opcode.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_opcode.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -26,10 +26,6 @@ static PyObject *
         &opcode, &oparg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("stack_effect", kwnames)) {
-        goto exit;
-    }
     _return_value = _opcode_stack_effect_impl(module, opcode, oparg);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -39,4 +35,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=62858005ac85baa9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e408533bbf9c0ff1 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_operator.c.h
--- a/Modules/clinic/_operator.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_operator.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -54,10 +54,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("add", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_add_impl(module, a, b);
 
 exit:
@@ -88,10 +84,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("sub", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_sub_impl(module, a, b);
 
 exit:
@@ -122,10 +114,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("mul", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_mul_impl(module, a, b);
 
 exit:
@@ -156,10 +144,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("matmul", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_matmul_impl(module, a, b);
 
 exit:
@@ -190,10 +174,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("floordiv", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_floordiv_impl(module, a, b);
 
 exit:
@@ -224,10 +204,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("truediv", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_truediv_impl(module, a, b);
 
 exit:
@@ -258,10 +234,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("mod", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_mod_impl(module, a, b);
 
 exit:
@@ -337,10 +309,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lshift", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_lshift_impl(module, a, b);
 
 exit:
@@ -371,10 +339,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rshift", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_rshift_impl(module, a, b);
 
 exit:
@@ -433,10 +397,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("and_", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_and__impl(module, a, b);
 
 exit:
@@ -467,10 +427,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("xor", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_xor_impl(module, a, b);
 
 exit:
@@ -501,10 +457,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("or_", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_or__impl(module, a, b);
 
 exit:
@@ -535,10 +487,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("iadd", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_iadd_impl(module, a, b);
 
 exit:
@@ -569,10 +517,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("isub", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_isub_impl(module, a, b);
 
 exit:
@@ -603,10 +547,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("imul", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_imul_impl(module, a, b);
 
 exit:
@@ -637,10 +577,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("imatmul", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_imatmul_impl(module, a, b);
 
 exit:
@@ -671,10 +607,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ifloordiv", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ifloordiv_impl(module, a, b);
 
 exit:
@@ -705,10 +637,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("itruediv", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_itruediv_impl(module, a, b);
 
 exit:
@@ -739,10 +667,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("imod", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_imod_impl(module, a, b);
 
 exit:
@@ -773,10 +697,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ilshift", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ilshift_impl(module, a, b);
 
 exit:
@@ -807,10 +727,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("irshift", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_irshift_impl(module, a, b);
 
 exit:
@@ -841,10 +757,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("iand", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_iand_impl(module, a, b);
 
 exit:
@@ -875,10 +787,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ixor", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ixor_impl(module, a, b);
 
 exit:
@@ -909,10 +817,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ior", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ior_impl(module, a, b);
 
 exit:
@@ -943,10 +847,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("concat", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_concat_impl(module, a, b);
 
 exit:
@@ -977,10 +877,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("iconcat", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_iconcat_impl(module, a, b);
 
 exit:
@@ -1012,10 +908,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("contains", kwnames)) {
-        goto exit;
-    }
     _return_value = _operator_contains_impl(module, a, b);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -1051,10 +943,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("indexOf", kwnames)) {
-        goto exit;
-    }
     _return_value = _operator_indexOf_impl(module, a, b);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -1090,10 +978,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("countOf", kwnames)) {
-        goto exit;
-    }
     _return_value = _operator_countOf_impl(module, a, b);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -1128,10 +1012,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("getitem", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_getitem_impl(module, a, b);
 
 exit:
@@ -1164,10 +1044,6 @@ static PyObject *
         &a, &b, &c)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setitem", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_setitem_impl(module, a, b, c);
 
 exit:
@@ -1198,10 +1074,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("delitem", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_delitem_impl(module, a, b);
 
 exit:
@@ -1232,10 +1104,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("eq", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_eq_impl(module, a, b);
 
 exit:
@@ -1266,10 +1134,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ne", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ne_impl(module, a, b);
 
 exit:
@@ -1300,10 +1164,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lt", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_lt_impl(module, a, b);
 
 exit:
@@ -1334,10 +1194,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("le", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_le_impl(module, a, b);
 
 exit:
@@ -1368,10 +1224,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("gt", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_gt_impl(module, a, b);
 
 exit:
@@ -1402,10 +1254,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ge", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ge_impl(module, a, b);
 
 exit:
@@ -1436,10 +1284,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pow", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_pow_impl(module, a, b);
 
 exit:
@@ -1470,10 +1314,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ipow", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_ipow_impl(module, a, b);
 
 exit:
@@ -1513,10 +1353,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("is_", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_is__impl(module, a, b);
 
 exit:
@@ -1547,10 +1383,6 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("is_not", kwnames)) {
-        goto exit;
-    }
     return_value = _operator_is_not_impl(module, a, b);
 
 exit:
@@ -1588,10 +1420,6 @@ static PyObject *
         &obj, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("length_hint", kwnames)) {
-        goto exit;
-    }
     _return_value = _operator_length_hint_impl(module, obj, default_value);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -1636,13 +1464,9 @@ static PyObject *
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("_compare_digest", kwnames)) {
-        goto exit;
-    }
     return_value = _operator__compare_digest_impl(module, a, b);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=c030b6747fddd9c6 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9ca966fef851861c input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_pickle.c.h
--- a/Modules/clinic/_pickle.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_pickle.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -218,10 +218,6 @@ static PyObject *
         &module_name, &global_name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("find_class", kwnames)) {
-        goto exit;
-    }
     return_value = _pickle_Unpickler_find_class_impl(self, module_name, global_name);
 
 exit:
@@ -388,7 +384,7 @@ PyDoc_STRVAR(_pickle_dump__doc__,
 "2, so that the pickle data stream is readable with Python 2.");
 
 #define _PICKLE_DUMP_METHODDEF    \
-    {"dump", (PyCFunction)_pickle_dump, METH_FASTCALL, _pickle_dump__doc__},
+    {"dump", (PyCFunction)_pickle_dump, METH_FASTCALL|METH_KEYWORDS, _pickle_dump__doc__},
 
 static PyObject *
 _pickle_dump_impl(PyObject *module, PyObject *obj, PyObject *file,
@@ -434,7 +430,7 @@ PyDoc_STRVAR(_pickle_dumps__doc__,
 "Python 2, so that the pickle data stream is readable with Python 2.");
 
 #define _PICKLE_DUMPS_METHODDEF    \
-    {"dumps", (PyCFunction)_pickle_dumps, METH_FASTCALL, _pickle_dumps__doc__},
+    {"dumps", (PyCFunction)_pickle_dumps, METH_FASTCALL|METH_KEYWORDS, _pickle_dumps__doc__},
 
 static PyObject *
 _pickle_dumps_impl(PyObject *module, PyObject *obj, PyObject *protocol,
@@ -490,7 +486,7 @@ PyDoc_STRVAR(_pickle_load__doc__,
 "string instances as bytes objects.");
 
 #define _PICKLE_LOAD_METHODDEF    \
-    {"load", (PyCFunction)_pickle_load, METH_FASTCALL, _pickle_load__doc__},
+    {"load", (PyCFunction)_pickle_load, METH_FASTCALL|METH_KEYWORDS, _pickle_load__doc__},
 
 static PyObject *
 _pickle_load_impl(PyObject *module, PyObject *file, int fix_imports,
@@ -538,7 +534,7 @@ PyDoc_STRVAR(_pickle_loads__doc__,
 "string instances as bytes objects.");
 
 #define _PICKLE_LOADS_METHODDEF    \
-    {"loads", (PyCFunction)_pickle_loads, METH_FASTCALL, _pickle_loads__doc__},
+    {"loads", (PyCFunction)_pickle_loads, METH_FASTCALL|METH_KEYWORDS, _pickle_loads__doc__},
 
 static PyObject *
 _pickle_loads_impl(PyObject *module, PyObject *data, int fix_imports,
@@ -564,4 +560,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b921d325b2f7a096 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b51d30ad613aab46 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_sre.c.h
--- a/Modules/clinic/_sre.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_sre.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -52,10 +52,6 @@ static PyObject *
         &character, &flags)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("getlower", kwnames)) {
-        goto exit;
-    }
     _return_value = _sre_getlower_impl(module, character, flags);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -73,7 +69,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_match__doc
 "Matches zero or more characters at the beginning of the string.");
 
 #define _SRE_SRE_PATTERN_MATCH_METHODDEF    \
-    {"match", (PyCFunction)_sre_SRE_Pattern_match, METH_FASTCALL, _sre_SRE_Pattern_match__doc__},
+    {"match", (PyCFunction)_sre_SRE_Pattern_match, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_match__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_match_impl(PatternObject *self, PyObject *string,
@@ -106,7 +102,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_fullmatch_
 "Matches against all of the string");
 
 #define _SRE_SRE_PATTERN_FULLMATCH_METHODDEF    \
-    {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_FASTCALL, _sre_SRE_Pattern_fullmatch__doc__},
+    {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_fullmatch__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_fullmatch_impl(PatternObject *self, PyObject *string,
@@ -141,7 +137,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_search__do
 "Return None if no position in the string matches.");
 
 #define _SRE_SRE_PATTERN_SEARCH_METHODDEF    \
-    {"search", (PyCFunction)_sre_SRE_Pattern_search, METH_FASTCALL, _sre_SRE_Pattern_search__doc__},
+    {"search", (PyCFunction)_sre_SRE_Pattern_search, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_search__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_search_impl(PatternObject *self, PyObject *string,
@@ -174,7 +170,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_findall__d
 "Return a list of all non-overlapping matches of pattern in string.");
 
 #define _SRE_SRE_PATTERN_FINDALL_METHODDEF    \
-    {"findall", (PyCFunction)_sre_SRE_Pattern_findall, METH_FASTCALL, _sre_SRE_Pattern_findall__doc__},
+    {"findall", (PyCFunction)_sre_SRE_Pattern_findall, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_findall__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_findall_impl(PatternObject *self, PyObject *string,
@@ -209,7 +205,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_finditer__
 "For each match, the iterator returns a match object.");
 
 #define _SRE_SRE_PATTERN_FINDITER_METHODDEF    \
-    {"finditer", (PyCFunction)_sre_SRE_Pattern_finditer, METH_FASTCALL, _sre_SRE_Pattern_finditer__doc__},
+    {"finditer", (PyCFunction)_sre_SRE_Pattern_finditer, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_finditer__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_finditer_impl(PatternObject *self, PyObject *string,
@@ -241,7 +237,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_scanner__d
 "\n");
 
 #define _SRE_SRE_PATTERN_SCANNER_METHODDEF    \
-    {"scanner", (PyCFunction)_sre_SRE_Pattern_scanner, METH_FASTCALL, _sre_SRE_Pattern_scanner__doc__},
+    {"scanner", (PyCFunction)_sre_SRE_Pattern_scanner, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_scanner__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_scanner_impl(PatternObject *self, PyObject *string,
@@ -274,7 +270,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_split__doc
 "Split string by the occurrences of pattern.");
 
 #define _SRE_SRE_PATTERN_SPLIT_METHODDEF    \
-    {"split", (PyCFunction)_sre_SRE_Pattern_split, METH_FASTCALL, _sre_SRE_Pattern_split__doc__},
+    {"split", (PyCFunction)_sre_SRE_Pattern_split, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_split__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_split_impl(PatternObject *self, PyObject *string,
@@ -306,7 +302,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_sub__doc__
 "Return the string obtained by replacing the leftmost non-overlapping occurrences of pattern in string by the replacement repl.");
 
 #define _SRE_SRE_PATTERN_SUB_METHODDEF    \
-    {"sub", (PyCFunction)_sre_SRE_Pattern_sub, METH_FASTCALL, _sre_SRE_Pattern_sub__doc__},
+    {"sub", (PyCFunction)_sre_SRE_Pattern_sub, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_sub__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_sub_impl(PatternObject *self, PyObject *repl,
@@ -339,7 +335,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_subn__doc_
 "Return the tuple (new_string, number_of_subs_made) found by replacing the leftmost non-overlapping occurrences of pattern with the replacement repl.");
 
 #define _SRE_SRE_PATTERN_SUBN_METHODDEF    \
-    {"subn", (PyCFunction)_sre_SRE_Pattern_subn, METH_FASTCALL, _sre_SRE_Pattern_subn__doc__},
+    {"subn", (PyCFunction)_sre_SRE_Pattern_subn, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_subn__doc__},
 
 static PyObject *
 _sre_SRE_Pattern_subn_impl(PatternObject *self, PyObject *repl,
@@ -388,7 +384,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern___deepcopy
 "\n");
 
 #define _SRE_SRE_PATTERN___DEEPCOPY___METHODDEF    \
-    {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_FASTCALL, _sre_SRE_Pattern___deepcopy____doc__},
+    {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern___deepcopy____doc__},
 
 static PyObject *
 _sre_SRE_Pattern___deepcopy___impl(PatternObject *self, PyObject *memo);
@@ -418,7 +414,7 @@ PyDoc_STRVAR(_sre_compile__doc__,
 "\n");
 
 #define _SRE_COMPILE_METHODDEF    \
-    {"compile", (PyCFunction)_sre_compile, METH_FASTCALL, _sre_compile__doc__},
+    {"compile", (PyCFunction)_sre_compile, METH_FASTCALL|METH_KEYWORDS, _sre_compile__doc__},
 
 static PyObject *
 _sre_compile_impl(PyObject *module, PyObject *pattern, int flags,
@@ -455,7 +451,7 @@ PyDoc_STRVAR(_sre_SRE_Match_expand__doc_
 "Return the string obtained by doing backslash substitution on the string template, as done by the sub() method.");
 
 #define _SRE_SRE_MATCH_EXPAND_METHODDEF    \
-    {"expand", (PyCFunction)_sre_SRE_Match_expand, METH_FASTCALL, _sre_SRE_Match_expand__doc__},
+    {"expand", (PyCFunction)_sre_SRE_Match_expand, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match_expand__doc__},
 
 static PyObject *
 _sre_SRE_Match_expand_impl(MatchObject *self, PyObject *template);
@@ -488,7 +484,7 @@ PyDoc_STRVAR(_sre_SRE_Match_groups__doc_
 "    Is used for groups that did not participate in the match.");
 
 #define _SRE_SRE_MATCH_GROUPS_METHODDEF    \
-    {"groups", (PyCFunction)_sre_SRE_Match_groups, METH_FASTCALL, _sre_SRE_Match_groups__doc__},
+    {"groups", (PyCFunction)_sre_SRE_Match_groups, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match_groups__doc__},
 
 static PyObject *
 _sre_SRE_Match_groups_impl(MatchObject *self, PyObject *default_value);
@@ -521,7 +517,7 @@ PyDoc_STRVAR(_sre_SRE_Match_groupdict__d
 "    Is used for groups that did not participate in the match.");
 
 #define _SRE_SRE_MATCH_GROUPDICT_METHODDEF    \
-    {"groupdict", (PyCFunction)_sre_SRE_Match_groupdict, METH_FASTCALL, _sre_SRE_Match_groupdict__doc__},
+    {"groupdict", (PyCFunction)_sre_SRE_Match_groupdict, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match_groupdict__doc__},
 
 static PyObject *
 _sre_SRE_Match_groupdict_impl(MatchObject *self, PyObject *default_value);
@@ -568,10 +564,6 @@ static PyObject *
         &group)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("start", kwnames)) {
-        goto exit;
-    }
     _return_value = _sre_SRE_Match_start_impl(self, group);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -606,10 +598,6 @@ static PyObject *
         &group)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("end", kwnames)) {
-        goto exit;
-    }
     _return_value = _sre_SRE_Match_end_impl(self, group);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -643,10 +631,6 @@ static PyObject *
         &group)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("span", kwnames)) {
-        goto exit;
-    }
     return_value = _sre_SRE_Match_span_impl(self, group);
 
 exit:
@@ -676,7 +660,7 @@ PyDoc_STRVAR(_sre_SRE_Match___deepcopy__
 "\n");
 
 #define _SRE_SRE_MATCH___DEEPCOPY___METHODDEF    \
-    {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_FASTCALL, _sre_SRE_Match___deepcopy____doc__},
+    {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match___deepcopy____doc__},
 
 static PyObject *
 _sre_SRE_Match___deepcopy___impl(MatchObject *self, PyObject *memo);
@@ -732,4 +716,4 @@ static PyObject *
 {
     return _sre_SRE_Scanner_search_impl(self);
 }
-/*[clinic end generated code: output=5df18da8e2dc762c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4393e000af6c6348 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_ssl.c.h
--- a/Modules/clinic/_ssl.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_ssl.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -75,10 +75,6 @@ static PyObject *
         &binary_mode)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("peer_certificate", kwnames)) {
-        goto exit;
-    }
     return_value = _ssl__SSLSocket_peer_certificate_impl(self, binary_mode);
 
 exit:
@@ -473,7 +469,7 @@ PyDoc_STRVAR(_ssl__SSLContext_load_cert_
 "\n");
 
 #define _SSL__SSLCONTEXT_LOAD_CERT_CHAIN_METHODDEF    \
-    {"load_cert_chain", (PyCFunction)_ssl__SSLContext_load_cert_chain, METH_FASTCALL, _ssl__SSLContext_load_cert_chain__doc__},
+    {"load_cert_chain", (PyCFunction)_ssl__SSLContext_load_cert_chain, METH_FASTCALL|METH_KEYWORDS, _ssl__SSLContext_load_cert_chain__doc__},
 
 static PyObject *
 _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
@@ -505,7 +501,7 @@ PyDoc_STRVAR(_ssl__SSLContext_load_verif
 "\n");
 
 #define _SSL__SSLCONTEXT_LOAD_VERIFY_LOCATIONS_METHODDEF    \
-    {"load_verify_locations", (PyCFunction)_ssl__SSLContext_load_verify_locations, METH_FASTCALL, _ssl__SSLContext_load_verify_locations__doc__},
+    {"load_verify_locations", (PyCFunction)_ssl__SSLContext_load_verify_locations, METH_FASTCALL|METH_KEYWORDS, _ssl__SSLContext_load_verify_locations__doc__},
 
 static PyObject *
 _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
@@ -547,7 +543,7 @@ PyDoc_STRVAR(_ssl__SSLContext__wrap_sock
 "\n");
 
 #define _SSL__SSLCONTEXT__WRAP_SOCKET_METHODDEF    \
-    {"_wrap_socket", (PyCFunction)_ssl__SSLContext__wrap_socket, METH_FASTCALL, _ssl__SSLContext__wrap_socket__doc__},
+    {"_wrap_socket", (PyCFunction)_ssl__SSLContext__wrap_socket, METH_FASTCALL|METH_KEYWORDS, _ssl__SSLContext__wrap_socket__doc__},
 
 static PyObject *
 _ssl__SSLContext__wrap_socket_impl(PySSLContext *self, PyObject *sock,
@@ -580,7 +576,7 @@ PyDoc_STRVAR(_ssl__SSLContext__wrap_bio_
 "\n");
 
 #define _SSL__SSLCONTEXT__WRAP_BIO_METHODDEF    \
-    {"_wrap_bio", (PyCFunction)_ssl__SSLContext__wrap_bio, METH_FASTCALL, _ssl__SSLContext__wrap_bio__doc__},
+    {"_wrap_bio", (PyCFunction)_ssl__SSLContext__wrap_bio, METH_FASTCALL|METH_KEYWORDS, _ssl__SSLContext__wrap_bio__doc__},
 
 static PyObject *
 _ssl__SSLContext__wrap_bio_impl(PySSLContext *self, PySSLMemoryBIO *incoming,
@@ -704,7 +700,7 @@ PyDoc_STRVAR(_ssl__SSLContext_get_ca_cer
 "been used at least once.");
 
 #define _SSL__SSLCONTEXT_GET_CA_CERTS_METHODDEF    \
-    {"get_ca_certs", (PyCFunction)_ssl__SSLContext_get_ca_certs, METH_FASTCALL, _ssl__SSLContext_get_ca_certs__doc__},
+    {"get_ca_certs", (PyCFunction)_ssl__SSLContext_get_ca_certs, METH_FASTCALL|METH_KEYWORDS, _ssl__SSLContext_get_ca_certs__doc__},
 
 static PyObject *
 _ssl__SSLContext_get_ca_certs_impl(PySSLContext *self, int binary_form);
@@ -776,10 +772,6 @@ static PyObject *
         &len)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = _ssl_MemoryBIO_read_impl(self, len);
 
 exit:
@@ -866,10 +858,6 @@ static PyObject *
         &view, &entropy)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("RAND_add", kwnames)) {
-        goto exit;
-    }
     return_value = _ssl_RAND_add_impl(module, &view, entropy);
 
 exit:
@@ -1023,7 +1011,7 @@ PyDoc_STRVAR(_ssl_txt2obj__doc__,
 "long name are also matched.");
 
 #define _SSL_TXT2OBJ_METHODDEF    \
-    {"txt2obj", (PyCFunction)_ssl_txt2obj, METH_FASTCALL, _ssl_txt2obj__doc__},
+    {"txt2obj", (PyCFunction)_ssl_txt2obj, METH_FASTCALL|METH_KEYWORDS, _ssl_txt2obj__doc__},
 
 static PyObject *
 _ssl_txt2obj_impl(PyObject *module, const char *txt, int name);
@@ -1089,7 +1077,7 @@ PyDoc_STRVAR(_ssl_enum_certificates__doc
 "a set of OIDs or the boolean True.");
 
 #define _SSL_ENUM_CERTIFICATES_METHODDEF    \
-    {"enum_certificates", (PyCFunction)_ssl_enum_certificates, METH_FASTCALL, _ssl_enum_certificates__doc__},
+    {"enum_certificates", (PyCFunction)_ssl_enum_certificates, METH_FASTCALL|METH_KEYWORDS, _ssl_enum_certificates__doc__},
 
 static PyObject *
 _ssl_enum_certificates_impl(PyObject *module, const char *store_name);
@@ -1128,7 +1116,7 @@ PyDoc_STRVAR(_ssl_enum_crls__doc__,
 "X509_ASN_ENCODING or PKCS_7_ASN_ENCODING.");
 
 #define _SSL_ENUM_CRLS_METHODDEF    \
-    {"enum_crls", (PyCFunction)_ssl_enum_crls, METH_FASTCALL, _ssl_enum_crls__doc__},
+    {"enum_crls", (PyCFunction)_ssl_enum_crls, METH_FASTCALL|METH_KEYWORDS, _ssl_enum_crls__doc__},
 
 static PyObject *
 _ssl_enum_crls_impl(PyObject *module, const char *store_name);
@@ -1180,4 +1168,4 @@ exit:
 #ifndef _SSL_ENUM_CRLS_METHODDEF
     #define _SSL_ENUM_CRLS_METHODDEF
 #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
-/*[clinic end generated code: output=53cd9100580b45a2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a2b5601a9955f451 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_struct.c.h
--- a/Modules/clinic/_struct.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_struct.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -84,7 +84,7 @@ PyDoc_STRVAR(Struct_unpack_from__doc__,
 "See help(struct) for more on format strings.");
 
 #define STRUCT_UNPACK_FROM_METHODDEF    \
-    {"unpack_from", (PyCFunction)Struct_unpack_from, METH_FASTCALL, Struct_unpack_from__doc__},
+    {"unpack_from", (PyCFunction)Struct_unpack_from, METH_FASTCALL|METH_KEYWORDS, Struct_unpack_from__doc__},
 
 static PyObject *
 Struct_unpack_from_impl(PyStructObject *self, Py_buffer *buffer,
@@ -208,10 +208,6 @@ unpack(PyObject *module, PyObject **args
         cache_struct_converter, &s_object, &buffer)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("unpack", kwnames)) {
-        goto exit;
-    }
     return_value = unpack_impl(module, s_object, &buffer);
 
 exit:
@@ -236,7 +232,7 @@ PyDoc_STRVAR(unpack_from__doc__,
 "See help(struct) for more on format strings.");
 
 #define UNPACK_FROM_METHODDEF    \
-    {"unpack_from", (PyCFunction)unpack_from, METH_FASTCALL, unpack_from__doc__},
+    {"unpack_from", (PyCFunction)unpack_from, METH_FASTCALL|METH_KEYWORDS, unpack_from__doc__},
 
 static PyObject *
 unpack_from_impl(PyObject *module, PyStructObject *s_object,
@@ -298,10 +294,6 @@ iter_unpack(PyObject *module, PyObject *
         cache_struct_converter, &s_object, &buffer)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("iter_unpack", kwnames)) {
-        goto exit;
-    }
     return_value = iter_unpack_impl(module, s_object, buffer);
 
 exit:
@@ -310,4 +302,4 @@ exit:
 
     return return_value;
 }
-/*[clinic end generated code: output=03e0d193ab1983f9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1337a1b322ebb77d input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_tkinter.c.h
--- a/Modules/clinic/_tkinter.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_tkinter.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -273,10 +273,6 @@ static PyObject *
         &name, &func)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("createcommand", kwnames)) {
-        goto exit;
-    }
     return_value = _tkinter_tkapp_createcommand_impl(self, name, func);
 
 exit:
@@ -335,10 +331,6 @@ static PyObject *
         &file, &mask, &func)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("createfilehandler", kwnames)) {
-        goto exit;
-    }
     return_value = _tkinter_tkapp_createfilehandler_impl(self, file, mask, func);
 
 exit:
@@ -399,10 +391,6 @@ static PyObject *
         &milliseconds, &func)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("createtimerhandler", kwnames)) {
-        goto exit;
-    }
     return_value = _tkinter_tkapp_createtimerhandler_impl(self, milliseconds, func);
 
 exit:
@@ -430,10 +418,6 @@ static PyObject *
         &threshold)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("mainloop", kwnames)) {
-        goto exit;
-    }
     return_value = _tkinter_tkapp_mainloop_impl(self, threshold);
 
 exit:
@@ -461,10 +445,6 @@ static PyObject *
         &flags)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("dooneevent", kwnames)) {
-        goto exit;
-    }
     return_value = _tkinter_tkapp_dooneevent_impl(self, flags);
 
 exit:
@@ -588,10 +568,6 @@ static PyObject *
         &screenName, &baseName, &className, &interactive, &wantobjects, &wantTk, &sync, &use)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("create", kwnames)) {
-        goto exit;
-    }
     return_value = _tkinter_create_impl(module, screenName, baseName, className, interactive, wantobjects, wantTk, sync, use);
 
 exit:
@@ -662,4 +638,4 @@ exit:
 #ifndef _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
     #define _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF
 #endif /* !defined(_TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF) */
-/*[clinic end generated code: output=328e29a146c4a63b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=473419d2cdb28838 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_tracemalloc.c.h
--- a/Modules/clinic/_tracemalloc.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_tracemalloc.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -99,10 +99,6 @@ static PyObject *
         &nframe)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("start", kwnames)) {
-        goto exit;
-    }
     return_value = _tracemalloc_start_impl(module, nframe);
 
 exit:
@@ -189,4 +185,4 @@ static PyObject *
 {
     return _tracemalloc_get_traced_memory_impl(module);
 }
-/*[clinic end generated code: output=159ce5d627964f09 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3a12dee2638f7efd input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_weakref.c.h
--- a/Modules/clinic/_weakref.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_weakref.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -54,13 +54,9 @@ static PyObject *
         &PyDict_Type, &dct, &key)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("_remove_dead_weakref", kwnames)) {
-        goto exit;
-    }
     return_value = _weakref__remove_dead_weakref_impl(module, dct, key);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b686303486bdfefd input=a9049054013a1b77]*/
+/*[clinic end generated code: output=89ae8547bb5cbb6a input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/_winapi.c.h
--- a/Modules/clinic/_winapi.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/_winapi.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -95,7 +95,7 @@ PyDoc_STRVAR(_winapi_ConnectNamedPipe__d
 "\n");
 
 #define _WINAPI_CONNECTNAMEDPIPE_METHODDEF    \
-    {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_FASTCALL, _winapi_ConnectNamedPipe__doc__},
+    {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_FASTCALL|METH_KEYWORDS, _winapi_ConnectNamedPipe__doc__},
 
 static PyObject *
 _winapi_ConnectNamedPipe_impl(PyObject *module, HANDLE handle,
@@ -154,10 +154,6 @@ static PyObject *
         &file_name, &desired_access, &share_mode, &security_attributes, &creation_disposition, &flags_and_attributes, &template_file)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CreateFile", kwnames)) {
-        goto exit;
-    }
     _return_value = _winapi_CreateFile_impl(module, file_name, desired_access, share_mode, security_attributes, creation_disposition, flags_and_attributes, template_file);
     if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) {
         goto exit;
@@ -194,10 +190,6 @@ static PyObject *
         &src_path, &dst_path)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CreateJunction", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_CreateJunction_impl(module, src_path, dst_path);
 
 exit:
@@ -239,10 +231,6 @@ static PyObject *
         &name, &open_mode, &pipe_mode, &max_instances, &out_buffer_size, &in_buffer_size, &default_timeout, &security_attributes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CreateNamedPipe", kwnames)) {
-        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);
     if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) {
         goto exit;
@@ -284,10 +272,6 @@ static PyObject *
         &pipe_attrs, &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CreatePipe", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_CreatePipe_impl(module, pipe_attrs, size);
 
 exit:
@@ -339,10 +323,6 @@ static PyObject *
         &application_name, &command_line, &proc_attrs, &thread_attrs, &inherit_handles, &creation_flags, &env_mapping, &current_directory, &startup_info)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CreateProcess", kwnames)) {
-        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);
 
 exit:
@@ -387,10 +367,6 @@ static PyObject *
         &source_process_handle, &source_handle, &target_process_handle, &desired_access, &inherit_handle, &options)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("DuplicateHandle", kwnames)) {
-        goto exit;
-    }
     _return_value = _winapi_DuplicateHandle_impl(module, source_process_handle, source_handle, target_process_handle, desired_access, inherit_handle, options);
     if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) {
         goto exit;
@@ -647,10 +623,6 @@ static PyObject *
         &desired_access, &inherit_handle, &process_id)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("OpenProcess", kwnames)) {
-        goto exit;
-    }
     _return_value = _winapi_OpenProcess_impl(module, desired_access, inherit_handle, process_id);
     if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) {
         goto exit;
@@ -686,10 +658,6 @@ static PyObject *
         &handle, &size)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("PeekNamedPipe", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_PeekNamedPipe_impl(module, handle, size);
 
 exit:
@@ -702,7 +670,7 @@ PyDoc_STRVAR(_winapi_ReadFile__doc__,
 "\n");
 
 #define _WINAPI_READFILE_METHODDEF    \
-    {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_FASTCALL, _winapi_ReadFile__doc__},
+    {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_FASTCALL|METH_KEYWORDS, _winapi_ReadFile__doc__},
 
 static PyObject *
 _winapi_ReadFile_impl(PyObject *module, HANDLE handle, int size,
@@ -756,10 +724,6 @@ static PyObject *
         &named_pipe, &mode, &max_collection_count, &collect_data_timeout)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("SetNamedPipeHandleState", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_SetNamedPipeHandleState_impl(module, named_pipe, mode, max_collection_count, collect_data_timeout);
 
 exit:
@@ -790,10 +754,6 @@ static PyObject *
         &handle, &exit_code)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("TerminateProcess", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_TerminateProcess_impl(module, handle, exit_code);
 
 exit:
@@ -822,10 +782,6 @@ static PyObject *
         &name, &timeout)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("WaitNamedPipe", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_WaitNamedPipe_impl(module, name, timeout);
 
 exit:
@@ -857,10 +813,6 @@ static PyObject *
         &handle_seq, &wait_flag, &milliseconds)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("WaitForMultipleObjects", kwnames)) {
-        goto exit;
-    }
     return_value = _winapi_WaitForMultipleObjects_impl(module, handle_seq, wait_flag, milliseconds);
 
 exit:
@@ -896,10 +848,6 @@ static PyObject *
         &handle, &milliseconds)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("WaitForSingleObject", kwnames)) {
-        goto exit;
-    }
     _return_value = _winapi_WaitForSingleObject_impl(module, handle, milliseconds);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -916,7 +864,7 @@ PyDoc_STRVAR(_winapi_WriteFile__doc__,
 "\n");
 
 #define _WINAPI_WRITEFILE_METHODDEF    \
-    {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_FASTCALL, _winapi_WriteFile__doc__},
+    {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_FASTCALL|METH_KEYWORDS, _winapi_WriteFile__doc__},
 
 static PyObject *
 _winapi_WriteFile_impl(PyObject *module, HANDLE handle, PyObject *buffer,
@@ -941,4 +889,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=2beb984508fb040a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=436d547082f91b41 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/arraymodule.c.h
--- a/Modules/clinic/arraymodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/arraymodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -80,10 +80,6 @@ array_array_pop(arrayobject *self, PyObj
         &i)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pop", kwnames)) {
-        goto exit;
-    }
     return_value = array_array_pop_impl(self, i);
 
 exit:
@@ -122,10 +118,6 @@ array_array_insert(arrayobject *self, Py
         &i, &v)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("insert", kwnames)) {
-        goto exit;
-    }
     return_value = array_array_insert_impl(self, i, v);
 
 exit:
@@ -224,10 +216,6 @@ array_array_fromfile(arrayobject *self, 
         &f, &n)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("fromfile", kwnames)) {
-        goto exit;
-    }
     return_value = array_array_fromfile_impl(self, f, n);
 
 exit:
@@ -476,10 +464,6 @@ array__array_reconstructor(PyObject *mod
         &arraytype, &typecode, &mformat_code, &items)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("_array_reconstructor", kwnames)) {
-        goto exit;
-    }
     return_value = array__array_reconstructor_impl(module, arraytype, typecode, mformat_code, items);
 
 exit:
@@ -521,4 +505,4 @@ PyDoc_STRVAR(array_arrayiterator___setst
 
 #define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF    \
     {"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__},
-/*[clinic end generated code: output=d186a7553c1f1a41 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=95c5f7117cafa0a5 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/audioop.c.h
--- a/Modules/clinic/audioop.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/audioop.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -27,10 +27,6 @@ audioop_getsample(PyObject *module, PyOb
         &fragment, &width, &index)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("getsample", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_getsample_impl(module, &fragment, width, index);
 
 exit:
@@ -65,10 +61,6 @@ audioop_max(PyObject *module, PyObject *
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("max", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_max_impl(module, &fragment, width);
 
 exit:
@@ -103,10 +95,6 @@ audioop_minmax(PyObject *module, PyObjec
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("minmax", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_minmax_impl(module, &fragment, width);
 
 exit:
@@ -141,10 +129,6 @@ audioop_avg(PyObject *module, PyObject *
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("avg", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_avg_impl(module, &fragment, width);
 
 exit:
@@ -179,10 +163,6 @@ audioop_rms(PyObject *module, PyObject *
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rms", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_rms_impl(module, &fragment, width);
 
 exit:
@@ -218,10 +198,6 @@ audioop_findfit(PyObject *module, PyObje
         &fragment, &reference)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("findfit", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_findfit_impl(module, &fragment, &reference);
 
 exit:
@@ -261,10 +237,6 @@ audioop_findfactor(PyObject *module, PyO
         &fragment, &reference)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("findfactor", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_findfactor_impl(module, &fragment, &reference);
 
 exit:
@@ -304,10 +276,6 @@ audioop_findmax(PyObject *module, PyObje
         &fragment, &length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("findmax", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_findmax_impl(module, &fragment, length);
 
 exit:
@@ -342,10 +310,6 @@ audioop_avgpp(PyObject *module, PyObject
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("avgpp", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_avgpp_impl(module, &fragment, width);
 
 exit:
@@ -380,10 +344,6 @@ audioop_maxpp(PyObject *module, PyObject
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("maxpp", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_maxpp_impl(module, &fragment, width);
 
 exit:
@@ -418,10 +378,6 @@ audioop_cross(PyObject *module, PyObject
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("cross", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_cross_impl(module, &fragment, width);
 
 exit:
@@ -458,10 +414,6 @@ audioop_mul(PyObject *module, PyObject *
         &fragment, &width, &factor)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("mul", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_mul_impl(module, &fragment, width, factor);
 
 exit:
@@ -499,10 +451,6 @@ audioop_tomono(PyObject *module, PyObjec
         &fragment, &width, &lfactor, &rfactor)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("tomono", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_tomono_impl(module, &fragment, width, lfactor, rfactor);
 
 exit:
@@ -540,10 +488,6 @@ audioop_tostereo(PyObject *module, PyObj
         &fragment, &width, &lfactor, &rfactor)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("tostereo", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_tostereo_impl(module, &fragment, width, lfactor, rfactor);
 
 exit:
@@ -580,10 +524,6 @@ audioop_add(PyObject *module, PyObject *
         &fragment1, &fragment2, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("add", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_add_impl(module, &fragment1, &fragment2, width);
 
 exit:
@@ -623,10 +563,6 @@ audioop_bias(PyObject *module, PyObject 
         &fragment, &width, &bias)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("bias", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_bias_impl(module, &fragment, width, bias);
 
 exit:
@@ -661,10 +597,6 @@ audioop_reverse(PyObject *module, PyObje
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("reverse", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_reverse_impl(module, &fragment, width);
 
 exit:
@@ -699,10 +631,6 @@ audioop_byteswap(PyObject *module, PyObj
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("byteswap", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_byteswap_impl(module, &fragment, width);
 
 exit:
@@ -739,10 +667,6 @@ audioop_lin2lin(PyObject *module, PyObje
         &fragment, &width, &newwidth)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lin2lin", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_lin2lin_impl(module, &fragment, width, newwidth);
 
 exit:
@@ -786,10 +710,6 @@ audioop_ratecv(PyObject *module, PyObjec
         &fragment, &width, &nchannels, &inrate, &outrate, &state, &weightA, &weightB)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ratecv", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_ratecv_impl(module, &fragment, width, nchannels, inrate, outrate, state, weightA, weightB);
 
 exit:
@@ -824,10 +744,6 @@ audioop_lin2ulaw(PyObject *module, PyObj
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lin2ulaw", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_lin2ulaw_impl(module, &fragment, width);
 
 exit:
@@ -862,10 +778,6 @@ audioop_ulaw2lin(PyObject *module, PyObj
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ulaw2lin", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_ulaw2lin_impl(module, &fragment, width);
 
 exit:
@@ -900,10 +812,6 @@ audioop_lin2alaw(PyObject *module, PyObj
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lin2alaw", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_lin2alaw_impl(module, &fragment, width);
 
 exit:
@@ -938,10 +846,6 @@ audioop_alaw2lin(PyObject *module, PyObj
         &fragment, &width)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("alaw2lin", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_alaw2lin_impl(module, &fragment, width);
 
 exit:
@@ -978,10 +882,6 @@ audioop_lin2adpcm(PyObject *module, PyOb
         &fragment, &width, &state)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lin2adpcm", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_lin2adpcm_impl(module, &fragment, width, state);
 
 exit:
@@ -1018,10 +918,6 @@ audioop_adpcm2lin(PyObject *module, PyOb
         &fragment, &width, &state)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("adpcm2lin", kwnames)) {
-        goto exit;
-    }
     return_value = audioop_adpcm2lin_impl(module, &fragment, width, state);
 
 exit:
@@ -1032,4 +928,4 @@ exit:
 
     return return_value;
 }
-/*[clinic end generated code: output=ee7c63ec28a11b78 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d1962192852af2f5 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/binascii.c.h
--- a/Modules/clinic/binascii.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/binascii.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -103,7 +103,7 @@ PyDoc_STRVAR(binascii_b2a_base64__doc__,
 "Base64-code line of data.");
 
 #define BINASCII_B2A_BASE64_METHODDEF    \
-    {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_FASTCALL, binascii_b2a_base64__doc__},
+    {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_FASTCALL|METH_KEYWORDS, binascii_b2a_base64__doc__},
 
 static PyObject *
 binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, int newline);
@@ -283,10 +283,6 @@ binascii_crc_hqx(PyObject *module, PyObj
         &data, &crc)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("crc_hqx", kwnames)) {
-        goto exit;
-    }
     _return_value = binascii_crc_hqx_impl(module, &data, crc);
     if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) {
         goto exit;
@@ -326,10 +322,6 @@ binascii_crc32(PyObject *module, PyObjec
         &data, &crc)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("crc32", kwnames)) {
-        goto exit;
-    }
     _return_value = binascii_crc32_impl(module, &data, crc);
     if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) {
         goto exit;
@@ -488,7 +480,7 @@ PyDoc_STRVAR(binascii_a2b_qp__doc__,
 "Decode a string of qp-encoded data.");
 
 #define BINASCII_A2B_QP_METHODDEF    \
-    {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_FASTCALL, binascii_a2b_qp__doc__},
+    {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_FASTCALL|METH_KEYWORDS, binascii_a2b_qp__doc__},
 
 static PyObject *
 binascii_a2b_qp_impl(PyObject *module, Py_buffer *data, int header);
@@ -527,7 +519,7 @@ PyDoc_STRVAR(binascii_b2a_qp__doc__,
 "are both encoded.  When quotetabs is set, space and tabs are encoded.");
 
 #define BINASCII_B2A_QP_METHODDEF    \
-    {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_FASTCALL, binascii_b2a_qp__doc__},
+    {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_FASTCALL|METH_KEYWORDS, binascii_b2a_qp__doc__},
 
 static PyObject *
 binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs,
@@ -558,4 +550,4 @@ exit:
 
     return return_value;
 }
-/*[clinic end generated code: output=4a418f883ccc79fe input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e5e7575bdcd7777a input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/cmathmodule.c.h
--- a/Modules/clinic/cmathmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/cmathmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -657,10 +657,6 @@ cmath_log(PyObject *module, PyObject **a
         &x, &y_obj)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("log", kwnames)) {
-        goto exit;
-    }
     return_value = cmath_log_impl(module, x, y_obj);
 
 exit:
@@ -746,10 +742,6 @@ cmath_rect(PyObject *module, PyObject **
         &r, &phi)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rect", kwnames)) {
-        goto exit;
-    }
     return_value = cmath_rect_impl(module, r, phi);
 
 exit:
@@ -859,7 +851,7 @@ PyDoc_STRVAR(cmath_isclose__doc__,
 "not close to anything, even itself. inf and -inf are only close to themselves.");
 
 #define CMATH_ISCLOSE_METHODDEF    \
-    {"isclose", (PyCFunction)cmath_isclose, METH_FASTCALL, cmath_isclose__doc__},
+    {"isclose", (PyCFunction)cmath_isclose, METH_FASTCALL|METH_KEYWORDS, cmath_isclose__doc__},
 
 static int
 cmath_isclose_impl(PyObject *module, Py_complex a, Py_complex b,
@@ -890,4 +882,4 @@ cmath_isclose(PyObject *module, PyObject
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=93eff5d4c242ee57 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7af9c97b5288feac input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/fcntlmodule.c.h
--- a/Modules/clinic/fcntlmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/fcntlmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -36,10 +36,6 @@ fcntl_fcntl(PyObject *module, PyObject *
         conv_descriptor, &fd, &code, &arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("fcntl", kwnames)) {
-        goto exit;
-    }
     return_value = fcntl_fcntl_impl(module, fd, code, arg);
 
 exit:
@@ -99,10 +95,6 @@ fcntl_ioctl(PyObject *module, PyObject *
         conv_descriptor, &fd, &code, &ob_arg, &mutate_arg)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ioctl", kwnames)) {
-        goto exit;
-    }
     return_value = fcntl_ioctl_impl(module, fd, code, ob_arg, mutate_arg);
 
 exit:
@@ -135,10 +127,6 @@ fcntl_flock(PyObject *module, PyObject *
         conv_descriptor, &fd, &code)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("flock", kwnames)) {
-        goto exit;
-    }
     return_value = fcntl_flock_impl(module, fd, code);
 
 exit:
@@ -193,13 +181,9 @@ fcntl_lockf(PyObject *module, PyObject *
         conv_descriptor, &fd, &code, &lenobj, &startobj, &whence)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lockf", kwnames)) {
-        goto exit;
-    }
     return_value = fcntl_lockf_impl(module, fd, code, lenobj, startobj, whence);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b67e9579722e6d4f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c329c359cab4d9fa input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/gcmodule.c.h
--- a/Modules/clinic/gcmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/gcmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -79,7 +79,7 @@ PyDoc_STRVAR(gc_collect__doc__,
 "The number of unreachable objects is returned.");
 
 #define GC_COLLECT_METHODDEF    \
-    {"collect", (PyCFunction)gc_collect, METH_FASTCALL, gc_collect__doc__},
+    {"collect", (PyCFunction)gc_collect, METH_FASTCALL|METH_KEYWORDS, gc_collect__doc__},
 
 static Py_ssize_t
 gc_collect_impl(PyObject *module, int generation);
@@ -255,4 +255,4 @@ PyDoc_STRVAR(gc_is_tracked__doc__,
 
 #define GC_IS_TRACKED_METHODDEF    \
     {"is_tracked", (PyCFunction)gc_is_tracked, METH_O, gc_is_tracked__doc__},
-/*[clinic end generated code: output=8f487abc53fe4161 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5a58583f00ab018e input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/grpmodule.c.h
--- a/Modules/clinic/grpmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/grpmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -11,7 +11,7 @@ PyDoc_STRVAR(grp_getgrgid__doc__,
 "If id is not valid, raise KeyError.");
 
 #define GRP_GETGRGID_METHODDEF    \
-    {"getgrgid", (PyCFunction)grp_getgrgid, METH_FASTCALL, grp_getgrgid__doc__},
+    {"getgrgid", (PyCFunction)grp_getgrgid, METH_FASTCALL|METH_KEYWORDS, grp_getgrgid__doc__},
 
 static PyObject *
 grp_getgrgid_impl(PyObject *module, PyObject *id);
@@ -43,7 +43,7 @@ PyDoc_STRVAR(grp_getgrnam__doc__,
 "If name is not valid, raise KeyError.");
 
 #define GRP_GETGRNAM_METHODDEF    \
-    {"getgrnam", (PyCFunction)grp_getgrnam, METH_FASTCALL, grp_getgrnam__doc__},
+    {"getgrnam", (PyCFunction)grp_getgrnam, METH_FASTCALL|METH_KEYWORDS, grp_getgrnam__doc__},
 
 static PyObject *
 grp_getgrnam_impl(PyObject *module, PyObject *name);
@@ -86,4 +86,4 @@ grp_getgrall(PyObject *module, PyObject 
 {
     return grp_getgrall_impl(module);
 }
-/*[clinic end generated code: output=fb690db5e676d378 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e7ef2cbc437eedcb input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/mathmodule.c.h
--- a/Modules/clinic/mathmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/mathmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -26,10 +26,6 @@ math_gcd(PyObject *module, PyObject **ar
         &a, &b)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("gcd", kwnames)) {
-        goto exit;
-    }
     return_value = math_gcd_impl(module, a, b);
 
 exit:
@@ -146,10 +142,6 @@ math_ldexp(PyObject *module, PyObject **
         &x, &i)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ldexp", kwnames)) {
-        goto exit;
-    }
     return_value = math_ldexp_impl(module, x, i);
 
 exit:
@@ -271,10 +263,6 @@ math_fmod(PyObject *module, PyObject **a
         &x, &y)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("fmod", kwnames)) {
-        goto exit;
-    }
     return_value = math_fmod_impl(module, x, y);
 
 exit:
@@ -304,10 +292,6 @@ math_hypot(PyObject *module, PyObject **
         &x, &y)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("hypot", kwnames)) {
-        goto exit;
-    }
     return_value = math_hypot_impl(module, x, y);
 
 exit:
@@ -337,10 +321,6 @@ math_pow(PyObject *module, PyObject **ar
         &x, &y)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pow", kwnames)) {
-        goto exit;
-    }
     return_value = math_pow_impl(module, x, y);
 
 exit:
@@ -505,7 +485,7 @@ PyDoc_STRVAR(math_isclose__doc__,
 "only close to themselves.");
 
 #define MATH_ISCLOSE_METHODDEF    \
-    {"isclose", (PyCFunction)math_isclose, METH_FASTCALL, math_isclose__doc__},
+    {"isclose", (PyCFunction)math_isclose, METH_FASTCALL|METH_KEYWORDS, math_isclose__doc__},
 
 static int
 math_isclose_impl(PyObject *module, double a, double b, double rel_tol,
@@ -536,4 +516,4 @@ math_isclose(PyObject *module, PyObject 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=71806f73a5c4bf0b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ebd3bdc820a2c0c4 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/md5module.c.h
--- a/Modules/clinic/md5module.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/md5module.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -72,7 +72,7 @@ PyDoc_STRVAR(_md5_md5__doc__,
 "Return a new MD5 hash object; optionally initialized with a string.");
 
 #define _MD5_MD5_METHODDEF    \
-    {"md5", (PyCFunction)_md5_md5, METH_FASTCALL, _md5_md5__doc__},
+    {"md5", (PyCFunction)_md5_md5, METH_FASTCALL|METH_KEYWORDS, _md5_md5__doc__},
 
 static PyObject *
 _md5_md5_impl(PyObject *module, PyObject *string);
@@ -94,4 +94,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=0a975e22cf33f833 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3139ae340ad1ea4e input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/posixmodule.c.h
--- a/Modules/clinic/posixmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/posixmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -28,7 +28,7 @@ PyDoc_STRVAR(os_stat__doc__,
 "  an open file descriptor.");
 
 #define OS_STAT_METHODDEF    \
-    {"stat", (PyCFunction)os_stat, METH_FASTCALL, os_stat__doc__},
+    {"stat", (PyCFunction)os_stat, METH_FASTCALL|METH_KEYWORDS, os_stat__doc__},
 
 static PyObject *
 os_stat_impl(PyObject *module, path_t *path, int dir_fd, int follow_symlinks);
@@ -66,7 +66,7 @@ PyDoc_STRVAR(os_lstat__doc__,
 "Equivalent to stat(path, follow_symlinks=False).");
 
 #define OS_LSTAT_METHODDEF    \
-    {"lstat", (PyCFunction)os_lstat, METH_FASTCALL, os_lstat__doc__},
+    {"lstat", (PyCFunction)os_lstat, METH_FASTCALL|METH_KEYWORDS, os_lstat__doc__},
 
 static PyObject *
 os_lstat_impl(PyObject *module, path_t *path, int dir_fd);
@@ -126,7 +126,7 @@ PyDoc_STRVAR(os_access__doc__,
 "  has the specified access to the path.");
 
 #define OS_ACCESS_METHODDEF    \
-    {"access", (PyCFunction)os_access, METH_FASTCALL, os_access__doc__},
+    {"access", (PyCFunction)os_access, METH_FASTCALL|METH_KEYWORDS, os_access__doc__},
 
 static int
 os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd,
@@ -234,7 +234,7 @@ PyDoc_STRVAR(os_chdir__doc__,
 "  If this functionality is unavailable, using it raises an exception.");
 
 #define OS_CHDIR_METHODDEF    \
-    {"chdir", (PyCFunction)os_chdir, METH_FASTCALL, os_chdir__doc__},
+    {"chdir", (PyCFunction)os_chdir, METH_FASTCALL|METH_KEYWORDS, os_chdir__doc__},
 
 static PyObject *
 os_chdir_impl(PyObject *module, path_t *path);
@@ -272,7 +272,7 @@ PyDoc_STRVAR(os_fchdir__doc__,
 "Equivalent to os.chdir(fd).");
 
 #define OS_FCHDIR_METHODDEF    \
-    {"fchdir", (PyCFunction)os_fchdir, METH_FASTCALL, os_fchdir__doc__},
+    {"fchdir", (PyCFunction)os_fchdir, METH_FASTCALL|METH_KEYWORDS, os_fchdir__doc__},
 
 static PyObject *
 os_fchdir_impl(PyObject *module, int fd);
@@ -324,7 +324,7 @@ PyDoc_STRVAR(os_chmod__doc__,
 "  If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_CHMOD_METHODDEF    \
-    {"chmod", (PyCFunction)os_chmod, METH_FASTCALL, os_chmod__doc__},
+    {"chmod", (PyCFunction)os_chmod, METH_FASTCALL|METH_KEYWORDS, os_chmod__doc__},
 
 static PyObject *
 os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd,
@@ -365,7 +365,7 @@ PyDoc_STRVAR(os_fchmod__doc__,
 "Equivalent to os.chmod(fd, mode).");
 
 #define OS_FCHMOD_METHODDEF    \
-    {"fchmod", (PyCFunction)os_fchmod, METH_FASTCALL, os_fchmod__doc__},
+    {"fchmod", (PyCFunction)os_fchmod, METH_FASTCALL|METH_KEYWORDS, os_fchmod__doc__},
 
 static PyObject *
 os_fchmod_impl(PyObject *module, int fd, int mode);
@@ -403,7 +403,7 @@ PyDoc_STRVAR(os_lchmod__doc__,
 "Equivalent to chmod(path, mode, follow_symlinks=False).\"");
 
 #define OS_LCHMOD_METHODDEF    \
-    {"lchmod", (PyCFunction)os_lchmod, METH_FASTCALL, os_lchmod__doc__},
+    {"lchmod", (PyCFunction)os_lchmod, METH_FASTCALL|METH_KEYWORDS, os_lchmod__doc__},
 
 static PyObject *
 os_lchmod_impl(PyObject *module, path_t *path, int mode);
@@ -447,7 +447,7 @@ PyDoc_STRVAR(os_chflags__doc__,
 "unavailable, using it will raise a NotImplementedError.");
 
 #define OS_CHFLAGS_METHODDEF    \
-    {"chflags", (PyCFunction)os_chflags, METH_FASTCALL, os_chflags__doc__},
+    {"chflags", (PyCFunction)os_chflags, METH_FASTCALL|METH_KEYWORDS, os_chflags__doc__},
 
 static PyObject *
 os_chflags_impl(PyObject *module, path_t *path, unsigned long flags,
@@ -490,7 +490,7 @@ PyDoc_STRVAR(os_lchflags__doc__,
 "Equivalent to chflags(path, flags, follow_symlinks=False).");
 
 #define OS_LCHFLAGS_METHODDEF    \
-    {"lchflags", (PyCFunction)os_lchflags, METH_FASTCALL, os_lchflags__doc__},
+    {"lchflags", (PyCFunction)os_lchflags, METH_FASTCALL|METH_KEYWORDS, os_lchflags__doc__},
 
 static PyObject *
 os_lchflags_impl(PyObject *module, path_t *path, unsigned long flags);
@@ -528,7 +528,7 @@ PyDoc_STRVAR(os_chroot__doc__,
 "Change root directory to path.");
 
 #define OS_CHROOT_METHODDEF    \
-    {"chroot", (PyCFunction)os_chroot, METH_FASTCALL, os_chroot__doc__},
+    {"chroot", (PyCFunction)os_chroot, METH_FASTCALL|METH_KEYWORDS, os_chroot__doc__},
 
 static PyObject *
 os_chroot_impl(PyObject *module, path_t *path);
@@ -565,7 +565,7 @@ PyDoc_STRVAR(os_fsync__doc__,
 "Force write of fd to disk.");
 
 #define OS_FSYNC_METHODDEF    \
-    {"fsync", (PyCFunction)os_fsync, METH_FASTCALL, os_fsync__doc__},
+    {"fsync", (PyCFunction)os_fsync, METH_FASTCALL|METH_KEYWORDS, os_fsync__doc__},
 
 static PyObject *
 os_fsync_impl(PyObject *module, int fd);
@@ -621,7 +621,7 @@ PyDoc_STRVAR(os_fdatasync__doc__,
 "Force write of fd to disk without forcing update of metadata.");
 
 #define OS_FDATASYNC_METHODDEF    \
-    {"fdatasync", (PyCFunction)os_fdatasync, METH_FASTCALL, os_fdatasync__doc__},
+    {"fdatasync", (PyCFunction)os_fdatasync, METH_FASTCALL|METH_KEYWORDS, os_fdatasync__doc__},
 
 static PyObject *
 os_fdatasync_impl(PyObject *module, int fd);
@@ -679,7 +679,7 @@ PyDoc_STRVAR(os_chown__doc__,
 "  If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_CHOWN_METHODDEF    \
-    {"chown", (PyCFunction)os_chown, METH_FASTCALL, os_chown__doc__},
+    {"chown", (PyCFunction)os_chown, METH_FASTCALL|METH_KEYWORDS, os_chown__doc__},
 
 static PyObject *
 os_chown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid,
@@ -723,7 +723,7 @@ PyDoc_STRVAR(os_fchown__doc__,
 "Equivalent to os.chown(fd, uid, gid).");
 
 #define OS_FCHOWN_METHODDEF    \
-    {"fchown", (PyCFunction)os_fchown, METH_FASTCALL, os_fchown__doc__},
+    {"fchown", (PyCFunction)os_fchown, METH_FASTCALL|METH_KEYWORDS, os_fchown__doc__},
 
 static PyObject *
 os_fchown_impl(PyObject *module, int fd, uid_t uid, gid_t gid);
@@ -762,7 +762,7 @@ PyDoc_STRVAR(os_lchown__doc__,
 "Equivalent to os.chown(path, uid, gid, follow_symlinks=False).");
 
 #define OS_LCHOWN_METHODDEF    \
-    {"lchown", (PyCFunction)os_lchown, METH_FASTCALL, os_lchown__doc__},
+    {"lchown", (PyCFunction)os_lchown, METH_FASTCALL|METH_KEYWORDS, os_lchown__doc__},
 
 static PyObject *
 os_lchown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid);
@@ -848,7 +848,7 @@ PyDoc_STRVAR(os_link__doc__,
 "  NotImplementedError.");
 
 #define OS_LINK_METHODDEF    \
-    {"link", (PyCFunction)os_link, METH_FASTCALL, os_link__doc__},
+    {"link", (PyCFunction)os_link, METH_FASTCALL|METH_KEYWORDS, os_link__doc__},
 
 static PyObject *
 os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
@@ -901,7 +901,7 @@ PyDoc_STRVAR(os_listdir__doc__,
 "entries \'.\' and \'..\' even if they are present in the directory.");
 
 #define OS_LISTDIR_METHODDEF    \
-    {"listdir", (PyCFunction)os_listdir, METH_FASTCALL, os_listdir__doc__},
+    {"listdir", (PyCFunction)os_listdir, METH_FASTCALL|METH_KEYWORDS, os_listdir__doc__},
 
 static PyObject *
 os_listdir_impl(PyObject *module, path_t *path);
@@ -1034,7 +1034,7 @@ PyDoc_STRVAR(os__getvolumepathname__doc_
 "A helper function for ismount on Win32.");
 
 #define OS__GETVOLUMEPATHNAME_METHODDEF    \
-    {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_FASTCALL, os__getvolumepathname__doc__},
+    {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_FASTCALL|METH_KEYWORDS, os__getvolumepathname__doc__},
 
 static PyObject *
 os__getvolumepathname_impl(PyObject *module, PyObject *path);
@@ -1073,7 +1073,7 @@ PyDoc_STRVAR(os_mkdir__doc__,
 "The mode argument is ignored on Windows.");
 
 #define OS_MKDIR_METHODDEF    \
-    {"mkdir", (PyCFunction)os_mkdir, METH_FASTCALL, os_mkdir__doc__},
+    {"mkdir", (PyCFunction)os_mkdir, METH_FASTCALL|METH_KEYWORDS, os_mkdir__doc__},
 
 static PyObject *
 os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd);
@@ -1141,7 +1141,7 @@ PyDoc_STRVAR(os_getpriority__doc__,
 "Return program scheduling priority.");
 
 #define OS_GETPRIORITY_METHODDEF    \
-    {"getpriority", (PyCFunction)os_getpriority, METH_FASTCALL, os_getpriority__doc__},
+    {"getpriority", (PyCFunction)os_getpriority, METH_FASTCALL|METH_KEYWORDS, os_getpriority__doc__},
 
 static PyObject *
 os_getpriority_impl(PyObject *module, int which, int who);
@@ -1176,7 +1176,7 @@ PyDoc_STRVAR(os_setpriority__doc__,
 "Set program scheduling priority.");
 
 #define OS_SETPRIORITY_METHODDEF    \
-    {"setpriority", (PyCFunction)os_setpriority, METH_FASTCALL, os_setpriority__doc__},
+    {"setpriority", (PyCFunction)os_setpriority, METH_FASTCALL|METH_KEYWORDS, os_setpriority__doc__},
 
 static PyObject *
 os_setpriority_impl(PyObject *module, int which, int who, int priority);
@@ -1216,7 +1216,7 @@ PyDoc_STRVAR(os_rename__doc__,
 "  If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_RENAME_METHODDEF    \
-    {"rename", (PyCFunction)os_rename, METH_FASTCALL, os_rename__doc__},
+    {"rename", (PyCFunction)os_rename, METH_FASTCALL|METH_KEYWORDS, os_rename__doc__},
 
 static PyObject *
 os_rename_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
@@ -1261,7 +1261,7 @@ PyDoc_STRVAR(os_replace__doc__,
 "  If they are unavailable, using them will raise a NotImplementedError.\"");
 
 #define OS_REPLACE_METHODDEF    \
-    {"replace", (PyCFunction)os_replace, METH_FASTCALL, os_replace__doc__},
+    {"replace", (PyCFunction)os_replace, METH_FASTCALL|METH_KEYWORDS, os_replace__doc__},
 
 static PyObject *
 os_replace_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
@@ -1305,7 +1305,7 @@ PyDoc_STRVAR(os_rmdir__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_RMDIR_METHODDEF    \
-    {"rmdir", (PyCFunction)os_rmdir, METH_FASTCALL, os_rmdir__doc__},
+    {"rmdir", (PyCFunction)os_rmdir, METH_FASTCALL|METH_KEYWORDS, os_rmdir__doc__},
 
 static PyObject *
 os_rmdir_impl(PyObject *module, path_t *path, int dir_fd);
@@ -1341,7 +1341,7 @@ PyDoc_STRVAR(os_system__doc__,
 "Execute the command in a subshell.");
 
 #define OS_SYSTEM_METHODDEF    \
-    {"system", (PyCFunction)os_system, METH_FASTCALL, os_system__doc__},
+    {"system", (PyCFunction)os_system, METH_FASTCALL|METH_KEYWORDS, os_system__doc__},
 
 static long
 os_system_impl(PyObject *module, Py_UNICODE *command);
@@ -1380,7 +1380,7 @@ PyDoc_STRVAR(os_system__doc__,
 "Execute the command in a subshell.");
 
 #define OS_SYSTEM_METHODDEF    \
-    {"system", (PyCFunction)os_system, METH_FASTCALL, os_system__doc__},
+    {"system", (PyCFunction)os_system, METH_FASTCALL|METH_KEYWORDS, os_system__doc__},
 
 static long
 os_system_impl(PyObject *module, PyObject *command);
@@ -1452,7 +1452,7 @@ PyDoc_STRVAR(os_unlink__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_UNLINK_METHODDEF    \
-    {"unlink", (PyCFunction)os_unlink, METH_FASTCALL, os_unlink__doc__},
+    {"unlink", (PyCFunction)os_unlink, METH_FASTCALL|METH_KEYWORDS, os_unlink__doc__},
 
 static PyObject *
 os_unlink_impl(PyObject *module, path_t *path, int dir_fd);
@@ -1491,7 +1491,7 @@ PyDoc_STRVAR(os_remove__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_REMOVE_METHODDEF    \
-    {"remove", (PyCFunction)os_remove, METH_FASTCALL, os_remove__doc__},
+    {"remove", (PyCFunction)os_remove, METH_FASTCALL|METH_KEYWORDS, os_remove__doc__},
 
 static PyObject *
 os_remove_impl(PyObject *module, path_t *path, int dir_fd);
@@ -1573,7 +1573,7 @@ PyDoc_STRVAR(os_utime__doc__,
 "  If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_UTIME_METHODDEF    \
-    {"utime", (PyCFunction)os_utime, METH_FASTCALL, os_utime__doc__},
+    {"utime", (PyCFunction)os_utime, METH_FASTCALL|METH_KEYWORDS, os_utime__doc__},
 
 static PyObject *
 os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
@@ -1611,7 +1611,7 @@ PyDoc_STRVAR(os__exit__doc__,
 "Exit to the system with specified status, without normal exit processing.");
 
 #define OS__EXIT_METHODDEF    \
-    {"_exit", (PyCFunction)os__exit, METH_FASTCALL, os__exit__doc__},
+    {"_exit", (PyCFunction)os__exit, METH_FASTCALL|METH_KEYWORDS, os__exit__doc__},
 
 static PyObject *
 os__exit_impl(PyObject *module, int status);
@@ -1664,10 +1664,6 @@ os_execv(PyObject *module, PyObject **ar
         path_converter, &path, &argv)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("execv", kwnames)) {
-        goto exit;
-    }
     return_value = os_execv_impl(module, &path, argv);
 
 exit:
@@ -1695,7 +1691,7 @@ PyDoc_STRVAR(os_execve__doc__,
 "    Dictionary of strings mapping to strings.");
 
 #define OS_EXECVE_METHODDEF    \
-    {"execve", (PyCFunction)os_execve, METH_FASTCALL, os_execve__doc__},
+    {"execve", (PyCFunction)os_execve, METH_FASTCALL|METH_KEYWORDS, os_execve__doc__},
 
 static PyObject *
 os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env);
@@ -1758,10 +1754,6 @@ os_spawnv(PyObject *module, PyObject **a
         &mode, path_converter, &path, &argv)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("spawnv", kwnames)) {
-        goto exit;
-    }
     return_value = os_spawnv_impl(module, mode, &path, argv);
 
 exit:
@@ -1810,10 +1802,6 @@ os_spawnve(PyObject *module, PyObject **
         &mode, path_converter, &path, &argv, &env)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("spawnve", kwnames)) {
-        goto exit;
-    }
     return_value = os_spawnve_impl(module, mode, &path, argv, env);
 
 exit:
@@ -1882,7 +1870,7 @@ PyDoc_STRVAR(os_sched_get_priority_max__
 "Get the maximum scheduling priority for policy.");
 
 #define OS_SCHED_GET_PRIORITY_MAX_METHODDEF    \
-    {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_FASTCALL, os_sched_get_priority_max__doc__},
+    {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_FASTCALL|METH_KEYWORDS, os_sched_get_priority_max__doc__},
 
 static PyObject *
 os_sched_get_priority_max_impl(PyObject *module, int policy);
@@ -1916,7 +1904,7 @@ PyDoc_STRVAR(os_sched_get_priority_min__
 "Get the minimum scheduling priority for policy.");
 
 #define OS_SCHED_GET_PRIORITY_MIN_METHODDEF    \
-    {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_FASTCALL, os_sched_get_priority_min__doc__},
+    {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_FASTCALL|METH_KEYWORDS, os_sched_get_priority_min__doc__},
 
 static PyObject *
 os_sched_get_priority_min_impl(PyObject *module, int policy);
@@ -2038,10 +2026,6 @@ os_sched_setscheduler(PyObject *module, 
         &pid, &policy, convert_sched_param, &param)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("sched_setscheduler", kwnames)) {
-        goto exit;
-    }
     return_value = os_sched_setscheduler_impl(module, pid, policy, &param);
 
 exit:
@@ -2113,10 +2097,6 @@ os_sched_setparam(PyObject *module, PyOb
         &pid, convert_sched_param, &param)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("sched_setparam", kwnames)) {
-        goto exit;
-    }
     return_value = os_sched_setparam_impl(module, pid, &param);
 
 exit:
@@ -2212,10 +2192,6 @@ os_sched_setaffinity(PyObject *module, P
         &pid, &mask)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("sched_setaffinity", kwnames)) {
-        goto exit;
-    }
     return_value = os_sched_setaffinity_impl(module, pid, mask);
 
 exit:
@@ -2428,7 +2404,7 @@ PyDoc_STRVAR(os_getpgid__doc__,
 "Call the system call getpgid(), and return the result.");
 
 #define OS_GETPGID_METHODDEF    \
-    {"getpgid", (PyCFunction)os_getpgid, METH_FASTCALL, os_getpgid__doc__},
+    {"getpgid", (PyCFunction)os_getpgid, METH_FASTCALL|METH_KEYWORDS, os_getpgid__doc__},
 
 static PyObject *
 os_getpgid_impl(PyObject *module, pid_t pid);
@@ -2591,10 +2567,6 @@ os_kill(PyObject *module, PyObject **arg
         &pid, &signal)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("kill", kwnames)) {
-        goto exit;
-    }
     return_value = os_kill_impl(module, pid, signal);
 
 exit:
@@ -2628,10 +2600,6 @@ os_killpg(PyObject *module, PyObject **a
         &pgid, &signal)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("killpg", kwnames)) {
-        goto exit;
-    }
     return_value = os_killpg_impl(module, pgid, signal);
 
 exit:
@@ -2789,10 +2757,6 @@ os_setreuid(PyObject *module, PyObject *
         _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setreuid", kwnames)) {
-        goto exit;
-    }
     return_value = os_setreuid_impl(module, ruid, euid);
 
 exit:
@@ -2826,10 +2790,6 @@ os_setregid(PyObject *module, PyObject *
         _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setregid", kwnames)) {
-        goto exit;
-    }
     return_value = os_setregid_impl(module, rgid, egid);
 
 exit:
@@ -2894,7 +2854,7 @@ PyDoc_STRVAR(os_wait3__doc__,
 "  (pid, status, rusage)");
 
 #define OS_WAIT3_METHODDEF    \
-    {"wait3", (PyCFunction)os_wait3, METH_FASTCALL, os_wait3__doc__},
+    {"wait3", (PyCFunction)os_wait3, METH_FASTCALL|METH_KEYWORDS, os_wait3__doc__},
 
 static PyObject *
 os_wait3_impl(PyObject *module, int options);
@@ -2931,7 +2891,7 @@ PyDoc_STRVAR(os_wait4__doc__,
 "  (pid, status, rusage)");
 
 #define OS_WAIT4_METHODDEF    \
-    {"wait4", (PyCFunction)os_wait4, METH_FASTCALL, os_wait4__doc__},
+    {"wait4", (PyCFunction)os_wait4, METH_FASTCALL|METH_KEYWORDS, os_wait4__doc__},
 
 static PyObject *
 os_wait4_impl(PyObject *module, pid_t pid, int options);
@@ -2994,10 +2954,6 @@ os_waitid(PyObject *module, PyObject **a
         &idtype, &id, &options)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("waitid", kwnames)) {
-        goto exit;
-    }
     return_value = os_waitid_impl(module, idtype, id, options);
 
 exit:
@@ -3036,10 +2992,6 @@ os_waitpid(PyObject *module, PyObject **
         &pid, &options)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("waitpid", kwnames)) {
-        goto exit;
-    }
     return_value = os_waitpid_impl(module, pid, options);
 
 exit:
@@ -3078,10 +3030,6 @@ os_waitpid(PyObject *module, PyObject **
         &pid, &options)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("waitpid", kwnames)) {
-        goto exit;
-    }
     return_value = os_waitpid_impl(module, pid, options);
 
 exit:
@@ -3134,7 +3082,7 @@ PyDoc_STRVAR(os_symlink__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_SYMLINK_METHODDEF    \
-    {"symlink", (PyCFunction)os_symlink, METH_FASTCALL, os_symlink__doc__},
+    {"symlink", (PyCFunction)os_symlink, METH_FASTCALL|METH_KEYWORDS, os_symlink__doc__},
 
 static PyObject *
 os_symlink_impl(PyObject *module, path_t *src, path_t *dst,
@@ -3272,10 +3220,6 @@ os_setpgid(PyObject *module, PyObject **
         &pid, &pgrp)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setpgid", kwnames)) {
-        goto exit;
-    }
     return_value = os_setpgid_impl(module, pid, pgrp);
 
 exit:
@@ -3340,10 +3284,6 @@ os_tcsetpgrp(PyObject *module, PyObject 
         &fd, &pgid)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("tcsetpgrp", kwnames)) {
-        goto exit;
-    }
     return_value = os_tcsetpgrp_impl(module, fd, pgid);
 
 exit:
@@ -3364,7 +3304,7 @@ PyDoc_STRVAR(os_open__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_OPEN_METHODDEF    \
-    {"open", (PyCFunction)os_open, METH_FASTCALL, os_open__doc__},
+    {"open", (PyCFunction)os_open, METH_FASTCALL|METH_KEYWORDS, os_open__doc__},
 
 static int
 os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd);
@@ -3405,7 +3345,7 @@ PyDoc_STRVAR(os_close__doc__,
 "Close a file descriptor.");
 
 #define OS_CLOSE_METHODDEF    \
-    {"close", (PyCFunction)os_close, METH_FASTCALL, os_close__doc__},
+    {"close", (PyCFunction)os_close, METH_FASTCALL|METH_KEYWORDS, os_close__doc__},
 
 static PyObject *
 os_close_impl(PyObject *module, int fd);
@@ -3451,10 +3391,6 @@ os_closerange(PyObject *module, PyObject
         &fd_low, &fd_high)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("closerange", kwnames)) {
-        goto exit;
-    }
     return_value = os_closerange_impl(module, fd_low, fd_high);
 
 exit:
@@ -3500,7 +3436,7 @@ PyDoc_STRVAR(os_dup2__doc__,
 "Duplicate file descriptor.");
 
 #define OS_DUP2_METHODDEF    \
-    {"dup2", (PyCFunction)os_dup2, METH_FASTCALL, os_dup2__doc__},
+    {"dup2", (PyCFunction)os_dup2, METH_FASTCALL|METH_KEYWORDS, os_dup2__doc__},
 
 static PyObject *
 os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable);
@@ -3558,10 +3494,6 @@ os_lockf(PyObject *module, PyObject **ar
         &fd, &command, Py_off_t_converter, &length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lockf", kwnames)) {
-        goto exit;
-    }
     return_value = os_lockf_impl(module, fd, command, length);
 
 exit:
@@ -3598,10 +3530,6 @@ os_lseek(PyObject *module, PyObject **ar
         &fd, Py_off_t_converter, &position, &how)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lseek", kwnames)) {
-        goto exit;
-    }
     _return_value = os_lseek_impl(module, fd, position, how);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -3635,10 +3563,6 @@ os_read(PyObject *module, PyObject **arg
         &fd, &length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("read", kwnames)) {
-        goto exit;
-    }
     return_value = os_read_impl(module, fd, length);
 
 exit:
@@ -3679,10 +3603,6 @@ os_readv(PyObject *module, PyObject **ar
         &fd, &buffers)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("readv", kwnames)) {
-        goto exit;
-    }
     _return_value = os_readv_impl(module, fd, buffers);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -3724,10 +3644,6 @@ os_pread(PyObject *module, PyObject **ar
         &fd, &length, Py_off_t_converter, &offset)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pread", kwnames)) {
-        goto exit;
-    }
     return_value = os_pread_impl(module, fd, length, offset);
 
 exit:
@@ -3760,10 +3676,6 @@ os_write(PyObject *module, PyObject **ar
         &fd, &data)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("write", kwnames)) {
-        goto exit;
-    }
     _return_value = os_write_impl(module, fd, &data);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -3789,7 +3701,7 @@ PyDoc_STRVAR(os_fstat__doc__,
 "Equivalent to os.stat(fd).");
 
 #define OS_FSTAT_METHODDEF    \
-    {"fstat", (PyCFunction)os_fstat, METH_FASTCALL, os_fstat__doc__},
+    {"fstat", (PyCFunction)os_fstat, METH_FASTCALL|METH_KEYWORDS, os_fstat__doc__},
 
 static PyObject *
 os_fstat_impl(PyObject *module, int fd);
@@ -3938,10 +3850,6 @@ os_writev(PyObject *module, PyObject **a
         &fd, &buffers)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("writev", kwnames)) {
-        goto exit;
-    }
     _return_value = os_writev_impl(module, fd, buffers);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -3985,10 +3893,6 @@ os_pwrite(PyObject *module, PyObject **a
         &fd, &buffer, Py_off_t_converter, &offset)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pwrite", kwnames)) {
-        goto exit;
-    }
     _return_value = os_pwrite_impl(module, fd, &buffer, offset);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -4020,7 +3924,7 @@ PyDoc_STRVAR(os_mkfifo__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_MKFIFO_METHODDEF    \
-    {"mkfifo", (PyCFunction)os_mkfifo, METH_FASTCALL, os_mkfifo__doc__},
+    {"mkfifo", (PyCFunction)os_mkfifo, METH_FASTCALL|METH_KEYWORDS, os_mkfifo__doc__},
 
 static PyObject *
 os_mkfifo_impl(PyObject *module, path_t *path, int mode, int dir_fd);
@@ -4071,7 +3975,7 @@ PyDoc_STRVAR(os_mknod__doc__,
 "  If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_MKNOD_METHODDEF    \
-    {"mknod", (PyCFunction)os_mknod, METH_FASTCALL, os_mknod__doc__},
+    {"mknod", (PyCFunction)os_mknod, METH_FASTCALL|METH_KEYWORDS, os_mknod__doc__},
 
 static PyObject *
 os_mknod_impl(PyObject *module, path_t *path, int mode, dev_t device,
@@ -4201,10 +4105,6 @@ os_makedev(PyObject *module, PyObject **
         &major, &minor)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("makedev", kwnames)) {
-        goto exit;
-    }
     _return_value = os_makedev_impl(module, major, minor);
     if ((_return_value == (dev_t)-1) && PyErr_Occurred()) {
         goto exit;
@@ -4242,10 +4142,6 @@ os_ftruncate(PyObject *module, PyObject 
         &fd, Py_off_t_converter, &length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ftruncate", kwnames)) {
-        goto exit;
-    }
     return_value = os_ftruncate_impl(module, fd, length);
 
 exit:
@@ -4266,7 +4162,7 @@ PyDoc_STRVAR(os_truncate__doc__,
 "  If this functionality is unavailable, using it raises an exception.");
 
 #define OS_TRUNCATE_METHODDEF    \
-    {"truncate", (PyCFunction)os_truncate, METH_FASTCALL, os_truncate__doc__},
+    {"truncate", (PyCFunction)os_truncate, METH_FASTCALL|METH_KEYWORDS, os_truncate__doc__},
 
 static PyObject *
 os_truncate_impl(PyObject *module, path_t *path, Py_off_t length);
@@ -4325,10 +4221,6 @@ os_posix_fallocate(PyObject *module, PyO
         &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("posix_fallocate", kwnames)) {
-        goto exit;
-    }
     return_value = os_posix_fallocate_impl(module, fd, offset, length);
 
 exit:
@@ -4373,10 +4265,6 @@ os_posix_fadvise(PyObject *module, PyObj
         &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length, &advice)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("posix_fadvise", kwnames)) {
-        goto exit;
-    }
     return_value = os_posix_fadvise_impl(module, fd, offset, length, advice);
 
 exit:
@@ -4410,10 +4298,6 @@ os_putenv(PyObject *module, PyObject **a
         &name, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("putenv", kwnames)) {
-        goto exit;
-    }
     return_value = os_putenv_impl(module, name, value);
 
 exit:
@@ -4447,10 +4331,6 @@ os_putenv(PyObject *module, PyObject **a
         PyUnicode_FSConverter, &name, PyUnicode_FSConverter, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("putenv", kwnames)) {
-        goto exit;
-    }
     return_value = os_putenv_impl(module, name, value);
 
 exit:
@@ -4573,7 +4453,7 @@ PyDoc_STRVAR(os_WIFCONTINUED__doc__,
 "job control stop.");
 
 #define OS_WIFCONTINUED_METHODDEF    \
-    {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_FASTCALL, os_WIFCONTINUED__doc__},
+    {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_FASTCALL|METH_KEYWORDS, os_WIFCONTINUED__doc__},
 
 static int
 os_WIFCONTINUED_impl(PyObject *module, int status);
@@ -4612,7 +4492,7 @@ PyDoc_STRVAR(os_WIFSTOPPED__doc__,
 "Return True if the process returning status was stopped.");
 
 #define OS_WIFSTOPPED_METHODDEF    \
-    {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_FASTCALL, os_WIFSTOPPED__doc__},
+    {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_FASTCALL|METH_KEYWORDS, os_WIFSTOPPED__doc__},
 
 static int
 os_WIFSTOPPED_impl(PyObject *module, int status);
@@ -4651,7 +4531,7 @@ PyDoc_STRVAR(os_WIFSIGNALED__doc__,
 "Return True if the process returning status was terminated by a signal.");
 
 #define OS_WIFSIGNALED_METHODDEF    \
-    {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_FASTCALL, os_WIFSIGNALED__doc__},
+    {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_FASTCALL|METH_KEYWORDS, os_WIFSIGNALED__doc__},
 
 static int
 os_WIFSIGNALED_impl(PyObject *module, int status);
@@ -4690,7 +4570,7 @@ PyDoc_STRVAR(os_WIFEXITED__doc__,
 "Return True if the process returning status exited via the exit() system call.");
 
 #define OS_WIFEXITED_METHODDEF    \
-    {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_FASTCALL, os_WIFEXITED__doc__},
+    {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_FASTCALL|METH_KEYWORDS, os_WIFEXITED__doc__},
 
 static int
 os_WIFEXITED_impl(PyObject *module, int status);
@@ -4729,7 +4609,7 @@ PyDoc_STRVAR(os_WEXITSTATUS__doc__,
 "Return the process return code from status.");
 
 #define OS_WEXITSTATUS_METHODDEF    \
-    {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_FASTCALL, os_WEXITSTATUS__doc__},
+    {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_FASTCALL|METH_KEYWORDS, os_WEXITSTATUS__doc__},
 
 static int
 os_WEXITSTATUS_impl(PyObject *module, int status);
@@ -4768,7 +4648,7 @@ PyDoc_STRVAR(os_WTERMSIG__doc__,
 "Return the signal that terminated the process that provided the status value.");
 
 #define OS_WTERMSIG_METHODDEF    \
-    {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_FASTCALL, os_WTERMSIG__doc__},
+    {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_FASTCALL|METH_KEYWORDS, os_WTERMSIG__doc__},
 
 static int
 os_WTERMSIG_impl(PyObject *module, int status);
@@ -4807,7 +4687,7 @@ PyDoc_STRVAR(os_WSTOPSIG__doc__,
 "Return the signal that stopped the process that provided the status value.");
 
 #define OS_WSTOPSIG_METHODDEF    \
-    {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_FASTCALL, os_WSTOPSIG__doc__},
+    {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_FASTCALL|METH_KEYWORDS, os_WSTOPSIG__doc__},
 
 static int
 os_WSTOPSIG_impl(PyObject *module, int status);
@@ -4883,7 +4763,7 @@ PyDoc_STRVAR(os_statvfs__doc__,
 "  If this functionality is unavailable, using it raises an exception.");
 
 #define OS_STATVFS_METHODDEF    \
-    {"statvfs", (PyCFunction)os_statvfs, METH_FASTCALL, os_statvfs__doc__},
+    {"statvfs", (PyCFunction)os_statvfs, METH_FASTCALL|METH_KEYWORDS, os_statvfs__doc__},
 
 static PyObject *
 os_statvfs_impl(PyObject *module, path_t *path);
@@ -4920,7 +4800,7 @@ PyDoc_STRVAR(os__getdiskusage__doc__,
 "Return disk usage statistics about the given path as a (total, free) tuple.");
 
 #define OS__GETDISKUSAGE_METHODDEF    \
-    {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_FASTCALL, os__getdiskusage__doc__},
+    {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_FASTCALL|METH_KEYWORDS, os__getdiskusage__doc__},
 
 static PyObject *
 os__getdiskusage_impl(PyObject *module, Py_UNICODE *path);
@@ -4973,10 +4853,6 @@ os_fpathconf(PyObject *module, PyObject 
         &fd, conv_path_confname, &name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("fpathconf", kwnames)) {
-        goto exit;
-    }
     _return_value = os_fpathconf_impl(module, fd, name);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -5002,7 +4878,7 @@ PyDoc_STRVAR(os_pathconf__doc__,
 "  If this functionality is unavailable, using it raises an exception.");
 
 #define OS_PATHCONF_METHODDEF    \
-    {"pathconf", (PyCFunction)os_pathconf, METH_FASTCALL, os_pathconf__doc__},
+    {"pathconf", (PyCFunction)os_pathconf, METH_FASTCALL|METH_KEYWORDS, os_pathconf__doc__},
 
 static long
 os_pathconf_impl(PyObject *module, path_t *path, int name);
@@ -5150,7 +5026,7 @@ PyDoc_STRVAR(os_startfile__doc__,
 "the underlying Win32 ShellExecute function doesn\'t work if it is.");
 
 #define OS_STARTFILE_METHODDEF    \
-    {"startfile", (PyCFunction)os_startfile, METH_FASTCALL, os_startfile__doc__},
+    {"startfile", (PyCFunction)os_startfile, METH_FASTCALL|METH_KEYWORDS, os_startfile__doc__},
 
 static PyObject *
 os_startfile_impl(PyObject *module, path_t *filepath, Py_UNICODE *operation);
@@ -5215,7 +5091,7 @@ PyDoc_STRVAR(os_device_encoding__doc__,
 "If the device is not a terminal, return None.");
 
 #define OS_DEVICE_ENCODING_METHODDEF    \
-    {"device_encoding", (PyCFunction)os_device_encoding, METH_FASTCALL, os_device_encoding__doc__},
+    {"device_encoding", (PyCFunction)os_device_encoding, METH_FASTCALL|METH_KEYWORDS, os_device_encoding__doc__},
 
 static PyObject *
 os_device_encoding_impl(PyObject *module, int fd);
@@ -5264,10 +5140,6 @@ os_setresuid(PyObject *module, PyObject 
         _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid, _Py_Uid_Converter, &suid)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setresuid", kwnames)) {
-        goto exit;
-    }
     return_value = os_setresuid_impl(module, ruid, euid, suid);
 
 exit:
@@ -5302,10 +5174,6 @@ os_setresgid(PyObject *module, PyObject 
         _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid, _Py_Gid_Converter, &sgid)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setresgid", kwnames)) {
-        goto exit;
-    }
     return_value = os_setresgid_impl(module, rgid, egid, sgid);
 
 exit:
@@ -5372,7 +5240,7 @@ PyDoc_STRVAR(os_getxattr__doc__,
 "  the link points to.");
 
 #define OS_GETXATTR_METHODDEF    \
-    {"getxattr", (PyCFunction)os_getxattr, METH_FASTCALL, os_getxattr__doc__},
+    {"getxattr", (PyCFunction)os_getxattr, METH_FASTCALL|METH_KEYWORDS, os_getxattr__doc__},
 
 static PyObject *
 os_getxattr_impl(PyObject *module, path_t *path, path_t *attribute,
@@ -5420,7 +5288,7 @@ PyDoc_STRVAR(os_setxattr__doc__,
 "  the link points to.");
 
 #define OS_SETXATTR_METHODDEF    \
-    {"setxattr", (PyCFunction)os_setxattr, METH_FASTCALL, os_setxattr__doc__},
+    {"setxattr", (PyCFunction)os_setxattr, METH_FASTCALL|METH_KEYWORDS, os_setxattr__doc__},
 
 static PyObject *
 os_setxattr_impl(PyObject *module, path_t *path, path_t *attribute,
@@ -5473,7 +5341,7 @@ PyDoc_STRVAR(os_removexattr__doc__,
 "  the link points to.");
 
 #define OS_REMOVEXATTR_METHODDEF    \
-    {"removexattr", (PyCFunction)os_removexattr, METH_FASTCALL, os_removexattr__doc__},
+    {"removexattr", (PyCFunction)os_removexattr, METH_FASTCALL|METH_KEYWORDS, os_removexattr__doc__},
 
 static PyObject *
 os_removexattr_impl(PyObject *module, path_t *path, path_t *attribute,
@@ -5521,7 +5389,7 @@ PyDoc_STRVAR(os_listxattr__doc__,
 "  the link points to.");
 
 #define OS_LISTXATTR_METHODDEF    \
-    {"listxattr", (PyCFunction)os_listxattr, METH_FASTCALL, os_listxattr__doc__},
+    {"listxattr", (PyCFunction)os_listxattr, METH_FASTCALL|METH_KEYWORDS, os_listxattr__doc__},
 
 static PyObject *
 os_listxattr_impl(PyObject *module, path_t *path, int follow_symlinks);
@@ -5654,10 +5522,6 @@ os_set_inheritable(PyObject *module, PyO
         &fd, &inheritable)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("set_inheritable", kwnames)) {
-        goto exit;
-    }
     return_value = os_set_inheritable_impl(module, fd, inheritable);
 
 exit:
@@ -5726,10 +5590,6 @@ os_set_handle_inheritable(PyObject *modu
         &handle, &inheritable)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("set_handle_inheritable", kwnames)) {
-        goto exit;
-    }
     return_value = os_set_handle_inheritable_impl(module, handle, inheritable);
 
 exit:
@@ -5773,7 +5633,7 @@ PyDoc_STRVAR(os_DirEntry_stat__doc__,
 "Return stat_result object for the entry; cached per entry.");
 
 #define OS_DIRENTRY_STAT_METHODDEF    \
-    {"stat", (PyCFunction)os_DirEntry_stat, METH_FASTCALL, os_DirEntry_stat__doc__},
+    {"stat", (PyCFunction)os_DirEntry_stat, METH_FASTCALL|METH_KEYWORDS, os_DirEntry_stat__doc__},
 
 static PyObject *
 os_DirEntry_stat_impl(DirEntry *self, int follow_symlinks);
@@ -5803,7 +5663,7 @@ PyDoc_STRVAR(os_DirEntry_is_dir__doc__,
 "Return True if the entry is a directory; cached per entry.");
 
 #define OS_DIRENTRY_IS_DIR_METHODDEF    \
-    {"is_dir", (PyCFunction)os_DirEntry_is_dir, METH_FASTCALL, os_DirEntry_is_dir__doc__},
+    {"is_dir", (PyCFunction)os_DirEntry_is_dir, METH_FASTCALL|METH_KEYWORDS, os_DirEntry_is_dir__doc__},
 
 static int
 os_DirEntry_is_dir_impl(DirEntry *self, int follow_symlinks);
@@ -5838,7 +5698,7 @@ PyDoc_STRVAR(os_DirEntry_is_file__doc__,
 "Return True if the entry is a file; cached per entry.");
 
 #define OS_DIRENTRY_IS_FILE_METHODDEF    \
-    {"is_file", (PyCFunction)os_DirEntry_is_file, METH_FASTCALL, os_DirEntry_is_file__doc__},
+    {"is_file", (PyCFunction)os_DirEntry_is_file, METH_FASTCALL|METH_KEYWORDS, os_DirEntry_is_file__doc__},
 
 static int
 os_DirEntry_is_file_impl(DirEntry *self, int follow_symlinks);
@@ -5915,7 +5775,7 @@ PyDoc_STRVAR(os_scandir__doc__,
 "If path is None, uses the path=\'.\'.");
 
 #define OS_SCANDIR_METHODDEF    \
-    {"scandir", (PyCFunction)os_scandir, METH_FASTCALL, os_scandir__doc__},
+    {"scandir", (PyCFunction)os_scandir, METH_FASTCALL|METH_KEYWORDS, os_scandir__doc__},
 
 static PyObject *
 os_scandir_impl(PyObject *module, path_t *path);
@@ -5952,7 +5812,7 @@ PyDoc_STRVAR(os_fspath__doc__,
 "types raise a TypeError.");
 
 #define OS_FSPATH_METHODDEF    \
-    {"fspath", (PyCFunction)os_fspath, METH_FASTCALL, os_fspath__doc__},
+    {"fspath", (PyCFunction)os_fspath, METH_FASTCALL|METH_KEYWORDS, os_fspath__doc__},
 
 static PyObject *
 os_fspath_impl(PyObject *module, PyObject *path);
@@ -5984,7 +5844,7 @@ PyDoc_STRVAR(os_getrandom__doc__,
 "Obtain a series of random bytes.");
 
 #define OS_GETRANDOM_METHODDEF    \
-    {"getrandom", (PyCFunction)os_getrandom, METH_FASTCALL, os_getrandom__doc__},
+    {"getrandom", (PyCFunction)os_getrandom, METH_FASTCALL|METH_KEYWORDS, os_getrandom__doc__},
 
 static PyObject *
 os_getrandom_impl(PyObject *module, Py_ssize_t size, int flags);
@@ -6493,4 +6353,4 @@ exit:
 #ifndef OS_GETRANDOM_METHODDEF
     #define OS_GETRANDOM_METHODDEF
 #endif /* !defined(OS_GETRANDOM_METHODDEF) */
-/*[clinic end generated code: output=5a0be969e3f71660 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=00b4718870bddae4 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/pyexpat.c.h
--- a/Modules/clinic/pyexpat.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/pyexpat.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -28,10 +28,6 @@ pyexpat_xmlparser_Parse(xmlparseobject *
         &data, &isfinal)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("Parse", kwnames)) {
-        goto exit;
-    }
     return_value = pyexpat_xmlparser_Parse_impl(self, data, isfinal);
 
 exit:
@@ -138,10 +134,6 @@ pyexpat_xmlparser_ExternalEntityParserCr
         &context, &encoding)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ExternalEntityParserCreate", kwnames)) {
-        goto exit;
-    }
     return_value = pyexpat_xmlparser_ExternalEntityParserCreate_impl(self, context, encoding);
 
 exit:
@@ -208,10 +200,6 @@ pyexpat_xmlparser_UseForeignDTD(xmlparse
         &flag)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("UseForeignDTD", kwnames)) {
-        goto exit;
-    }
     return_value = pyexpat_xmlparser_UseForeignDTD_impl(self, flag);
 
 exit:
@@ -245,7 +233,7 @@ PyDoc_STRVAR(pyexpat_ParserCreate__doc__
 "Return a new XML parser object.");
 
 #define PYEXPAT_PARSERCREATE_METHODDEF    \
-    {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_FASTCALL, pyexpat_ParserCreate__doc__},
+    {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_FASTCALL|METH_KEYWORDS, pyexpat_ParserCreate__doc__},
 
 static PyObject *
 pyexpat_ParserCreate_impl(PyObject *module, const char *encoding,
@@ -301,4 +289,4 @@ exit:
 #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
     #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
 #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */
-/*[clinic end generated code: output=0548a6b12157e29b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=98a0c21aa22196c7 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/sha1module.c.h
--- a/Modules/clinic/sha1module.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/sha1module.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -72,7 +72,7 @@ PyDoc_STRVAR(_sha1_sha1__doc__,
 "Return a new SHA1 hash object; optionally initialized with a string.");
 
 #define _SHA1_SHA1_METHODDEF    \
-    {"sha1", (PyCFunction)_sha1_sha1, METH_FASTCALL, _sha1_sha1__doc__},
+    {"sha1", (PyCFunction)_sha1_sha1, METH_FASTCALL|METH_KEYWORDS, _sha1_sha1__doc__},
 
 static PyObject *
 _sha1_sha1_impl(PyObject *module, PyObject *string);
@@ -94,4 +94,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=8e6b04c7e0407be2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=594cf600d6ba4776 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/sha256module.c.h
--- a/Modules/clinic/sha256module.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/sha256module.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -72,7 +72,7 @@ PyDoc_STRVAR(_sha256_sha256__doc__,
 "Return a new SHA-256 hash object; optionally initialized with a string.");
 
 #define _SHA256_SHA256_METHODDEF    \
-    {"sha256", (PyCFunction)_sha256_sha256, METH_FASTCALL, _sha256_sha256__doc__},
+    {"sha256", (PyCFunction)_sha256_sha256, METH_FASTCALL|METH_KEYWORDS, _sha256_sha256__doc__},
 
 static PyObject *
 _sha256_sha256_impl(PyObject *module, PyObject *string);
@@ -102,7 +102,7 @@ PyDoc_STRVAR(_sha256_sha224__doc__,
 "Return a new SHA-224 hash object; optionally initialized with a string.");
 
 #define _SHA256_SHA224_METHODDEF    \
-    {"sha224", (PyCFunction)_sha256_sha224, METH_FASTCALL, _sha256_sha224__doc__},
+    {"sha224", (PyCFunction)_sha256_sha224, METH_FASTCALL|METH_KEYWORDS, _sha256_sha224__doc__},
 
 static PyObject *
 _sha256_sha224_impl(PyObject *module, PyObject *string);
@@ -124,4 +124,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=7ef4927ee2a3aac4 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=84e7b8365b3ca4d3 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/sha512module.c.h
--- a/Modules/clinic/sha512module.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/sha512module.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -72,7 +72,7 @@ PyDoc_STRVAR(_sha512_sha512__doc__,
 "Return a new SHA-512 hash object; optionally initialized with a string.");
 
 #define _SHA512_SHA512_METHODDEF    \
-    {"sha512", (PyCFunction)_sha512_sha512, METH_FASTCALL, _sha512_sha512__doc__},
+    {"sha512", (PyCFunction)_sha512_sha512, METH_FASTCALL|METH_KEYWORDS, _sha512_sha512__doc__},
 
 static PyObject *
 _sha512_sha512_impl(PyObject *module, PyObject *string);
@@ -102,7 +102,7 @@ PyDoc_STRVAR(_sha512_sha384__doc__,
 "Return a new SHA-384 hash object; optionally initialized with a string.");
 
 #define _SHA512_SHA384_METHODDEF    \
-    {"sha384", (PyCFunction)_sha512_sha384, METH_FASTCALL, _sha512_sha384__doc__},
+    {"sha384", (PyCFunction)_sha512_sha384, METH_FASTCALL|METH_KEYWORDS, _sha512_sha384__doc__},
 
 static PyObject *
 _sha512_sha384_impl(PyObject *module, PyObject *string);
@@ -124,4 +124,4 @@ static PyObject *
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=7bb7a49159e9b469 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2f6ad0831d16c35f input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/signalmodule.c.h
--- a/Modules/clinic/signalmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/signalmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -90,10 +90,6 @@ signal_signal(PyObject *module, PyObject
         &signalnum, &handler)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("signal", kwnames)) {
-        goto exit;
-    }
     return_value = signal_signal_impl(module, signalnum, handler);
 
 exit:
@@ -161,10 +157,6 @@ signal_siginterrupt(PyObject *module, Py
         &signalnum, &flag)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("siginterrupt", kwnames)) {
-        goto exit;
-    }
     return_value = signal_siginterrupt_impl(module, signalnum, flag);
 
 exit:
@@ -205,10 +197,6 @@ signal_setitimer(PyObject *module, PyObj
         &which, &seconds, &interval)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setitimer", kwnames)) {
-        goto exit;
-    }
     return_value = signal_setitimer_impl(module, which, seconds, interval);
 
 exit:
@@ -273,10 +261,6 @@ signal_pthread_sigmask(PyObject *module,
         &how, &mask)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pthread_sigmask", kwnames)) {
-        goto exit;
-    }
     return_value = signal_pthread_sigmask_impl(module, how, mask);
 
 exit:
@@ -371,10 +355,6 @@ signal_sigtimedwait(PyObject *module, Py
         &sigset, &timeout_obj)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("sigtimedwait", kwnames)) {
-        goto exit;
-    }
     return_value = signal_sigtimedwait_impl(module, sigset, timeout_obj);
 
 exit:
@@ -408,10 +388,6 @@ signal_pthread_kill(PyObject *module, Py
         &thread_id, &signalnum)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pthread_kill", kwnames)) {
-        goto exit;
-    }
     return_value = signal_pthread_kill_impl(module, thread_id, signalnum);
 
 exit:
@@ -463,4 +439,4 @@ exit:
 #ifndef SIGNAL_PTHREAD_KILL_METHODDEF
     #define SIGNAL_PTHREAD_KILL_METHODDEF
 #endif /* !defined(SIGNAL_PTHREAD_KILL_METHODDEF) */
-/*[clinic end generated code: output=fab3dba32c058588 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fad5b02b702e2ffc input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/symtablemodule.c.h
--- a/Modules/clinic/symtablemodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/symtablemodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -27,13 +27,9 @@ static PyObject *
         &str, PyUnicode_FSDecoder, &filename, &startstr)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("symtable", kwnames)) {
-        goto exit;
-    }
     return_value = _symtable_symtable_impl(module, str, filename, startstr);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=071dee4d836e2cfd input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4c734b7bad26cab6 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/unicodedata.c.h
--- a/Modules/clinic/unicodedata.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/unicodedata.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -30,10 +30,6 @@ unicodedata_UCD_decimal(PyObject *self, 
         &chr, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("decimal", kwnames)) {
-        goto exit;
-    }
     return_value = unicodedata_UCD_decimal_impl(self, chr, default_value);
 
 exit:
@@ -67,10 +63,6 @@ unicodedata_UCD_digit(PyObject *self, Py
         &chr, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("digit", kwnames)) {
-        goto exit;
-    }
     return_value = unicodedata_UCD_digit_impl(self, chr, default_value);
 
 exit:
@@ -105,10 +97,6 @@ unicodedata_UCD_numeric(PyObject *self, 
         &chr, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("numeric", kwnames)) {
-        goto exit;
-    }
     return_value = unicodedata_UCD_numeric_impl(self, chr, default_value);
 
 exit:
@@ -322,10 +310,6 @@ unicodedata_UCD_normalize(PyObject *self
         &form, &input)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("normalize", kwnames)) {
-        goto exit;
-    }
     return_value = unicodedata_UCD_normalize_impl(self, form, input);
 
 exit:
@@ -358,10 +342,6 @@ unicodedata_UCD_name(PyObject *self, PyO
         &chr, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("name", kwnames)) {
-        goto exit;
-    }
     return_value = unicodedata_UCD_name_impl(self, chr, default_value);
 
 exit:
@@ -399,4 +379,4 @@ unicodedata_UCD_lookup(PyObject *self, P
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=fcb86aaa3fa40876 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f71ace09e1cbd631 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Modules/clinic/zlibmodule.c.h
--- a/Modules/clinic/zlibmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Modules/clinic/zlibmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -14,7 +14,7 @@ PyDoc_STRVAR(zlib_compress__doc__,
 "    Compression level, in 0-9 or -1.");
 
 #define ZLIB_COMPRESS_METHODDEF    \
-    {"compress", (PyCFunction)zlib_compress, METH_FASTCALL, zlib_compress__doc__},
+    {"compress", (PyCFunction)zlib_compress, METH_FASTCALL|METH_KEYWORDS, zlib_compress__doc__},
 
 static PyObject *
 zlib_compress_impl(PyObject *module, Py_buffer *data, int level);
@@ -57,7 +57,7 @@ PyDoc_STRVAR(zlib_decompress__doc__,
 "    The initial output buffer size.");
 
 #define ZLIB_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)zlib_decompress, METH_FASTCALL, zlib_decompress__doc__},
+    {"decompress", (PyCFunction)zlib_decompress, METH_FASTCALL|METH_KEYWORDS, zlib_decompress__doc__},
 
 static PyObject *
 zlib_decompress_impl(PyObject *module, Py_buffer *data, int wbits,
@@ -119,7 +119,7 @@ PyDoc_STRVAR(zlib_compressobj__doc__,
 "    containing subsequences that are likely to occur in the input data.");
 
 #define ZLIB_COMPRESSOBJ_METHODDEF    \
-    {"compressobj", (PyCFunction)zlib_compressobj, METH_FASTCALL, zlib_compressobj__doc__},
+    {"compressobj", (PyCFunction)zlib_compressobj, METH_FASTCALL|METH_KEYWORDS, zlib_compressobj__doc__},
 
 static PyObject *
 zlib_compressobj_impl(PyObject *module, int level, int method, int wbits,
@@ -166,7 +166,7 @@ PyDoc_STRVAR(zlib_decompressobj__doc__,
 "    dictionary as used by the compressor that produced the input data.");
 
 #define ZLIB_DECOMPRESSOBJ_METHODDEF    \
-    {"decompressobj", (PyCFunction)zlib_decompressobj, METH_FASTCALL, zlib_decompressobj__doc__},
+    {"decompressobj", (PyCFunction)zlib_decompressobj, METH_FASTCALL|METH_KEYWORDS, zlib_decompressobj__doc__},
 
 static PyObject *
 zlib_decompressobj_impl(PyObject *module, int wbits, PyObject *zdict);
@@ -247,7 +247,7 @@ PyDoc_STRVAR(zlib_Decompress_decompress_
 "Call the flush() method to clear these buffers.");
 
 #define ZLIB_DECOMPRESS_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_FASTCALL, zlib_Decompress_decompress__doc__},
+    {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_FASTCALL|METH_KEYWORDS, zlib_Decompress_decompress__doc__},
 
 static PyObject *
 zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data,
@@ -305,10 +305,6 @@ zlib_Compress_flush(compobject *self, Py
         &mode)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("flush", kwnames)) {
-        goto exit;
-    }
     return_value = zlib_Compress_flush_impl(self, mode);
 
 exit:
@@ -384,10 +380,6 @@ zlib_Decompress_flush(compobject *self, 
         ssize_t_converter, &length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("flush", kwnames)) {
-        goto exit;
-    }
     return_value = zlib_Decompress_flush_impl(self, length);
 
 exit:
@@ -422,10 +414,6 @@ zlib_adler32(PyObject *module, PyObject 
         &data, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("adler32", kwnames)) {
-        goto exit;
-    }
     return_value = zlib_adler32_impl(module, &data, value);
 
 exit:
@@ -465,10 +453,6 @@ zlib_crc32(PyObject *module, PyObject **
         &data, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("crc32", kwnames)) {
-        goto exit;
-    }
     return_value = zlib_crc32_impl(module, &data, value);
 
 exit:
@@ -483,4 +467,4 @@ exit:
 #ifndef ZLIB_COMPRESS_COPY_METHODDEF
     #define ZLIB_COMPRESS_COPY_METHODDEF
 #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */
-/*[clinic end generated code: output=fa1b5f4a6208c342 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5e970719880f4bcd input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/clinic/bytearrayobject.c.h
--- a/Objects/clinic/bytearrayobject.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/clinic/bytearrayobject.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -51,7 +51,7 @@ PyDoc_STRVAR(bytearray_translate__doc__,
 "The remaining characters are mapped through the given translation table.");
 
 #define BYTEARRAY_TRANSLATE_METHODDEF    \
-    {"translate", (PyCFunction)bytearray_translate, METH_FASTCALL, bytearray_translate__doc__},
+    {"translate", (PyCFunction)bytearray_translate, METH_FASTCALL|METH_KEYWORDS, bytearray_translate__doc__},
 
 static PyObject *
 bytearray_translate_impl(PyByteArrayObject *self, PyObject *table,
@@ -104,10 +104,6 @@ bytearray_maketrans(void *null, PyObject
         &frm, &to)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("maketrans", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_maketrans_impl(&frm, &to);
 
 exit:
@@ -155,10 +151,6 @@ bytearray_replace(PyByteArrayObject *sel
         &old, &new, &count)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("replace", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_replace_impl(self, &old, &new, count);
 
 exit:
@@ -189,7 +181,7 @@ PyDoc_STRVAR(bytearray_split__doc__,
 "    -1 (the default value) means no limit.");
 
 #define BYTEARRAY_SPLIT_METHODDEF    \
-    {"split", (PyCFunction)bytearray_split, METH_FASTCALL, bytearray_split__doc__},
+    {"split", (PyCFunction)bytearray_split, METH_FASTCALL|METH_KEYWORDS, bytearray_split__doc__},
 
 static PyObject *
 bytearray_split_impl(PyByteArrayObject *self, PyObject *sep,
@@ -263,7 +255,7 @@ PyDoc_STRVAR(bytearray_rsplit__doc__,
 "Splitting is done starting at the end of the bytearray and working to the front.");
 
 #define BYTEARRAY_RSPLIT_METHODDEF    \
-    {"rsplit", (PyCFunction)bytearray_rsplit, METH_FASTCALL, bytearray_rsplit__doc__},
+    {"rsplit", (PyCFunction)bytearray_rsplit, METH_FASTCALL|METH_KEYWORDS, bytearray_rsplit__doc__},
 
 static PyObject *
 bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep,
@@ -334,10 +326,6 @@ bytearray_insert(PyByteArrayObject *self
         &index, _getbytevalue, &item)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("insert", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_insert_impl(self, index, item);
 
 exit:
@@ -414,10 +402,6 @@ bytearray_pop(PyByteArrayObject *self, P
         &index)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pop", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_pop_impl(self, index);
 
 exit:
@@ -479,10 +463,6 @@ bytearray_strip(PyByteArrayObject *self,
         &bytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("strip", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_strip_impl(self, bytes);
 
 exit:
@@ -514,10 +494,6 @@ bytearray_lstrip(PyByteArrayObject *self
         &bytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lstrip", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_lstrip_impl(self, bytes);
 
 exit:
@@ -549,10 +525,6 @@ bytearray_rstrip(PyByteArrayObject *self
         &bytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rstrip", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_rstrip_impl(self, bytes);
 
 exit:
@@ -575,7 +547,7 @@ PyDoc_STRVAR(bytearray_decode__doc__,
 "    can handle UnicodeDecodeErrors.");
 
 #define BYTEARRAY_DECODE_METHODDEF    \
-    {"decode", (PyCFunction)bytearray_decode, METH_FASTCALL, bytearray_decode__doc__},
+    {"decode", (PyCFunction)bytearray_decode, METH_FASTCALL|METH_KEYWORDS, bytearray_decode__doc__},
 
 static PyObject *
 bytearray_decode_impl(PyByteArrayObject *self, const char *encoding,
@@ -623,7 +595,7 @@ PyDoc_STRVAR(bytearray_splitlines__doc__
 "true.");
 
 #define BYTEARRAY_SPLITLINES_METHODDEF    \
-    {"splitlines", (PyCFunction)bytearray_splitlines, METH_FASTCALL, bytearray_splitlines__doc__},
+    {"splitlines", (PyCFunction)bytearray_splitlines, METH_FASTCALL|METH_KEYWORDS, bytearray_splitlines__doc__},
 
 static PyObject *
 bytearray_splitlines_impl(PyByteArrayObject *self, int keepends);
@@ -716,10 +688,6 @@ bytearray_reduce_ex(PyByteArrayObject *s
         &proto)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("__reduce_ex__", kwnames)) {
-        goto exit;
-    }
     return_value = bytearray_reduce_ex_impl(self, proto);
 
 exit:
@@ -743,4 +711,4 @@ bytearray_sizeof(PyByteArrayObject *self
 {
     return bytearray_sizeof_impl(self);
 }
-/*[clinic end generated code: output=f5c364927425fae8 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e2662efb0dc5fa8b input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/clinic/bytesobject.c.h
--- a/Objects/clinic/bytesobject.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/clinic/bytesobject.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -17,7 +17,7 @@ PyDoc_STRVAR(bytes_split__doc__,
 "    -1 (the default value) means no limit.");
 
 #define BYTES_SPLIT_METHODDEF    \
-    {"split", (PyCFunction)bytes_split, METH_FASTCALL, bytes_split__doc__},
+    {"split", (PyCFunction)bytes_split, METH_FASTCALL|METH_KEYWORDS, bytes_split__doc__},
 
 static PyObject *
 bytes_split_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit);
@@ -136,7 +136,7 @@ PyDoc_STRVAR(bytes_rsplit__doc__,
 "Splitting is done starting at the end of the bytes and working to the front.");
 
 #define BYTES_RSPLIT_METHODDEF    \
-    {"rsplit", (PyCFunction)bytes_rsplit, METH_FASTCALL, bytes_rsplit__doc__},
+    {"rsplit", (PyCFunction)bytes_rsplit, METH_FASTCALL|METH_KEYWORDS, bytes_rsplit__doc__},
 
 static PyObject *
 bytes_rsplit_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit);
@@ -200,10 +200,6 @@ bytes_strip(PyBytesObject *self, PyObjec
         &bytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("strip", kwnames)) {
-        goto exit;
-    }
     return_value = bytes_strip_impl(self, bytes);
 
 exit:
@@ -235,10 +231,6 @@ bytes_lstrip(PyBytesObject *self, PyObje
         &bytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lstrip", kwnames)) {
-        goto exit;
-    }
     return_value = bytes_lstrip_impl(self, bytes);
 
 exit:
@@ -270,10 +262,6 @@ bytes_rstrip(PyBytesObject *self, PyObje
         &bytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rstrip", kwnames)) {
-        goto exit;
-    }
     return_value = bytes_rstrip_impl(self, bytes);
 
 exit:
@@ -293,7 +281,7 @@ PyDoc_STRVAR(bytes_translate__doc__,
 "The remaining characters are mapped through the given translation table.");
 
 #define BYTES_TRANSLATE_METHODDEF    \
-    {"translate", (PyCFunction)bytes_translate, METH_FASTCALL, bytes_translate__doc__},
+    {"translate", (PyCFunction)bytes_translate, METH_FASTCALL|METH_KEYWORDS, bytes_translate__doc__},
 
 static PyObject *
 bytes_translate_impl(PyBytesObject *self, PyObject *table,
@@ -346,10 +334,6 @@ bytes_maketrans(void *null, PyObject **a
         &frm, &to)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("maketrans", kwnames)) {
-        goto exit;
-    }
     return_value = bytes_maketrans_impl(&frm, &to);
 
 exit:
@@ -397,10 +381,6 @@ bytes_replace(PyBytesObject *self, PyObj
         &old, &new, &count)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("replace", kwnames)) {
-        goto exit;
-    }
     return_value = bytes_replace_impl(self, &old, &new, count);
 
 exit:
@@ -432,7 +412,7 @@ PyDoc_STRVAR(bytes_decode__doc__,
 "    can handle UnicodeDecodeErrors.");
 
 #define BYTES_DECODE_METHODDEF    \
-    {"decode", (PyCFunction)bytes_decode, METH_FASTCALL, bytes_decode__doc__},
+    {"decode", (PyCFunction)bytes_decode, METH_FASTCALL|METH_KEYWORDS, bytes_decode__doc__},
 
 static PyObject *
 bytes_decode_impl(PyBytesObject *self, const char *encoding,
@@ -467,7 +447,7 @@ PyDoc_STRVAR(bytes_splitlines__doc__,
 "true.");
 
 #define BYTES_SPLITLINES_METHODDEF    \
-    {"splitlines", (PyCFunction)bytes_splitlines, METH_FASTCALL, bytes_splitlines__doc__},
+    {"splitlines", (PyCFunction)bytes_splitlines, METH_FASTCALL|METH_KEYWORDS, bytes_splitlines__doc__},
 
 static PyObject *
 bytes_splitlines_impl(PyBytesObject *self, int keepends);
@@ -519,4 +499,4 @@ bytes_fromhex(PyTypeObject *type, PyObje
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=2504c1225108d348 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0c288b70d331f494 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/clinic/dictobject.c.h
--- a/Objects/clinic/dictobject.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/clinic/dictobject.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -26,10 +26,6 @@ dict_fromkeys(PyTypeObject *type, PyObje
         &iterable, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("fromkeys", kwnames)) {
-        goto exit;
-    }
     return_value = dict_fromkeys_impl(type, iterable, value);
 
 exit:
@@ -69,10 +65,6 @@ dict_get(PyDictObject *self, PyObject **
         &key, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("get", kwnames)) {
-        goto exit;
-    }
     return_value = dict_get_impl(self, key, default_value);
 
 exit:
@@ -106,13 +98,9 @@ dict_setdefault(PyDictObject *self, PyOb
         &key, &default_value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setdefault", kwnames)) {
-        goto exit;
-    }
     return_value = dict_setdefault_impl(self, key, default_value);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=4d57df133cf66e53 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d2a7fcfe1ad6807f input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/clinic/longobject.c.h
--- a/Objects/clinic/longobject.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/clinic/longobject.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -117,7 +117,7 @@ PyDoc_STRVAR(int_to_bytes__doc__,
 "    is raised.");
 
 #define INT_TO_BYTES_METHODDEF    \
-    {"to_bytes", (PyCFunction)int_to_bytes, METH_FASTCALL, int_to_bytes__doc__},
+    {"to_bytes", (PyCFunction)int_to_bytes, METH_FASTCALL|METH_KEYWORDS, int_to_bytes__doc__},
 
 static PyObject *
 int_to_bytes_impl(PyObject *self, Py_ssize_t length, PyObject *byteorder,
@@ -164,7 +164,7 @@ PyDoc_STRVAR(int_from_bytes__doc__,
 "    Indicates whether two\'s complement is used to represent the integer.");
 
 #define INT_FROM_BYTES_METHODDEF    \
-    {"from_bytes", (PyCFunction)int_from_bytes, METH_FASTCALL|METH_CLASS, int_from_bytes__doc__},
+    {"from_bytes", (PyCFunction)int_from_bytes, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, int_from_bytes__doc__},
 
 static PyObject *
 int_from_bytes_impl(PyTypeObject *type, PyObject *bytes_obj,
@@ -189,4 +189,4 @@ int_from_bytes(PyTypeObject *type, PyObj
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=a9bae2fd016e7b85 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6dd031d43c457617 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/clinic/odictobject.c.h
--- a/Objects/clinic/odictobject.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/clinic/odictobject.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -9,7 +9,7 @@ PyDoc_STRVAR(OrderedDict_fromkeys__doc__
 "Create a new ordered dictionary with keys from iterable and values set to value.");
 
 #define ORDEREDDICT_FROMKEYS_METHODDEF    \
-    {"fromkeys", (PyCFunction)OrderedDict_fromkeys, METH_FASTCALL|METH_CLASS, OrderedDict_fromkeys__doc__},
+    {"fromkeys", (PyCFunction)OrderedDict_fromkeys, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, OrderedDict_fromkeys__doc__},
 
 static PyObject *
 OrderedDict_fromkeys_impl(PyTypeObject *type, PyObject *seq, PyObject *value);
@@ -42,7 +42,7 @@ PyDoc_STRVAR(OrderedDict_setdefault__doc
 "Return the value for key if key is in the dictionary, else default.");
 
 #define ORDEREDDICT_SETDEFAULT_METHODDEF    \
-    {"setdefault", (PyCFunction)OrderedDict_setdefault, METH_FASTCALL, OrderedDict_setdefault__doc__},
+    {"setdefault", (PyCFunction)OrderedDict_setdefault, METH_FASTCALL|METH_KEYWORDS, OrderedDict_setdefault__doc__},
 
 static PyObject *
 OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
@@ -76,7 +76,7 @@ PyDoc_STRVAR(OrderedDict_popitem__doc__,
 "Pairs are returned in LIFO order if last is true or FIFO order if false.");
 
 #define ORDEREDDICT_POPITEM_METHODDEF    \
-    {"popitem", (PyCFunction)OrderedDict_popitem, METH_FASTCALL, OrderedDict_popitem__doc__},
+    {"popitem", (PyCFunction)OrderedDict_popitem, METH_FASTCALL|METH_KEYWORDS, OrderedDict_popitem__doc__},
 
 static PyObject *
 OrderedDict_popitem_impl(PyODictObject *self, int last);
@@ -108,7 +108,7 @@ PyDoc_STRVAR(OrderedDict_move_to_end__do
 "Raise KeyError if the element does not exist.");
 
 #define ORDEREDDICT_MOVE_TO_END_METHODDEF    \
-    {"move_to_end", (PyCFunction)OrderedDict_move_to_end, METH_FASTCALL, OrderedDict_move_to_end__doc__},
+    {"move_to_end", (PyCFunction)OrderedDict_move_to_end, METH_FASTCALL|METH_KEYWORDS, OrderedDict_move_to_end__doc__},
 
 static PyObject *
 OrderedDict_move_to_end_impl(PyODictObject *self, PyObject *key, int last);
@@ -131,4 +131,4 @@ OrderedDict_move_to_end(PyODictObject *s
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=a19a24ac37b42e5e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b2f82eca6e8c8084 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/clinic/unicodeobject.c.h
--- a/Objects/clinic/unicodeobject.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/clinic/unicodeobject.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -87,10 +87,6 @@ unicode_center(PyObject *self, PyObject 
         &width, convert_uc, &fillchar)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("center", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_center_impl(self, width, fillchar);
 
 exit:
@@ -113,7 +109,7 @@ PyDoc_STRVAR(unicode_encode__doc__,
 "    codecs.register_error that can handle UnicodeEncodeErrors.");
 
 #define UNICODE_ENCODE_METHODDEF    \
-    {"encode", (PyCFunction)unicode_encode, METH_FASTCALL, unicode_encode__doc__},
+    {"encode", (PyCFunction)unicode_encode, METH_FASTCALL|METH_KEYWORDS, unicode_encode__doc__},
 
 static PyObject *
 unicode_encode_impl(PyObject *self, const char *encoding, const char *errors);
@@ -146,7 +142,7 @@ PyDoc_STRVAR(unicode_expandtabs__doc__,
 "If tabsize is not given, a tab size of 8 characters is assumed.");
 
 #define UNICODE_EXPANDTABS_METHODDEF    \
-    {"expandtabs", (PyCFunction)unicode_expandtabs, METH_FASTCALL, unicode_expandtabs__doc__},
+    {"expandtabs", (PyCFunction)unicode_expandtabs, METH_FASTCALL|METH_KEYWORDS, unicode_expandtabs__doc__},
 
 static PyObject *
 unicode_expandtabs_impl(PyObject *self, int tabsize);
@@ -439,10 +435,6 @@ unicode_ljust(PyObject *self, PyObject *
         &width, convert_uc, &fillchar)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ljust", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_ljust_impl(self, width, fillchar);
 
 exit:
@@ -492,10 +484,6 @@ unicode_strip(PyObject *self, PyObject *
         &chars)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("strip", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_strip_impl(self, chars);
 
 exit:
@@ -527,10 +515,6 @@ unicode_lstrip(PyObject *self, PyObject 
         &chars)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("lstrip", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_lstrip_impl(self, chars);
 
 exit:
@@ -562,10 +546,6 @@ unicode_rstrip(PyObject *self, PyObject 
         &chars)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rstrip", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_rstrip_impl(self, chars);
 
 exit:
@@ -604,10 +584,6 @@ unicode_replace(PyObject *self, PyObject
         &old, &new, &count)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("replace", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_replace_impl(self, old, new, count);
 
 exit:
@@ -639,10 +615,6 @@ unicode_rjust(PyObject *self, PyObject *
         &width, convert_uc, &fillchar)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("rjust", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_rjust_impl(self, width, fillchar);
 
 exit:
@@ -664,7 +636,7 @@ PyDoc_STRVAR(unicode_split__doc__,
 "    -1 (the default value) means no limit.");
 
 #define UNICODE_SPLIT_METHODDEF    \
-    {"split", (PyCFunction)unicode_split, METH_FASTCALL, unicode_split__doc__},
+    {"split", (PyCFunction)unicode_split, METH_FASTCALL|METH_KEYWORDS, unicode_split__doc__},
 
 static PyObject *
 unicode_split_impl(PyObject *self, PyObject *sep, Py_ssize_t maxsplit);
@@ -737,7 +709,7 @@ PyDoc_STRVAR(unicode_rsplit__doc__,
 "Splits are done starting at the end of the string and working to the front.");
 
 #define UNICODE_RSPLIT_METHODDEF    \
-    {"rsplit", (PyCFunction)unicode_rsplit, METH_FASTCALL, unicode_rsplit__doc__},
+    {"rsplit", (PyCFunction)unicode_rsplit, METH_FASTCALL|METH_KEYWORDS, unicode_rsplit__doc__},
 
 static PyObject *
 unicode_rsplit_impl(PyObject *self, PyObject *sep, Py_ssize_t maxsplit);
@@ -771,7 +743,7 @@ PyDoc_STRVAR(unicode_splitlines__doc__,
 "true.");
 
 #define UNICODE_SPLITLINES_METHODDEF    \
-    {"splitlines", (PyCFunction)unicode_splitlines, METH_FASTCALL, unicode_splitlines__doc__},
+    {"splitlines", (PyCFunction)unicode_splitlines, METH_FASTCALL|METH_KEYWORDS, unicode_splitlines__doc__},
 
 static PyObject *
 unicode_splitlines_impl(PyObject *self, int keepends);
@@ -844,10 +816,6 @@ unicode_maketrans(void *null, PyObject *
         &x, &y, &z)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("maketrans", kwnames)) {
-        goto exit;
-    }
     return_value = unicode_maketrans_impl(x, y, z);
 
 exit:
@@ -962,4 +930,4 @@ unicode_sizeof(PyObject *self, PyObject 
 {
     return unicode_sizeof_impl(self);
 }
-/*[clinic end generated code: output=88b06f61edd282f9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0257b490dfe84adf input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Objects/methodobject.c
--- a/Objects/methodobject.c	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/methodobject.c	Mon Feb 06 17:12:36 2017 +0200
@@ -165,9 +165,19 @@ PyObject *
 
     case METH_FASTCALL:
     {
+        if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) {
+            goto no_keyword_error;
+        }
+
+        result = (*(_PyCFunctionFast)meth) (self, args, nargs);
+        break;
+    }
+
+    case METH_FASTCALL | METH_KEYWORDS:
+    {
         PyObject **stack;
         PyObject *kwnames;
-        _PyCFunctionFast fastmeth = (_PyCFunctionFast)meth;
+        _PyCFunctionFastWithKeywords fastmeth = (_PyCFunctionFastWithKeywords)meth;
 
         if (_PyStack_UnpackDict(args, nargs, kwargs, &stack, &kwnames) < 0) {
             return NULL;
@@ -268,7 +278,16 @@ PyObject *
 
     case METH_FASTCALL:
         /* Fast-path: avoid temporary dict to pass keyword arguments */
-        result = ((_PyCFunctionFast)meth) (self, args, nargs, kwnames);
+        if (nkwargs) {
+            goto no_keyword_error;
+        }
+
+        result = ((_PyCFunctionFast)meth) (self, args, nargs);
+        break;
+
+    case METH_FASTCALL | METH_KEYWORDS:
+        /* Fast-path: avoid temporary dict to pass keyword arguments */
+        result = ((_PyCFunctionFastWithKeywords)meth) (self, args, nargs, kwnames);
         break;
 
     case METH_VARARGS:
diff -r ca2f024ce7cb Objects/typeobject.c
--- a/Objects/typeobject.c	Mon Feb 06 14:24:00 2017 +0100
+++ b/Objects/typeobject.c	Mon Feb 06 17:12:36 2017 +0200
@@ -3235,7 +3235,7 @@ static PyMethodDef type_methods[] = {
     {"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS,
      PyDoc_STR("__subclasses__() -> list of immediate subclasses")},
     {"__prepare__", (PyCFunction)type_prepare,
-     METH_FASTCALL | METH_CLASS,
+     METH_FASTCALL | METH_KEYWORDS | METH_CLASS,
      PyDoc_STR("__prepare__() -> dict\n"
                "used to create the namespace for the class statement")},
     {"__instancecheck__", type___instancecheck__, METH_O,
diff -r ca2f024ce7cb PC/clinic/_testconsole.c.h
--- a/PC/clinic/_testconsole.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/PC/clinic/_testconsole.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -11,7 +11,7 @@ PyDoc_STRVAR(_testconsole_write_input__d
 "Writes UTF-16-LE encoded bytes to the console as if typed by a user.");
 
 #define _TESTCONSOLE_WRITE_INPUT_METHODDEF    \
-    {"write_input", (PyCFunction)_testconsole_write_input, METH_FASTCALL, _testconsole_write_input__doc__},
+    {"write_input", (PyCFunction)_testconsole_write_input, METH_FASTCALL|METH_KEYWORDS, _testconsole_write_input__doc__},
 
 static PyObject *
 _testconsole_write_input_impl(PyObject *module, PyObject *file,
@@ -47,7 +47,7 @@ PyDoc_STRVAR(_testconsole_read_output__d
 "Reads a str from the console as written to stdout.");
 
 #define _TESTCONSOLE_READ_OUTPUT_METHODDEF    \
-    {"read_output", (PyCFunction)_testconsole_read_output, METH_FASTCALL, _testconsole_read_output__doc__},
+    {"read_output", (PyCFunction)_testconsole_read_output, METH_FASTCALL|METH_KEYWORDS, _testconsole_read_output__doc__},
 
 static PyObject *
 _testconsole_read_output_impl(PyObject *module, PyObject *file);
@@ -79,4 +79,4 @@ exit:
 #ifndef _TESTCONSOLE_READ_OUTPUT_METHODDEF
     #define _TESTCONSOLE_READ_OUTPUT_METHODDEF
 #endif /* !defined(_TESTCONSOLE_READ_OUTPUT_METHODDEF) */
-/*[clinic end generated code: output=30d2a80143b65e6f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ac80ed19e6edc0af input=a9049054013a1b77]*/
diff -r ca2f024ce7cb PC/clinic/msvcrtmodule.c.h
--- a/PC/clinic/msvcrtmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/PC/clinic/msvcrtmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -54,10 +54,6 @@ msvcrt_locking(PyObject *module, PyObjec
         &fd, &mode, &nbytes)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("locking", kwnames)) {
-        goto exit;
-    }
     return_value = msvcrt_locking_impl(module, fd, mode, nbytes);
 
 exit:
@@ -93,10 +89,6 @@ msvcrt_setmode(PyObject *module, PyObjec
         &fd, &flags)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setmode", kwnames)) {
-        goto exit;
-    }
     _return_value = msvcrt_setmode_impl(module, fd, flags);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -135,10 +127,6 @@ msvcrt_open_osfhandle(PyObject *module, 
         &handle, &flags)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("open_osfhandle", kwnames)) {
-        goto exit;
-    }
     _return_value = msvcrt_open_osfhandle_impl(module, handle, flags);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -453,10 +441,6 @@ msvcrt_CrtSetReportFile(PyObject *module
         &type, &file)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CrtSetReportFile", kwnames)) {
-        goto exit;
-    }
     _return_value = msvcrt_CrtSetReportFile_impl(module, type, file);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -497,10 +481,6 @@ msvcrt_CrtSetReportMode(PyObject *module
         &type, &mode)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CrtSetReportMode", kwnames)) {
-        goto exit;
-    }
     _return_value = msvcrt_CrtSetReportMode_impl(module, type, mode);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
@@ -589,4 +569,4 @@ exit:
 #ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
     #define MSVCRT_SET_ERROR_MODE_METHODDEF
 #endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
-/*[clinic end generated code: output=36f1e78ca8bd3944 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=94609e09ad32b22e input=a9049054013a1b77]*/
diff -r ca2f024ce7cb PC/clinic/winreg.c.h
--- a/PC/clinic/winreg.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/PC/clinic/winreg.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -77,7 +77,7 @@ PyDoc_STRVAR(winreg_HKEYType___exit____d
 "\n");
 
 #define WINREG_HKEYTYPE___EXIT___METHODDEF    \
-    {"__exit__", (PyCFunction)winreg_HKEYType___exit__, METH_FASTCALL, winreg_HKEYType___exit____doc__},
+    {"__exit__", (PyCFunction)winreg_HKEYType___exit__, METH_FASTCALL|METH_KEYWORDS, winreg_HKEYType___exit____doc__},
 
 static PyObject *
 winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type,
@@ -152,10 +152,6 @@ winreg_ConnectRegistry(PyObject *module,
         &computer_name, clinic_HKEY_converter, &key)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("ConnectRegistry", kwnames)) {
-        goto exit;
-    }
     _return_value = winreg_ConnectRegistry_impl(module, computer_name, key);
     if (_return_value == NULL) {
         goto exit;
@@ -203,10 +199,6 @@ winreg_CreateKey(PyObject *module, PyObj
         clinic_HKEY_converter, &key, &sub_key)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("CreateKey", kwnames)) {
-        goto exit;
-    }
     _return_value = winreg_CreateKey_impl(module, key, sub_key);
     if (_return_value == NULL) {
         goto exit;
@@ -243,7 +235,7 @@ PyDoc_STRVAR(winreg_CreateKeyEx__doc__,
 "If the function fails, an OSError exception is raised.");
 
 #define WINREG_CREATEKEYEX_METHODDEF    \
-    {"CreateKeyEx", (PyCFunction)winreg_CreateKeyEx, METH_FASTCALL, winreg_CreateKeyEx__doc__},
+    {"CreateKeyEx", (PyCFunction)winreg_CreateKeyEx, METH_FASTCALL|METH_KEYWORDS, winreg_CreateKeyEx__doc__},
 
 static HKEY
 winreg_CreateKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key,
@@ -310,10 +302,6 @@ winreg_DeleteKey(PyObject *module, PyObj
         clinic_HKEY_converter, &key, &sub_key)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("DeleteKey", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_DeleteKey_impl(module, key, sub_key);
 
 exit:
@@ -346,7 +334,7 @@ PyDoc_STRVAR(winreg_DeleteKeyEx__doc__,
 "On unsupported Windows versions, NotImplementedError is raised.");
 
 #define WINREG_DELETEKEYEX_METHODDEF    \
-    {"DeleteKeyEx", (PyCFunction)winreg_DeleteKeyEx, METH_FASTCALL, winreg_DeleteKeyEx__doc__},
+    {"DeleteKeyEx", (PyCFunction)winreg_DeleteKeyEx, METH_FASTCALL|METH_KEYWORDS, winreg_DeleteKeyEx__doc__},
 
 static PyObject *
 winreg_DeleteKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key,
@@ -401,10 +389,6 @@ winreg_DeleteValue(PyObject *module, PyO
         clinic_HKEY_converter, &key, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("DeleteValue", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_DeleteValue_impl(module, key, value);
 
 exit:
@@ -443,10 +427,6 @@ winreg_EnumKey(PyObject *module, PyObjec
         clinic_HKEY_converter, &key, &index)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("EnumKey", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_EnumKey_impl(module, key, index);
 
 exit:
@@ -494,10 +474,6 @@ winreg_EnumValue(PyObject *module, PyObj
         clinic_HKEY_converter, &key, &index)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("EnumValue", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_EnumValue_impl(module, key, index);
 
 exit:
@@ -618,10 +594,6 @@ winreg_LoadKey(PyObject *module, PyObjec
         clinic_HKEY_converter, &key, &sub_key, &file_name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("LoadKey", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_LoadKey_impl(module, key, sub_key, file_name);
 
 exit:
@@ -648,7 +620,7 @@ PyDoc_STRVAR(winreg_OpenKey__doc__,
 "If the function fails, an OSError exception is raised.");
 
 #define WINREG_OPENKEY_METHODDEF    \
-    {"OpenKey", (PyCFunction)winreg_OpenKey, METH_FASTCALL, winreg_OpenKey__doc__},
+    {"OpenKey", (PyCFunction)winreg_OpenKey, METH_FASTCALL|METH_KEYWORDS, winreg_OpenKey__doc__},
 
 static HKEY
 winreg_OpenKey_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key,
@@ -700,7 +672,7 @@ PyDoc_STRVAR(winreg_OpenKeyEx__doc__,
 "If the function fails, an OSError exception is raised.");
 
 #define WINREG_OPENKEYEX_METHODDEF    \
-    {"OpenKeyEx", (PyCFunction)winreg_OpenKeyEx, METH_FASTCALL, winreg_OpenKeyEx__doc__},
+    {"OpenKeyEx", (PyCFunction)winreg_OpenKeyEx, METH_FASTCALL|METH_KEYWORDS, winreg_OpenKeyEx__doc__},
 
 static HKEY
 winreg_OpenKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key,
@@ -805,10 +777,6 @@ winreg_QueryValue(PyObject *module, PyOb
         clinic_HKEY_converter, &key, &sub_key)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("QueryValue", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_QueryValue_impl(module, key, sub_key);
 
 exit:
@@ -848,10 +816,6 @@ winreg_QueryValueEx(PyObject *module, Py
         clinic_HKEY_converter, &key, &name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("QueryValueEx", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_QueryValueEx_impl(module, key, name);
 
 exit:
@@ -896,10 +860,6 @@ winreg_SaveKey(PyObject *module, PyObjec
         clinic_HKEY_converter, &key, &file_name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("SaveKey", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_SaveKey_impl(module, key, file_name);
 
 exit:
@@ -954,10 +914,6 @@ winreg_SetValue(PyObject *module, PyObje
         clinic_HKEY_converter, &key, &sub_key, &type, &value, &value_length)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("SetValue", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_SetValue_impl(module, key, sub_key, type, value, value_length);
 
 exit:
@@ -1028,10 +984,6 @@ winreg_SetValueEx(PyObject *module, PyOb
         clinic_HKEY_converter, &key, &value_name, &reserved, &type, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("SetValueEx", kwnames)) {
-        goto exit;
-    }
     return_value = winreg_SetValueEx_impl(module, key, value_name, reserved, type, value);
 
 exit:
@@ -1139,4 +1091,4 @@ winreg_QueryReflectionKey(PyObject *modu
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=ddc72b006143d33d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=143c9cd33d75c18d input=a9049054013a1b77]*/
diff -r ca2f024ce7cb PC/clinic/winsound.c.h
--- a/PC/clinic/winsound.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/PC/clinic/winsound.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -14,7 +14,7 @@ PyDoc_STRVAR(winsound_PlaySound__doc__,
 "    Flag values, ored together.  See module documentation.");
 
 #define WINSOUND_PLAYSOUND_METHODDEF    \
-    {"PlaySound", (PyCFunction)winsound_PlaySound, METH_FASTCALL, winsound_PlaySound__doc__},
+    {"PlaySound", (PyCFunction)winsound_PlaySound, METH_FASTCALL|METH_KEYWORDS, winsound_PlaySound__doc__},
 
 static PyObject *
 winsound_PlaySound_impl(PyObject *module, PyObject *sound, int flags);
@@ -51,7 +51,7 @@ PyDoc_STRVAR(winsound_Beep__doc__,
 "    How long the sound should play, in milliseconds.");
 
 #define WINSOUND_BEEP_METHODDEF    \
-    {"Beep", (PyCFunction)winsound_Beep, METH_FASTCALL, winsound_Beep__doc__},
+    {"Beep", (PyCFunction)winsound_Beep, METH_FASTCALL|METH_KEYWORDS, winsound_Beep__doc__},
 
 static PyObject *
 winsound_Beep_impl(PyObject *module, int frequency, int duration);
@@ -84,7 +84,7 @@ PyDoc_STRVAR(winsound_MessageBeep__doc__
 "x defaults to MB_OK.");
 
 #define WINSOUND_MESSAGEBEEP_METHODDEF    \
-    {"MessageBeep", (PyCFunction)winsound_MessageBeep, METH_FASTCALL, winsound_MessageBeep__doc__},
+    {"MessageBeep", (PyCFunction)winsound_MessageBeep, METH_FASTCALL|METH_KEYWORDS, winsound_MessageBeep__doc__},
 
 static PyObject *
 winsound_MessageBeep_impl(PyObject *module, int type);
@@ -106,4 +106,4 @@ winsound_MessageBeep(PyObject *module, P
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=102a556c665a277d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d22e41446929d3ef input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Python/bltinmodule.c
--- a/Python/bltinmodule.c	Mon Feb 06 14:24:00 2017 +0100
+++ b/Python/bltinmodule.c	Mon Feb 06 17:12:36 2017 +0200
@@ -993,8 +993,7 @@ builtin_exec_impl(PyObject *module, PyOb
 
 /* AC: cannot convert yet, as needs PEP 457 group support in inspect */
 static PyObject *
-builtin_getattr(PyObject *self, PyObject **args, Py_ssize_t nargs,
-                PyObject *kwnames)
+builtin_getattr(PyObject *self, PyObject **args, Py_ssize_t nargs)
 {
     PyObject *v, *result, *dflt = NULL;
     PyObject *name;
@@ -1002,10 +1001,6 @@ builtin_getattr(PyObject *self, PyObject
     if (!_PyArg_UnpackStack(args, nargs, "getattr", 2, 3, &v, &name, &dflt))
         return NULL;
 
-    if (!_PyArg_NoStackKeywords("getattr", kwnames)) {
-        return NULL;
-    }
-
     if (!PyUnicode_Check(name)) {
         PyErr_SetString(PyExc_TypeError,
                         "getattr(): attribute name must be string");
@@ -1303,8 +1298,7 @@ PyTypeObject PyMap_Type = {
 
 /* AC: cannot convert yet, as needs PEP 457 group support in inspect */
 static PyObject *
-builtin_next(PyObject *self, PyObject **args, Py_ssize_t nargs,
-             PyObject *kwnames)
+builtin_next(PyObject *self, PyObject **args, Py_ssize_t nargs)
 {
     PyObject *it, *res;
     PyObject *def = NULL;
@@ -1312,10 +1306,6 @@ builtin_next(PyObject *self, PyObject **
     if (!_PyArg_UnpackStack(args, nargs, "next", 1, 2, &it, &def))
         return NULL;
 
-    if (!_PyArg_NoStackKeywords("next", kwnames)) {
-        return NULL;
-    }
-
     if (!PyIter_Check(it)) {
         PyErr_Format(PyExc_TypeError,
             "'%.200s' object is not an iterator",
@@ -2119,7 +2109,7 @@ PyDoc_STRVAR(builtin_sorted__doc__,
 "reverse flag can be set to request the result in descending order.");
 
 #define BUILTIN_SORTED_METHODDEF    \
-    {"sorted", (PyCFunction)builtin_sorted, METH_FASTCALL, builtin_sorted__doc__},
+    {"sorted", (PyCFunction)builtin_sorted, METH_FASTCALL | METH_KEYWORDS, builtin_sorted__doc__},
 
 static PyObject *
 builtin_sorted(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
@@ -2610,7 +2600,7 @@ PyTypeObject PyZip_Type = {
 
 static PyMethodDef builtin_methods[] = {
     {"__build_class__", (PyCFunction)builtin___build_class__,
-     METH_FASTCALL, build_class_doc},
+     METH_FASTCALL | METH_KEYWORDS, build_class_doc},
     {"__import__",      (PyCFunction)builtin___import__, METH_VARARGS | METH_KEYWORDS, import_doc},
     BUILTIN_ABS_METHODDEF
     BUILTIN_ALL_METHODDEF
@@ -2644,7 +2634,7 @@ static PyMethodDef builtin_methods[] = {
     BUILTIN_OCT_METHODDEF
     BUILTIN_ORD_METHODDEF
     BUILTIN_POW_METHODDEF
-    {"print",           (PyCFunction)builtin_print,      METH_FASTCALL, print_doc},
+    {"print",           (PyCFunction)builtin_print,      METH_FASTCALL | METH_KEYWORDS, print_doc},
     BUILTIN_REPR_METHODDEF
     {"round",           (PyCFunction)builtin_round,      METH_VARARGS | METH_KEYWORDS, round_doc},
     BUILTIN_SETATTR_METHODDEF
diff -r ca2f024ce7cb Python/clinic/_warnings.c.h
--- a/Python/clinic/_warnings.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Python/clinic/_warnings.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -9,7 +9,7 @@ PyDoc_STRVAR(warnings_warn__doc__,
 "Issue a warning, or maybe ignore it or raise an exception.");
 
 #define WARNINGS_WARN_METHODDEF    \
-    {"warn", (PyCFunction)warnings_warn, METH_FASTCALL, warnings_warn__doc__},
+    {"warn", (PyCFunction)warnings_warn, METH_FASTCALL|METH_KEYWORDS, warnings_warn__doc__},
 
 static PyObject *
 warnings_warn_impl(PyObject *module, PyObject *message, PyObject *category,
@@ -35,4 +35,4 @@ warnings_warn(PyObject *module, PyObject
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=acadf1788059034c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=74b1a7d1ee41816d input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Python/clinic/bltinmodule.c.h
--- a/Python/clinic/bltinmodule.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Python/clinic/bltinmodule.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -96,10 +96,6 @@ builtin_format(PyObject *module, PyObjec
         &value, &format_spec)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("format", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_format_impl(module, value, format_spec);
 
 exit:
@@ -152,7 +148,7 @@ PyDoc_STRVAR(builtin_compile__doc__,
 "in addition to any features explicitly specified.");
 
 #define BUILTIN_COMPILE_METHODDEF    \
-    {"compile", (PyCFunction)builtin_compile, METH_FASTCALL, builtin_compile__doc__},
+    {"compile", (PyCFunction)builtin_compile, METH_FASTCALL|METH_KEYWORDS, builtin_compile__doc__},
 
 static PyObject *
 builtin_compile_impl(PyObject *module, PyObject *source, PyObject *filename,
@@ -206,10 +202,6 @@ builtin_divmod(PyObject *module, PyObjec
         &x, &y)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("divmod", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_divmod_impl(module, x, y);
 
 exit:
@@ -248,10 +240,6 @@ builtin_eval(PyObject *module, PyObject 
         &source, &globals, &locals)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("eval", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_eval_impl(module, source, globals, locals);
 
 exit:
@@ -290,10 +278,6 @@ builtin_exec(PyObject *module, PyObject 
         &source, &globals, &locals)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("exec", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_exec_impl(module, source, globals, locals);
 
 exit:
@@ -347,10 +331,6 @@ builtin_hasattr(PyObject *module, PyObje
         &obj, &name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("hasattr", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_hasattr_impl(module, obj, name);
 
 exit:
@@ -397,10 +377,6 @@ builtin_setattr(PyObject *module, PyObje
         &obj, &name, &value)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("setattr", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_setattr_impl(module, obj, name, value);
 
 exit:
@@ -433,10 +409,6 @@ builtin_delattr(PyObject *module, PyObje
         &obj, &name)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("delattr", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_delattr_impl(module, obj, name);
 
 exit:
@@ -547,10 +519,6 @@ builtin_pow(PyObject *module, PyObject *
         &x, &y, &z)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("pow", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_pow_impl(module, x, y, z);
 
 exit:
@@ -586,10 +554,6 @@ builtin_input(PyObject *module, PyObject
         &prompt)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("input", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_input_impl(module, prompt);
 
 exit:
@@ -635,10 +599,6 @@ builtin_sum(PyObject *module, PyObject *
         &iterable, &start)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("sum", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_sum_impl(module, iterable, start);
 
 exit:
@@ -674,10 +634,6 @@ builtin_isinstance(PyObject *module, PyO
         &obj, &class_or_tuple)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("isinstance", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_isinstance_impl(module, obj, class_or_tuple);
 
 exit:
@@ -713,13 +669,9 @@ builtin_issubclass(PyObject *module, PyO
         &cls, &class_or_tuple)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("issubclass", kwnames)) {
-        goto exit;
-    }
     return_value = builtin_issubclass_impl(module, cls, class_or_tuple);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3234725ef4d8bbf1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=cce2dbba4739c1e5 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Python/clinic/import.c.h
--- a/Python/clinic/import.c.h	Mon Feb 06 14:24:00 2017 +0100
+++ b/Python/clinic/import.c.h	Mon Feb 06 17:12:36 2017 +0200
@@ -92,10 +92,6 @@ static PyObject *
         &PyCode_Type, &code, &path)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("_fix_co_filename", kwnames)) {
-        goto exit;
-    }
     return_value = _imp__fix_co_filename_impl(module, code, path);
 
 exit:
@@ -290,10 +286,6 @@ static PyObject *
         &spec, &file)) {
         goto exit;
     }
-
-    if (!_PyArg_NoStackKeywords("create_dynamic", kwnames)) {
-        goto exit;
-    }
     return_value = _imp_create_dynamic_impl(module, spec, file);
 
 exit:
@@ -369,4 +361,4 @@ exit:
 #ifndef _IMP_EXEC_DYNAMIC_METHODDEF
     #define _IMP_EXEC_DYNAMIC_METHODDEF
 #endif /* !defined(_IMP_EXEC_DYNAMIC_METHODDEF) */
-/*[clinic end generated code: output=c1d0e65d04114958 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=728a306c00ce8d74 input=a9049054013a1b77]*/
diff -r ca2f024ce7cb Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py	Mon Feb 06 14:24:00 2017 +0100
+++ b/Tools/clinic/clinic.py	Mon Feb 06 17:12:36 2017 +0200
@@ -835,10 +835,6 @@ class CLanguage(Language):
                         {parse_arguments})) {{
                         goto exit;
                     }}
-
-                    if ({self_type_check}!_PyArg_NoStackKeywords("{name}", kwnames)) {{
-                        goto exit;
-                    }}
                     """, indent=4))
             else:
                 flags = "METH_VARARGS"
@@ -865,10 +861,6 @@ class CLanguage(Language):
                         {parse_arguments})) {{
                         goto exit;
                     }}
-
-                    if ({self_type_check}!_PyArg_NoStackKeywords("{name}", kwnames)) {{
-                        goto exit;
-                    }}
                     """, indent=4))
             else:
                 # positional-only, but no option groups
@@ -885,7 +877,7 @@ class CLanguage(Language):
                     """, indent=4))
 
         elif not new_or_init:
-            flags = "METH_FASTCALL"
+            flags = "METH_FASTCALL|METH_KEYWORDS"
 
             parser_prototype = parser_prototype_fastcall