diff -r a5a2b33993e3 Modules/_bz2module.c
--- a/Modules/_bz2module.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/_bz2module.c	Tue Apr 14 15:32:07 2015 -0400
@@ -614,8 +614,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data, Py_ssize_t max_length)
-/*[clinic end generated code: output=7eeb5794035a2ca3 input=9558b424c8b00516]*/
+_bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
+                                     Py_ssize_t max_length)
+/*[clinic end generated code: output=23e41045deb240a3 input=9558b424c8b00516]*/
 {
     PyObject *result = NULL;
 
diff -r a5a2b33993e3 Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/_cursesmodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -586,8 +586,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1, int y, int x, PyObject *ch, int group_right_1, long attr)
-/*[clinic end generated code: output=9fa34a5d80151f1a input=5a41efb34a2de338]*/
+curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1, int y,
+                         int x, PyObject *ch, int group_right_1, long attr)
+/*[clinic end generated code: output=99f7f85078ec06c3 input=5a41efb34a2de338]*/
 {
     PyCursesWindowObject *cwself = (PyCursesWindowObject *)self;
     int coordinates_group = group_left_1;
diff -r a5a2b33993e3 Modules/_dbmmodule.c
--- a/Modules/_dbmmodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/_dbmmodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -280,8 +280,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-dbm_dbm_get_impl(dbmobject *dp, const char *key, Py_ssize_clean_t key_length, PyObject *default_value)
-/*[clinic end generated code: output=c2bdccaa734ad349 input=aecf5efd2f2b1a3b]*/
+dbm_dbm_get_impl(dbmobject *dp, const char *key, Py_ssize_clean_t key_length,
+                 PyObject *default_value)
+/*[clinic end generated code: output=4f5c0e523eaf1251 input=aecf5efd2f2b1a3b]*/
 {
     datum dbm_key, val;
 
@@ -422,8 +423,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-dbmopen_impl(PyModuleDef *module, const char *filename, const char *flags, int mode)
-/*[clinic end generated code: output=8b618fe06b92bf86 input=6499ab0fab1333ac]*/
+dbmopen_impl(PyModuleDef *module, const char *filename, const char *flags,
+             int mode)
+/*[clinic end generated code: output=e8d4b36f25c733fd input=6499ab0fab1333ac]*/
 {
     int iflags;
 
diff -r a5a2b33993e3 Modules/_lzmamodule.c
--- a/Modules/_lzmamodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/_lzmamodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -1085,8 +1085,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data, Py_ssize_t max_length)
-/*[clinic end generated code: output=1532a5bb23629001 input=f2bb902cc1caf203]*/
+_lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data,
+                                       Py_ssize_t max_length)
+/*[clinic end generated code: output=ef4e20ec7122241d input=f2bb902cc1caf203]*/
 {
     PyObject *result = NULL;
 
@@ -1150,8 +1151,9 @@
 [clinic start generated code]*/
 
 static int
-_lzma_LZMADecompressor___init___impl(Decompressor *self, int format, PyObject *memlimit, PyObject *filters)
-/*[clinic end generated code: output=9b119f6f2cc2d7a8 input=458ca6132ef29801]*/
+_lzma_LZMADecompressor___init___impl(Decompressor *self, int format,
+                                     PyObject *memlimit, PyObject *filters)
+/*[clinic end generated code: output=3e1821f8aa36564c input=458ca6132ef29801]*/
 {
     const uint32_t decoder_flags = LZMA_TELL_ANY_CHECK | LZMA_TELL_NO_CHECK;
     uint64_t memlimit_ = UINT64_MAX;
@@ -1399,8 +1401,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_lzma__decode_filter_properties_impl(PyModuleDef *module, lzma_vli filter_id, Py_buffer *encoded_props)
-/*[clinic end generated code: output=235f7f5345d48744 input=246410800782160c]*/
+_lzma__decode_filter_properties_impl(PyModuleDef *module, lzma_vli filter_id,
+                                     Py_buffer *encoded_props)
+/*[clinic end generated code: output=af248f570746668b input=246410800782160c]*/
 {
     lzma_filter filter;
     lzma_ret lzret;
diff -r a5a2b33993e3 Modules/_pickle.c
--- a/Modules/_pickle.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/_pickle.c	Tue Apr 14 15:32:07 2015 -0400
@@ -4106,8 +4106,9 @@
 [clinic start generated code]*/
 
 static int
-_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file, PyObject *protocol, int fix_imports)
-/*[clinic end generated code: output=56e229f3b1f4332f input=b8cdeb7e3f5ee674]*/
+_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
+                              PyObject *protocol, int fix_imports)
+/*[clinic end generated code: output=b5f31078dab17fb0 input=b8cdeb7e3f5ee674]*/
 {
     _Py_IDENTIFIER(persistent_id);
     _Py_IDENTIFIER(dispatch_table);
@@ -6302,8 +6303,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-_pickle_Unpickler_find_class_impl(UnpicklerObject *self, PyObject *module_name, PyObject *global_name)
-/*[clinic end generated code: output=64c77437e088e188 input=e2e6a865de093ef4]*/
+_pickle_Unpickler_find_class_impl(UnpicklerObject *self,
+                                  PyObject *module_name,
+                                  PyObject *global_name)
+/*[clinic end generated code: output=becc08d7f9ed41e3 input=e2e6a865de093ef4]*/
 {
     PyObject *global;
     PyObject *modules_dict;
@@ -6514,8 +6517,10 @@
 [clinic start generated code]*/
 
 static int
-_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file, int fix_imports, const char *encoding, const char *errors)
-/*[clinic end generated code: output=b9ed1d84d315f3b5 input=30b4dc9e976b890c]*/
+_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
+                                int fix_imports, const char *encoding,
+                                const char *errors)
+/*[clinic end generated code: output=e2c8ce748edc57b0 input=30b4dc9e976b890c]*/
 {
     _Py_IDENTIFIER(persistent_load);
 
@@ -6943,8 +6948,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file, PyObject *protocol, int fix_imports)
-/*[clinic end generated code: output=a606e626d553850d input=e9e5fdd48de92eae]*/
+_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file,
+                  PyObject *protocol, int fix_imports)
+/*[clinic end generated code: output=0de7dff89c406816 input=e9e5fdd48de92eae]*/
 {
     PicklerObject *pickler = _Pickler_New();
 
@@ -6996,8 +7002,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_pickle_dumps_impl(PyModuleDef *module, PyObject *obj, PyObject *protocol, int fix_imports)
-/*[clinic end generated code: output=777f0deefe5b88ee input=293dbeda181580b7]*/
+_pickle_dumps_impl(PyModuleDef *module, PyObject *obj, PyObject *protocol,
+                   int fix_imports)
+/*[clinic end generated code: output=daa380db56fe07b9 input=293dbeda181580b7]*/
 {
     PyObject *result;
     PicklerObject *pickler = _Pickler_New();
@@ -7056,8 +7063,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports, const char *encoding, const char *errors)
-/*[clinic end generated code: output=568c61356c172654 input=da97372e38e510a6]*/
+_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports,
+                  const char *encoding, const char *errors)
+/*[clinic end generated code: output=798f1c57cb2b4eb1 input=da97372e38e510a6]*/
 {
     PyObject *result;
     UnpicklerObject *unpickler = _Unpickler_New();
@@ -7109,8 +7117,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_pickle_loads_impl(PyModuleDef *module, PyObject *data, int fix_imports, const char *encoding, const char *errors)
-/*[clinic end generated code: output=0b3845ad110b2522 input=f57f0fdaa2b4cb8b]*/
+_pickle_loads_impl(PyModuleDef *module, PyObject *data, int fix_imports,
+                   const char *encoding, const char *errors)
+/*[clinic end generated code: output=61e9cdb01e36a736 input=f57f0fdaa2b4cb8b]*/
 {
     PyObject *result;
     UnpicklerObject *unpickler = _Unpickler_New();
diff -r a5a2b33993e3 Modules/arraymodule.c
--- a/Modules/arraymodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/arraymodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -1684,8 +1684,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-array_array_fromunicode_impl(arrayobject *self, Py_UNICODE *ustr, Py_ssize_clean_t ustr_length)
-/*[clinic end generated code: output=3b3f4f133bac725e input=56bcedb5ef70139f]*/
+array_array_fromunicode_impl(arrayobject *self, Py_UNICODE *ustr,
+                             Py_ssize_clean_t ustr_length)
+/*[clinic end generated code: output=ebb72fc16975e06d input=56bcedb5ef70139f]*/
 {
     char typecode;
 
@@ -1937,8 +1938,11 @@
 [clinic start generated code]*/
 
 static PyObject *
-array__array_reconstructor_impl(PyModuleDef *module, PyTypeObject *arraytype, int typecode, enum machine_format_code mformat_code, PyObject *items)
-/*[clinic end generated code: output=c51081ec91caf7e9 input=f72492708c0a1d50]*/
+array__array_reconstructor_impl(PyModuleDef *module, PyTypeObject *arraytype,
+                                int typecode,
+                                enum machine_format_code mformat_code,
+                                PyObject *items)
+/*[clinic end generated code: output=6ecbf0e8e4d92ab9 input=f72492708c0a1d50]*/
 {
     PyObject *converted_items;
     PyObject *result;
diff -r a5a2b33993e3 Modules/audioop.c
--- a/Modules/audioop.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/audioop.c	Tue Apr 14 15:32:07 2015 -0400
@@ -407,8 +407,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_getsample_impl(PyModuleDef *module, Py_buffer *fragment, int width, Py_ssize_t index)
-/*[clinic end generated code: output=f4482497e6f6e78f input=88edbe2871393549]*/
+audioop_getsample_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                       Py_ssize_t index)
+/*[clinic end generated code: output=3995e189fdc8ec16 input=88edbe2871393549]*/
 {
     int val;
 
@@ -593,8 +594,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_findfit_impl(PyModuleDef *module, Py_buffer *fragment, Py_buffer *reference)
-/*[clinic end generated code: output=505fd04d4244db31 input=62c305605e183c9a]*/
+audioop_findfit_impl(PyModuleDef *module, Py_buffer *fragment,
+                     Py_buffer *reference)
+/*[clinic end generated code: output=609eedf5d823d6dd input=62c305605e183c9a]*/
 {
     const short *cp1, *cp2;
     Py_ssize_t len1, len2;
@@ -661,8 +663,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_findfactor_impl(PyModuleDef *module, Py_buffer *fragment, Py_buffer *reference)
-/*[clinic end generated code: output=ddf35a1e57575ce4 input=816680301d012b21]*/
+audioop_findfactor_impl(PyModuleDef *module, Py_buffer *fragment,
+                        Py_buffer *reference)
+/*[clinic end generated code: output=5566a8c55de54f99 input=816680301d012b21]*/
 {
     const short *cp1, *cp2;
     Py_ssize_t len;
@@ -702,8 +705,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_findmax_impl(PyModuleDef *module, Py_buffer *fragment, Py_ssize_t length)
-/*[clinic end generated code: output=21d0c2a1e5655134 input=2f304801ed42383c]*/
+audioop_findmax_impl(PyModuleDef *module, Py_buffer *fragment,
+                     Py_ssize_t length)
+/*[clinic end generated code: output=01fe796fad2573bb input=2f304801ed42383c]*/
 {
     const short *cp1;
     Py_ssize_t len1;
@@ -896,8 +900,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_mul_impl(PyModuleDef *module, Py_buffer *fragment, int width, double factor)
-/*[clinic end generated code: output=a697ebbd5852d38f input=c726667baa157d3c]*/
+audioop_mul_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                 double factor)
+/*[clinic end generated code: output=1c7c31191ac86b10 input=c726667baa157d3c]*/
 {
     signed char *ncp;
     Py_ssize_t i;
@@ -937,8 +942,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_tomono_impl(PyModuleDef *module, Py_buffer *fragment, int width, double lfactor, double rfactor)
-/*[clinic end generated code: output=436e7710521661dd input=c4ec949b3f4dddfa]*/
+audioop_tomono_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                    double lfactor, double rfactor)
+/*[clinic end generated code: output=553f547c5e29e3b6 input=c4ec949b3f4dddfa]*/
 {
     signed char *cp, *ncp;
     Py_ssize_t len, i;
@@ -985,8 +991,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_tostereo_impl(PyModuleDef *module, Py_buffer *fragment, int width, double lfactor, double rfactor)
-/*[clinic end generated code: output=6ff50681c87f4c1c input=27b6395ebfdff37a]*/
+audioop_tostereo_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                      double lfactor, double rfactor)
+/*[clinic end generated code: output=697bb6ba41e9dd2c input=27b6395ebfdff37a]*/
 {
     signed char *ncp;
     Py_ssize_t i;
@@ -1032,8 +1039,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_add_impl(PyModuleDef *module, Py_buffer *fragment1, Py_buffer *fragment2, int width)
-/*[clinic end generated code: output=f9218bf9ea75c3f1 input=4a8d4bae4c1605c7]*/
+audioop_add_impl(PyModuleDef *module, Py_buffer *fragment1,
+                 Py_buffer *fragment2, int width)
+/*[clinic end generated code: output=fe6c12f143e0b027 input=4a8d4bae4c1605c7]*/
 {
     signed char *ncp;
     Py_ssize_t i;
@@ -1090,8 +1098,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_bias_impl(PyModuleDef *module, Py_buffer *fragment, int width, int bias)
-/*[clinic end generated code: output=8ec80b3f5d510a51 input=2b5cce5c3bb4838c]*/
+audioop_bias_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                  int bias)
+/*[clinic end generated code: output=ac1f4dda20a01c26 input=2b5cce5c3bb4838c]*/
 {
     signed char *ncp;
     Py_ssize_t i;
@@ -1217,8 +1226,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_lin2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width, int newwidth)
-/*[clinic end generated code: output=3f9468a74472a93e input=5ce08c8aa2f24d96]*/
+audioop_lin2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                     int newwidth)
+/*[clinic end generated code: output=cb6ca950d1df9898 input=5ce08c8aa2f24d96]*/
 {
     unsigned char *ncp;
     Py_ssize_t i, j;
@@ -1274,8 +1284,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_ratecv_impl(PyModuleDef *module, Py_buffer *fragment, int width, int nchannels, int inrate, int outrate, PyObject *state, int weightA, int weightB)
-/*[clinic end generated code: output=5585dddc4b5ff236 input=aff3acdc94476191]*/
+audioop_ratecv_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                    int nchannels, int inrate, int outrate, PyObject *state,
+                    int weightA, int weightB)
+/*[clinic end generated code: output=59e1787bfa49b9d9 input=aff3acdc94476191]*/
 {
     char *cp, *ncp;
     Py_ssize_t len;
@@ -1601,8 +1613,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_lin2adpcm_impl(PyModuleDef *module, Py_buffer *fragment, int width, PyObject *state)
-/*[clinic end generated code: output=4654c29d2731fafe input=12919d549b90c90a]*/
+audioop_lin2adpcm_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                       PyObject *state)
+/*[clinic end generated code: output=93f0996f592b5ce5 input=12919d549b90c90a]*/
 {
     signed char *ncp;
     Py_ssize_t i;
@@ -1723,8 +1736,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-audioop_adpcm2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width, PyObject *state)
-/*[clinic end generated code: output=371965cdcc0aa69b input=f5221144f5ca9ef0]*/
+audioop_adpcm2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                       PyObject *state)
+/*[clinic end generated code: output=236cf6dc2c829181 input=f5221144f5ca9ef0]*/
 {
     signed char *cp;
     signed char *ncp;
diff -r a5a2b33993e3 Modules/binascii.c
--- a/Modules/binascii.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/binascii.c	Tue Apr 14 15:32:07 2015 -0400
@@ -1381,8 +1381,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-binascii_b2a_qp_impl(PyModuleDef *module, Py_buffer *data, int quotetabs, int istext, int header)
-/*[clinic end generated code: output=ff2991ba640fff3e input=7f2a9aaa008e92b2]*/
+binascii_b2a_qp_impl(PyModuleDef *module, Py_buffer *data, int quotetabs,
+                     int istext, int header)
+/*[clinic end generated code: output=a87ca9ccb94e2a9f input=7f2a9aaa008e92b2]*/
 {
     Py_ssize_t in, out;
     unsigned char *databuf, *odata;
diff -r a5a2b33993e3 Modules/cjkcodecs/clinic/multibytecodec.c.h
--- a/Modules/cjkcodecs/clinic/multibytecodec.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -17,7 +17,9 @@
     {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteCodec_encode__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self, PyObject *input, const char *errors);
+_multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self,
+                                           PyObject *input,
+                                           const char *errors)
 
 static PyObject *
 _multibytecodec_MultibyteCodec_encode(MultibyteCodecObject *self, PyObject *args, PyObject *kwargs)
@@ -52,7 +54,9 @@
     {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteCodec_decode__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self, Py_buffer *input, const char *errors);
+_multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self,
+                                           Py_buffer *input,
+                                           const char *errors)
 
 static PyObject *
 _multibytecodec_MultibyteCodec_decode(MultibyteCodecObject *self, PyObject *args, PyObject *kwargs)
@@ -85,7 +89,9 @@
     {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self, PyObject *input, int final);
+_multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self,
+                                                        PyObject *input,
+                                                        int final)
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_encode(MultibyteIncrementalEncoderObject *self, PyObject *args, PyObject *kwargs)
@@ -131,7 +137,9 @@
     {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self, Py_buffer *input, int final);
+_multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self,
+                                                        Py_buffer *input,
+                                                        int final)
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_decode(MultibyteIncrementalDecoderObject *self, PyObject *args, PyObject *kwargs)
@@ -181,7 +189,8 @@
     {"read", (PyCFunction)_multibytecodec_MultibyteStreamReader_read, METH_VARARGS, _multibytecodec_MultibyteStreamReader_read__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_read_impl(MultibyteStreamReaderObject *self, PyObject *sizeobj);
+_multibytecodec_MultibyteStreamReader_read_impl(MultibyteStreamReaderObject *self,
+                                                PyObject *sizeobj)
 
 static PyObject *
 _multibytecodec_MultibyteStreamReader_read(MultibyteStreamReaderObject *self, PyObject *args)
@@ -208,7 +217,8 @@
     {"readline", (PyCFunction)_multibytecodec_MultibyteStreamReader_readline, METH_VARARGS, _multibytecodec_MultibyteStreamReader_readline__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_readline_impl(MultibyteStreamReaderObject *self, PyObject *sizeobj);
+_multibytecodec_MultibyteStreamReader_readline_impl(MultibyteStreamReaderObject *self,
+                                                    PyObject *sizeobj)
 
 static PyObject *
 _multibytecodec_MultibyteStreamReader_readline(MultibyteStreamReaderObject *self, PyObject *args)
@@ -235,7 +245,8 @@
     {"readlines", (PyCFunction)_multibytecodec_MultibyteStreamReader_readlines, METH_VARARGS, _multibytecodec_MultibyteStreamReader_readlines__doc__},
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_readlines_impl(MultibyteStreamReaderObject *self, PyObject *sizehintobj);
+_multibytecodec_MultibyteStreamReader_readlines_impl(MultibyteStreamReaderObject *self,
+                                                     PyObject *sizehintobj)
 
 static PyObject *
 _multibytecodec_MultibyteStreamReader_readlines(MultibyteStreamReaderObject *self, PyObject *args)
@@ -310,4 +321,4 @@
 
 #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF    \
     {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
-/*[clinic end generated code: output=0ea29cd57f7cbc1a input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bf2025f5b20568a9 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/cjkcodecs/multibytecodec.c
--- a/Modules/cjkcodecs/multibytecodec.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/cjkcodecs/multibytecodec.c	Tue Apr 14 15:32:07 2015 -0400
@@ -555,8 +555,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self, PyObject *input, const char *errors)
-/*[clinic end generated code: output=a36bfa08783a0d0b input=252e7ee695867b2d]*/
+_multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self,
+                                           PyObject *input,
+                                           const char *errors)
+/*[clinic end generated code: output=7b26652045ba56a9 input=252e7ee695867b2d]*/
 {
     MultibyteCodec_State state;
     PyObject *errorcb, *r, *ucvt;
@@ -622,8 +624,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self, Py_buffer *input, const char *errors)
-/*[clinic end generated code: output=4c8ee8b2931b014e input=37e1d9236e3ce8f3]*/
+_multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self,
+                                           Py_buffer *input,
+                                           const char *errors)
+/*[clinic end generated code: output=ff419f65bad6cc77 input=37e1d9236e3ce8f3]*/
 {
     MultibyteCodec_State state;
     MultibyteDecodeBuffer buf;
@@ -884,8 +888,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self, PyObject *input, int final)
-/*[clinic end generated code: output=3cd8780c8a719bbf input=456b76d73e464661]*/
+_multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self,
+                                                        PyObject *input,
+                                                        int final)
+/*[clinic end generated code: output=123361b6c505e2c1 input=456b76d73e464661]*/
 {
     return encoder_encode_stateful(STATEFUL_ECTX(self), input, final);
 }
@@ -1039,8 +1045,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self, Py_buffer *input, int final)
-/*[clinic end generated code: output=a0f3f92aa7303cf7 input=eb18c2f6e83589e1]*/
+_multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self,
+                                                        Py_buffer *input,
+                                                        int final)
+/*[clinic end generated code: output=b9b9090e8a9ce2ba input=eb18c2f6e83589e1]*/
 {
     MultibyteDecodeBuffer buf;
     char *data, *wdata = NULL;
@@ -1360,8 +1368,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_read_impl(MultibyteStreamReaderObject *self, PyObject *sizeobj)
-/*[clinic end generated code: output=f298ea6e1bd2083c input=015b0d3ff2fca485]*/
+_multibytecodec_MultibyteStreamReader_read_impl(MultibyteStreamReaderObject *self,
+                                                PyObject *sizeobj)
+/*[clinic end generated code: output=35621eb75355d5b8 input=015b0d3ff2fca485]*/
 {
     Py_ssize_t size;
 
@@ -1388,8 +1397,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_readline_impl(MultibyteStreamReaderObject *self, PyObject *sizeobj)
-/*[clinic end generated code: output=e5ac302a6d0999de input=41ccc64f9bb0cec3]*/
+_multibytecodec_MultibyteStreamReader_readline_impl(MultibyteStreamReaderObject *self,
+                                                    PyObject *sizeobj)
+/*[clinic end generated code: output=4fbfaae1ed457a11 input=41ccc64f9bb0cec3]*/
 {
     Py_ssize_t size;
 
@@ -1416,8 +1426,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteStreamReader_readlines_impl(MultibyteStreamReaderObject *self, PyObject *sizehintobj)
-/*[clinic end generated code: output=68f024178b77cb0f input=54932f5d4d88e880]*/
+_multibytecodec_MultibyteStreamReader_readlines_impl(MultibyteStreamReaderObject *self,
+                                                     PyObject *sizehintobj)
+/*[clinic end generated code: output=e7c4310768ed2ad4 input=54932f5d4d88e880]*/
 {
     PyObject *r, *sr;
     Py_ssize_t sizehint;
@@ -1618,8 +1629,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteStreamWriter_write(MultibyteStreamWriterObject *self, PyObject *strobj)
-/*[clinic end generated code: output=44e9eb0db0374cb1 input=551dc4c018c10a2b]*/
+_multibytecodec_MultibyteStreamWriter_write(MultibyteStreamWriterObject *self,
+                                            PyObject *strobj)
+/*[clinic end generated code: output=e13ae841c895251e input=551dc4c018c10a2b]*/
 {
     if (mbstreamwriter_iwrite(self, strobj))
         return NULL;
@@ -1635,8 +1647,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_multibytecodec_MultibyteStreamWriter_writelines(MultibyteStreamWriterObject *self, PyObject *lines)
-/*[clinic end generated code: output=4facbb0638dde172 input=57797fe7008d4e96]*/
+_multibytecodec_MultibyteStreamWriter_writelines(MultibyteStreamWriterObject *self,
+                                                 PyObject *lines)
+/*[clinic end generated code: output=e5c4285ac8e7d522 input=57797fe7008d4e96]*/
 {
     PyObject *strobj;
     int i, r;
diff -r a5a2b33993e3 Modules/clinic/_bz2module.c.h
--- a/Modules/clinic/_bz2module.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_bz2module.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -17,7 +17,7 @@
     {"compress", (PyCFunction)_bz2_BZ2Compressor_compress, METH_O, _bz2_BZ2Compressor_compress__doc__},
 
 static PyObject *
-_bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data);
+_bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data)
 
 static PyObject *
 _bz2_BZ2Compressor_compress(BZ2Compressor *self, PyObject *arg)
@@ -73,7 +73,7 @@
 "For one-shot compression, use the compress() function instead.");
 
 static int
-_bz2_BZ2Compressor___init___impl(BZ2Compressor *self, int compresslevel);
+_bz2_BZ2Compressor___init___impl(BZ2Compressor *self, int compresslevel)
 
 static int
 _bz2_BZ2Compressor___init__(PyObject *self, PyObject *args, PyObject *kwargs)
@@ -117,7 +117,8 @@
     {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_VARARGS|METH_KEYWORDS, _bz2_BZ2Decompressor_decompress__doc__},
 
 static PyObject *
-_bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data, Py_ssize_t max_length);
+_bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
+                                     Py_ssize_t max_length)
 
 static PyObject *
 _bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject *args, PyObject *kwargs)
@@ -168,4 +169,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3565d163a360af01 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=7f0ddfbecf6cc66b input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_codecsmodule.c.h
--- a/Modules/clinic/_codecsmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_codecsmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,7 @@
     {"_forget_codec", (PyCFunction)_codecs__forget_codec, METH_O, _codecs__forget_codec__doc__},
 
 static PyObject *
-_codecs__forget_codec_impl(PyModuleDef *module, const char *encoding);
+_codecs__forget_codec_impl(PyModuleDef *module, const char *encoding)
 
 static PyObject *
 _codecs__forget_codec(PyModuleDef *module, PyObject *arg)
@@ -29,4 +29,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=fc5ce4d3166f7d96 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=09b5441e4810d16f input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_cryptmodule.c.h
--- a/Modules/clinic/_cryptmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_cryptmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -17,7 +17,7 @@
     {"crypt", (PyCFunction)crypt_crypt, METH_VARARGS, crypt_crypt__doc__},
 
 static PyObject *
-crypt_crypt_impl(PyModuleDef *module, const char *word, const char *salt);
+crypt_crypt_impl(PyModuleDef *module, const char *word, const char *salt)
 
 static PyObject *
 crypt_crypt(PyModuleDef *module, PyObject *args)
@@ -35,4 +35,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b5b8d977189d19ea input=a9049054013a1b77]*/
+/*[clinic end generated code: output=78fb7499fe7d7203 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_cursesmodule.c.h
--- a/Modules/clinic/_cursesmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_cursesmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -24,7 +24,8 @@
     {"addch", (PyCFunction)curses_window_addch, METH_VARARGS, curses_window_addch__doc__},
 
 static PyObject *
-curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1, int y, int x, PyObject *ch, int group_right_1, long attr);
+curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1, int y,
+                         int x, PyObject *ch, int group_right_1, long attr)
 
 static PyObject *
 curses_window_addch(PyCursesWindowObject *self, PyObject *args)
@@ -67,4 +68,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=660ab0ae6d8fbdda input=a9049054013a1b77]*/
+/*[clinic end generated code: output=65d04d22db6ac6b5 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_datetimemodule.c.h
--- a/Modules/clinic/_datetimemodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_datetimemodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -17,7 +17,7 @@
     {"now", (PyCFunction)datetime_datetime_now, METH_VARARGS|METH_KEYWORDS|METH_CLASS, datetime_datetime_now__doc__},
 
 static PyObject *
-datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz);
+datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz)
 
 static PyObject *
 datetime_datetime_now(PyTypeObject *type, PyObject *args, PyObject *kwargs)
@@ -35,4 +35,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=a5c51b96f10c462c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=12c41f080b2970a6 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_dbmmodule.c.h
--- a/Modules/clinic/_dbmmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_dbmmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,8 @@
     {"get", (PyCFunction)dbm_dbm_get, METH_VARARGS, dbm_dbm_get__doc__},
 
 static PyObject *
-dbm_dbm_get_impl(dbmobject *dp, const char *key, Py_ssize_clean_t key_length, PyObject *default_value);
+dbm_dbm_get_impl(dbmobject *dp, const char *key, Py_ssize_clean_t key_length,
+                 PyObject *default_value)
 
 static PyObject *
 dbm_dbm_get(dbmobject *dp, PyObject *args)
@@ -50,7 +51,8 @@
     {"open", (PyCFunction)dbmopen, METH_VARARGS, dbmopen__doc__},
 
 static PyObject *
-dbmopen_impl(PyModuleDef *module, const char *filename, const char *flags, int mode);
+dbmopen_impl(PyModuleDef *module, const char *filename, const char *flags,
+             int mode)
 
 static PyObject *
 dbmopen(PyModuleDef *module, PyObject *args)
@@ -69,4 +71,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=78d62d1aa3ddd13c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=cfb653a3674bdeb7 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_lzmamodule.c.h
--- a/Modules/clinic/_lzmamodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_lzmamodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -17,7 +17,7 @@
     {"compress", (PyCFunction)_lzma_LZMACompressor_compress, METH_O, _lzma_LZMACompressor_compress__doc__},
 
 static PyObject *
-_lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data);
+_lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data)
 
 static PyObject *
 _lzma_LZMACompressor_compress(Compressor *self, PyObject *arg)
@@ -84,7 +84,8 @@
     {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_VARARGS|METH_KEYWORDS, _lzma_LZMADecompressor_decompress__doc__},
 
 static PyObject *
-_lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data, Py_ssize_t max_length);
+_lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data,
+                                       Py_ssize_t max_length)
 
 static PyObject *
 _lzma_LZMADecompressor_decompress(Decompressor *self, PyObject *args, PyObject *kwargs)
@@ -132,7 +133,8 @@
 "For one-shot decompression, use the decompress() function instead.");
 
 static int
-_lzma_LZMADecompressor___init___impl(Decompressor *self, int format, PyObject *memlimit, PyObject *filters);
+_lzma_LZMADecompressor___init___impl(Decompressor *self, int format,
+                                     PyObject *memlimit, PyObject *filters)
 
 static int
 _lzma_LZMADecompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs)
@@ -165,7 +167,7 @@
     {"is_check_supported", (PyCFunction)_lzma_is_check_supported, METH_O, _lzma_is_check_supported__doc__},
 
 static PyObject *
-_lzma_is_check_supported_impl(PyModuleDef *module, int check_id);
+_lzma_is_check_supported_impl(PyModuleDef *module, int check_id)
 
 static PyObject *
 _lzma_is_check_supported(PyModuleDef *module, PyObject *arg)
@@ -195,7 +197,7 @@
     {"_encode_filter_properties", (PyCFunction)_lzma__encode_filter_properties, METH_O, _lzma__encode_filter_properties__doc__},
 
 static PyObject *
-_lzma__encode_filter_properties_impl(PyModuleDef *module, lzma_filter filter);
+_lzma__encode_filter_properties_impl(PyModuleDef *module, lzma_filter filter)
 
 static PyObject *
 _lzma__encode_filter_properties(PyModuleDef *module, PyObject *arg)
@@ -229,7 +231,8 @@
     {"_decode_filter_properties", (PyCFunction)_lzma__decode_filter_properties, METH_VARARGS, _lzma__decode_filter_properties__doc__},
 
 static PyObject *
-_lzma__decode_filter_properties_impl(PyModuleDef *module, lzma_vli filter_id, Py_buffer *encoded_props);
+_lzma__decode_filter_properties_impl(PyModuleDef *module, lzma_vli filter_id,
+                                     Py_buffer *encoded_props)
 
 static PyObject *
 _lzma__decode_filter_properties(PyModuleDef *module, PyObject *args)
@@ -251,4 +254,4 @@
 
     return return_value;
 }
-/*[clinic end generated code: output=ea7f2b2c4019fe86 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5e4e276472deee54 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_opcode.c.h
--- a/Modules/clinic/_opcode.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_opcode.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,7 @@
     {"stack_effect", (PyCFunction)_opcode_stack_effect, METH_VARARGS, _opcode_stack_effect__doc__},
 
 static int
-_opcode_stack_effect_impl(PyModuleDef *module, int opcode, PyObject *oparg);
+_opcode_stack_effect_impl(PyModuleDef *module, int opcode, PyObject *oparg)
 
 static PyObject *
 _opcode_stack_effect(PyModuleDef *module, PyObject *args)
@@ -34,4 +34,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=dbe45148bc21ecdf input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b2b0d01379e07b95 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_pickle.c.h
--- a/Modules/clinic/_pickle.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_pickle.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -85,7 +85,8 @@
 "2, so that the pickle data stream is readable with Python 2.");
 
 static int
-_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file, PyObject *protocol, int fix_imports);
+_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
+                              PyObject *protocol, int fix_imports)
 
 static int
 _pickle_Pickler___init__(PyObject *self, PyObject *args, PyObject *kwargs)
@@ -199,7 +200,9 @@
     {"find_class", (PyCFunction)_pickle_Unpickler_find_class, METH_VARARGS, _pickle_Unpickler_find_class__doc__},
 
 static PyObject *
-_pickle_Unpickler_find_class_impl(UnpicklerObject *self, PyObject *module_name, PyObject *global_name);
+_pickle_Unpickler_find_class_impl(UnpicklerObject *self,
+                                  PyObject *module_name,
+                                  PyObject *global_name)
 
 static PyObject *
 _pickle_Unpickler_find_class(UnpicklerObject *self, PyObject *args)
@@ -271,7 +274,9 @@
 "string instances as bytes objects.");
 
 static int
-_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file, int fix_imports, const char *encoding, const char *errors);
+_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
+                                int fix_imports, const char *encoding,
+                                const char *errors)
 
 static int
 _pickle_Unpickler___init__(PyObject *self, PyObject *args, PyObject *kwargs)
@@ -377,7 +382,8 @@
     {"dump", (PyCFunction)_pickle_dump, METH_VARARGS|METH_KEYWORDS, _pickle_dump__doc__},
 
 static PyObject *
-_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file, PyObject *protocol, int fix_imports);
+_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file,
+                  PyObject *protocol, int fix_imports)
 
 static PyObject *
 _pickle_dump(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -421,7 +427,8 @@
     {"dumps", (PyCFunction)_pickle_dumps, METH_VARARGS|METH_KEYWORDS, _pickle_dumps__doc__},
 
 static PyObject *
-_pickle_dumps_impl(PyModuleDef *module, PyObject *obj, PyObject *protocol, int fix_imports);
+_pickle_dumps_impl(PyModuleDef *module, PyObject *obj, PyObject *protocol,
+                   int fix_imports)
 
 static PyObject *
 _pickle_dumps(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -475,7 +482,8 @@
     {"load", (PyCFunction)_pickle_load, METH_VARARGS|METH_KEYWORDS, _pickle_load__doc__},
 
 static PyObject *
-_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports, const char *encoding, const char *errors);
+_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports,
+                  const char *encoding, const char *errors)
 
 static PyObject *
 _pickle_load(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -521,7 +529,8 @@
     {"loads", (PyCFunction)_pickle_loads, METH_VARARGS|METH_KEYWORDS, _pickle_loads__doc__},
 
 static PyObject *
-_pickle_loads_impl(PyModuleDef *module, PyObject *data, int fix_imports, const char *encoding, const char *errors);
+_pickle_loads_impl(PyModuleDef *module, PyObject *data, int fix_imports,
+                   const char *encoding, const char *errors)
 
 static PyObject *
 _pickle_loads(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -542,4 +551,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=3aba79576e240c62 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=94ba9a9106bf5df7 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/_weakref.c.h
--- a/Modules/clinic/_weakref.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/_weakref.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,7 @@
     {"getweakrefcount", (PyCFunction)_weakref_getweakrefcount, METH_O, _weakref_getweakrefcount__doc__},
 
 static Py_ssize_t
-_weakref_getweakrefcount_impl(PyModuleDef *module, PyObject *object);
+_weakref_getweakrefcount_impl(PyModuleDef *module, PyObject *object)
 
 static PyObject *
 _weakref_getweakrefcount(PyModuleDef *module, PyObject *object)
@@ -28,4 +28,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=4da9aade63eed77f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=38ccde883113a6bf input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/arraymodule.c.h
--- a/Modules/clinic/arraymodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/arraymodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -68,7 +68,7 @@
     {"pop", (PyCFunction)array_array_pop, METH_VARARGS, array_array_pop__doc__},
 
 static PyObject *
-array_array_pop_impl(arrayobject *self, Py_ssize_t i);
+array_array_pop_impl(arrayobject *self, Py_ssize_t i)
 
 static PyObject *
 array_array_pop(arrayobject *self, PyObject *args)
@@ -105,7 +105,7 @@
     {"insert", (PyCFunction)array_array_insert, METH_VARARGS, array_array_insert__doc__},
 
 static PyObject *
-array_array_insert_impl(arrayobject *self, Py_ssize_t i, PyObject *v);
+array_array_insert_impl(arrayobject *self, Py_ssize_t i, PyObject *v)
 
 static PyObject *
 array_array_insert(arrayobject *self, PyObject *args)
@@ -203,7 +203,7 @@
     {"fromfile", (PyCFunction)array_array_fromfile, METH_VARARGS, array_array_fromfile__doc__},
 
 static PyObject *
-array_array_fromfile_impl(arrayobject *self, PyObject *f, Py_ssize_t n);
+array_array_fromfile_impl(arrayobject *self, PyObject *f, Py_ssize_t n)
 
 static PyObject *
 array_array_fromfile(arrayobject *self, PyObject *args)
@@ -270,7 +270,7 @@
     {"fromstring", (PyCFunction)array_array_fromstring, METH_O, array_array_fromstring__doc__},
 
 static PyObject *
-array_array_fromstring_impl(arrayobject *self, Py_buffer *buffer);
+array_array_fromstring_impl(arrayobject *self, Py_buffer *buffer)
 
 static PyObject *
 array_array_fromstring(arrayobject *self, PyObject *arg)
@@ -302,7 +302,7 @@
     {"frombytes", (PyCFunction)array_array_frombytes, METH_O, array_array_frombytes__doc__},
 
 static PyObject *
-array_array_frombytes_impl(arrayobject *self, Py_buffer *buffer);
+array_array_frombytes_impl(arrayobject *self, Py_buffer *buffer)
 
 static PyObject *
 array_array_frombytes(arrayobject *self, PyObject *arg)
@@ -376,7 +376,8 @@
     {"fromunicode", (PyCFunction)array_array_fromunicode, METH_O, array_array_fromunicode__doc__},
 
 static PyObject *
-array_array_fromunicode_impl(arrayobject *self, Py_UNICODE *ustr, Py_ssize_clean_t ustr_length);
+array_array_fromunicode_impl(arrayobject *self, Py_UNICODE *ustr,
+                             Py_ssize_clean_t ustr_length)
 
 static PyObject *
 array_array_fromunicode(arrayobject *self, PyObject *arg)
@@ -446,7 +447,10 @@
     {"_array_reconstructor", (PyCFunction)array__array_reconstructor, METH_VARARGS, array__array_reconstructor__doc__},
 
 static PyObject *
-array__array_reconstructor_impl(PyModuleDef *module, PyTypeObject *arraytype, int typecode, enum machine_format_code mformat_code, PyObject *items);
+array__array_reconstructor_impl(PyModuleDef *module, PyTypeObject *arraytype,
+                                int typecode,
+                                enum machine_format_code mformat_code,
+                                PyObject *items)
 
 static PyObject *
 array__array_reconstructor(PyModuleDef *module, PyObject *args)
@@ -502,4 +506,4 @@
 
 #define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF    \
     {"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__},
-/*[clinic end generated code: output=a8fbe83c2026fa83 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b486a6f8113552bb input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/audioop.c.h
--- a/Modules/clinic/audioop.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/audioop.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,8 @@
     {"getsample", (PyCFunction)audioop_getsample, METH_VARARGS, audioop_getsample__doc__},
 
 static PyObject *
-audioop_getsample_impl(PyModuleDef *module, Py_buffer *fragment, int width, Py_ssize_t index);
+audioop_getsample_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                       Py_ssize_t index)
 
 static PyObject *
 audioop_getsample(PyModuleDef *module, PyObject *args)
@@ -46,7 +47,7 @@
     {"max", (PyCFunction)audioop_max, METH_VARARGS, audioop_max__doc__},
 
 static PyObject *
-audioop_max_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_max_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_max(PyModuleDef *module, PyObject *args)
@@ -79,7 +80,7 @@
     {"minmax", (PyCFunction)audioop_minmax, METH_VARARGS, audioop_minmax__doc__},
 
 static PyObject *
-audioop_minmax_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_minmax_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_minmax(PyModuleDef *module, PyObject *args)
@@ -112,7 +113,7 @@
     {"avg", (PyCFunction)audioop_avg, METH_VARARGS, audioop_avg__doc__},
 
 static PyObject *
-audioop_avg_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_avg_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_avg(PyModuleDef *module, PyObject *args)
@@ -145,7 +146,7 @@
     {"rms", (PyCFunction)audioop_rms, METH_VARARGS, audioop_rms__doc__},
 
 static PyObject *
-audioop_rms_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_rms_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_rms(PyModuleDef *module, PyObject *args)
@@ -178,7 +179,8 @@
     {"findfit", (PyCFunction)audioop_findfit, METH_VARARGS, audioop_findfit__doc__},
 
 static PyObject *
-audioop_findfit_impl(PyModuleDef *module, Py_buffer *fragment, Py_buffer *reference);
+audioop_findfit_impl(PyModuleDef *module, Py_buffer *fragment,
+                     Py_buffer *reference)
 
 static PyObject *
 audioop_findfit(PyModuleDef *module, PyObject *args)
@@ -214,7 +216,8 @@
     {"findfactor", (PyCFunction)audioop_findfactor, METH_VARARGS, audioop_findfactor__doc__},
 
 static PyObject *
-audioop_findfactor_impl(PyModuleDef *module, Py_buffer *fragment, Py_buffer *reference);
+audioop_findfactor_impl(PyModuleDef *module, Py_buffer *fragment,
+                        Py_buffer *reference)
 
 static PyObject *
 audioop_findfactor(PyModuleDef *module, PyObject *args)
@@ -250,7 +253,8 @@
     {"findmax", (PyCFunction)audioop_findmax, METH_VARARGS, audioop_findmax__doc__},
 
 static PyObject *
-audioop_findmax_impl(PyModuleDef *module, Py_buffer *fragment, Py_ssize_t length);
+audioop_findmax_impl(PyModuleDef *module, Py_buffer *fragment,
+                     Py_ssize_t length)
 
 static PyObject *
 audioop_findmax(PyModuleDef *module, PyObject *args)
@@ -283,7 +287,7 @@
     {"avgpp", (PyCFunction)audioop_avgpp, METH_VARARGS, audioop_avgpp__doc__},
 
 static PyObject *
-audioop_avgpp_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_avgpp_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_avgpp(PyModuleDef *module, PyObject *args)
@@ -316,7 +320,7 @@
     {"maxpp", (PyCFunction)audioop_maxpp, METH_VARARGS, audioop_maxpp__doc__},
 
 static PyObject *
-audioop_maxpp_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_maxpp_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_maxpp(PyModuleDef *module, PyObject *args)
@@ -349,7 +353,7 @@
     {"cross", (PyCFunction)audioop_cross, METH_VARARGS, audioop_cross__doc__},
 
 static PyObject *
-audioop_cross_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_cross_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_cross(PyModuleDef *module, PyObject *args)
@@ -382,7 +386,8 @@
     {"mul", (PyCFunction)audioop_mul, METH_VARARGS, audioop_mul__doc__},
 
 static PyObject *
-audioop_mul_impl(PyModuleDef *module, Py_buffer *fragment, int width, double factor);
+audioop_mul_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                 double factor)
 
 static PyObject *
 audioop_mul(PyModuleDef *module, PyObject *args)
@@ -416,7 +421,8 @@
     {"tomono", (PyCFunction)audioop_tomono, METH_VARARGS, audioop_tomono__doc__},
 
 static PyObject *
-audioop_tomono_impl(PyModuleDef *module, Py_buffer *fragment, int width, double lfactor, double rfactor);
+audioop_tomono_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                    double lfactor, double rfactor)
 
 static PyObject *
 audioop_tomono(PyModuleDef *module, PyObject *args)
@@ -451,7 +457,8 @@
     {"tostereo", (PyCFunction)audioop_tostereo, METH_VARARGS, audioop_tostereo__doc__},
 
 static PyObject *
-audioop_tostereo_impl(PyModuleDef *module, Py_buffer *fragment, int width, double lfactor, double rfactor);
+audioop_tostereo_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                      double lfactor, double rfactor)
 
 static PyObject *
 audioop_tostereo(PyModuleDef *module, PyObject *args)
@@ -486,7 +493,8 @@
     {"add", (PyCFunction)audioop_add, METH_VARARGS, audioop_add__doc__},
 
 static PyObject *
-audioop_add_impl(PyModuleDef *module, Py_buffer *fragment1, Py_buffer *fragment2, int width);
+audioop_add_impl(PyModuleDef *module, Py_buffer *fragment1,
+                 Py_buffer *fragment2, int width)
 
 static PyObject *
 audioop_add(PyModuleDef *module, PyObject *args)
@@ -523,7 +531,8 @@
     {"bias", (PyCFunction)audioop_bias, METH_VARARGS, audioop_bias__doc__},
 
 static PyObject *
-audioop_bias_impl(PyModuleDef *module, Py_buffer *fragment, int width, int bias);
+audioop_bias_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                  int bias)
 
 static PyObject *
 audioop_bias(PyModuleDef *module, PyObject *args)
@@ -557,7 +566,7 @@
     {"reverse", (PyCFunction)audioop_reverse, METH_VARARGS, audioop_reverse__doc__},
 
 static PyObject *
-audioop_reverse_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_reverse_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_reverse(PyModuleDef *module, PyObject *args)
@@ -590,7 +599,7 @@
     {"byteswap", (PyCFunction)audioop_byteswap, METH_VARARGS, audioop_byteswap__doc__},
 
 static PyObject *
-audioop_byteswap_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_byteswap_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_byteswap(PyModuleDef *module, PyObject *args)
@@ -623,7 +632,8 @@
     {"lin2lin", (PyCFunction)audioop_lin2lin, METH_VARARGS, audioop_lin2lin__doc__},
 
 static PyObject *
-audioop_lin2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width, int newwidth);
+audioop_lin2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                     int newwidth)
 
 static PyObject *
 audioop_lin2lin(PyModuleDef *module, PyObject *args)
@@ -658,7 +668,9 @@
     {"ratecv", (PyCFunction)audioop_ratecv, METH_VARARGS, audioop_ratecv__doc__},
 
 static PyObject *
-audioop_ratecv_impl(PyModuleDef *module, Py_buffer *fragment, int width, int nchannels, int inrate, int outrate, PyObject *state, int weightA, int weightB);
+audioop_ratecv_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                    int nchannels, int inrate, int outrate, PyObject *state,
+                    int weightA, int weightB)
 
 static PyObject *
 audioop_ratecv(PyModuleDef *module, PyObject *args)
@@ -697,7 +709,7 @@
     {"lin2ulaw", (PyCFunction)audioop_lin2ulaw, METH_VARARGS, audioop_lin2ulaw__doc__},
 
 static PyObject *
-audioop_lin2ulaw_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_lin2ulaw_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_lin2ulaw(PyModuleDef *module, PyObject *args)
@@ -730,7 +742,7 @@
     {"ulaw2lin", (PyCFunction)audioop_ulaw2lin, METH_VARARGS, audioop_ulaw2lin__doc__},
 
 static PyObject *
-audioop_ulaw2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_ulaw2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_ulaw2lin(PyModuleDef *module, PyObject *args)
@@ -763,7 +775,7 @@
     {"lin2alaw", (PyCFunction)audioop_lin2alaw, METH_VARARGS, audioop_lin2alaw__doc__},
 
 static PyObject *
-audioop_lin2alaw_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_lin2alaw_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_lin2alaw(PyModuleDef *module, PyObject *args)
@@ -796,7 +808,7 @@
     {"alaw2lin", (PyCFunction)audioop_alaw2lin, METH_VARARGS, audioop_alaw2lin__doc__},
 
 static PyObject *
-audioop_alaw2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width);
+audioop_alaw2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width)
 
 static PyObject *
 audioop_alaw2lin(PyModuleDef *module, PyObject *args)
@@ -829,7 +841,8 @@
     {"lin2adpcm", (PyCFunction)audioop_lin2adpcm, METH_VARARGS, audioop_lin2adpcm__doc__},
 
 static PyObject *
-audioop_lin2adpcm_impl(PyModuleDef *module, Py_buffer *fragment, int width, PyObject *state);
+audioop_lin2adpcm_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                       PyObject *state)
 
 static PyObject *
 audioop_lin2adpcm(PyModuleDef *module, PyObject *args)
@@ -863,7 +876,8 @@
     {"adpcm2lin", (PyCFunction)audioop_adpcm2lin, METH_VARARGS, audioop_adpcm2lin__doc__},
 
 static PyObject *
-audioop_adpcm2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width, PyObject *state);
+audioop_adpcm2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width,
+                       PyObject *state)
 
 static PyObject *
 audioop_adpcm2lin(PyModuleDef *module, PyObject *args)
@@ -886,4 +900,4 @@
 
     return return_value;
 }
-/*[clinic end generated code: output=be840bba5d40c2ce input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bfd5642ef94ffd74 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/binascii.c.h
--- a/Modules/clinic/binascii.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/binascii.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,7 @@
     {"a2b_uu", (PyCFunction)binascii_a2b_uu, METH_O, binascii_a2b_uu__doc__},
 
 static PyObject *
-binascii_a2b_uu_impl(PyModuleDef *module, Py_buffer *data);
+binascii_a2b_uu_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_a2b_uu(PyModuleDef *module, PyObject *arg)
@@ -44,7 +44,7 @@
     {"b2a_uu", (PyCFunction)binascii_b2a_uu, METH_O, binascii_b2a_uu__doc__},
 
 static PyObject *
-binascii_b2a_uu_impl(PyModuleDef *module, Py_buffer *data);
+binascii_b2a_uu_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_b2a_uu(PyModuleDef *module, PyObject *arg)
@@ -76,7 +76,7 @@
     {"a2b_base64", (PyCFunction)binascii_a2b_base64, METH_O, binascii_a2b_base64__doc__},
 
 static PyObject *
-binascii_a2b_base64_impl(PyModuleDef *module, Py_buffer *data);
+binascii_a2b_base64_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_a2b_base64(PyModuleDef *module, PyObject *arg)
@@ -108,7 +108,7 @@
     {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_O, binascii_b2a_base64__doc__},
 
 static PyObject *
-binascii_b2a_base64_impl(PyModuleDef *module, Py_buffer *data);
+binascii_b2a_base64_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_b2a_base64(PyModuleDef *module, PyObject *arg)
@@ -140,7 +140,7 @@
     {"a2b_hqx", (PyCFunction)binascii_a2b_hqx, METH_O, binascii_a2b_hqx__doc__},
 
 static PyObject *
-binascii_a2b_hqx_impl(PyModuleDef *module, Py_buffer *data);
+binascii_a2b_hqx_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_a2b_hqx(PyModuleDef *module, PyObject *arg)
@@ -172,7 +172,7 @@
     {"rlecode_hqx", (PyCFunction)binascii_rlecode_hqx, METH_O, binascii_rlecode_hqx__doc__},
 
 static PyObject *
-binascii_rlecode_hqx_impl(PyModuleDef *module, Py_buffer *data);
+binascii_rlecode_hqx_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_rlecode_hqx(PyModuleDef *module, PyObject *arg)
@@ -204,7 +204,7 @@
     {"b2a_hqx", (PyCFunction)binascii_b2a_hqx, METH_O, binascii_b2a_hqx__doc__},
 
 static PyObject *
-binascii_b2a_hqx_impl(PyModuleDef *module, Py_buffer *data);
+binascii_b2a_hqx_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_b2a_hqx(PyModuleDef *module, PyObject *arg)
@@ -236,7 +236,7 @@
     {"rledecode_hqx", (PyCFunction)binascii_rledecode_hqx, METH_O, binascii_rledecode_hqx__doc__},
 
 static PyObject *
-binascii_rledecode_hqx_impl(PyModuleDef *module, Py_buffer *data);
+binascii_rledecode_hqx_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_rledecode_hqx(PyModuleDef *module, PyObject *arg)
@@ -268,7 +268,7 @@
     {"crc_hqx", (PyCFunction)binascii_crc_hqx, METH_VARARGS, binascii_crc_hqx__doc__},
 
 static int
-binascii_crc_hqx_impl(PyModuleDef *module, Py_buffer *data, int crc);
+binascii_crc_hqx_impl(PyModuleDef *module, Py_buffer *data, int crc)
 
 static PyObject *
 binascii_crc_hqx(PyModuleDef *module, PyObject *args)
@@ -305,7 +305,7 @@
     {"crc32", (PyCFunction)binascii_crc32, METH_VARARGS, binascii_crc32__doc__},
 
 static unsigned int
-binascii_crc32_impl(PyModuleDef *module, Py_buffer *data, unsigned int crc);
+binascii_crc32_impl(PyModuleDef *module, Py_buffer *data, unsigned int crc)
 
 static PyObject *
 binascii_crc32(PyModuleDef *module, PyObject *args)
@@ -345,7 +345,7 @@
     {"b2a_hex", (PyCFunction)binascii_b2a_hex, METH_O, binascii_b2a_hex__doc__},
 
 static PyObject *
-binascii_b2a_hex_impl(PyModuleDef *module, Py_buffer *data);
+binascii_b2a_hex_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_b2a_hex(PyModuleDef *module, PyObject *arg)
@@ -379,7 +379,7 @@
     {"hexlify", (PyCFunction)binascii_hexlify, METH_O, binascii_hexlify__doc__},
 
 static PyObject *
-binascii_hexlify_impl(PyModuleDef *module, Py_buffer *data);
+binascii_hexlify_impl(PyModuleDef *module, Py_buffer *data)
 
 static PyObject *
 binascii_hexlify(PyModuleDef *module, PyObject *arg)
@@ -414,7 +414,7 @@
     {"a2b_hex", (PyCFunction)binascii_a2b_hex, METH_O, binascii_a2b_hex__doc__},
 
 static PyObject *
-binascii_a2b_hex_impl(PyModuleDef *module, Py_buffer *hexstr);
+binascii_a2b_hex_impl(PyModuleDef *module, Py_buffer *hexstr)
 
 static PyObject *
 binascii_a2b_hex(PyModuleDef *module, PyObject *arg)
@@ -448,7 +448,7 @@
     {"unhexlify", (PyCFunction)binascii_unhexlify, METH_O, binascii_unhexlify__doc__},
 
 static PyObject *
-binascii_unhexlify_impl(PyModuleDef *module, Py_buffer *hexstr);
+binascii_unhexlify_impl(PyModuleDef *module, Py_buffer *hexstr)
 
 static PyObject *
 binascii_unhexlify(PyModuleDef *module, PyObject *arg)
@@ -480,7 +480,7 @@
     {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_VARARGS|METH_KEYWORDS, binascii_a2b_qp__doc__},
 
 static PyObject *
-binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *data, int header);
+binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *data, int header)
 
 static PyObject *
 binascii_a2b_qp(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -518,7 +518,8 @@
     {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_VARARGS|METH_KEYWORDS, binascii_b2a_qp__doc__},
 
 static PyObject *
-binascii_b2a_qp_impl(PyModuleDef *module, Py_buffer *data, int quotetabs, int istext, int header);
+binascii_b2a_qp_impl(PyModuleDef *module, Py_buffer *data, int quotetabs,
+                     int istext, int header)
 
 static PyObject *
 binascii_b2a_qp(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -543,4 +544,4 @@
 
     return return_value;
 }
-/*[clinic end generated code: output=31ccbd5fddc8fd75 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f8421a0be4fe86ab input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/cmathmodule.c.h
--- a/Modules/clinic/cmathmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/cmathmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,7 @@
     {"acos", (PyCFunction)cmath_acos, METH_O, cmath_acos__doc__},
 
 static Py_complex
-cmath_acos_impl(PyModuleDef *module, Py_complex z);
+cmath_acos_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_acos(PyModuleDef *module, PyObject *arg)
@@ -55,7 +55,7 @@
     {"acosh", (PyCFunction)cmath_acosh, METH_O, cmath_acosh__doc__},
 
 static Py_complex
-cmath_acosh_impl(PyModuleDef *module, Py_complex z);
+cmath_acosh_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_acosh(PyModuleDef *module, PyObject *arg)
@@ -98,7 +98,7 @@
     {"asin", (PyCFunction)cmath_asin, METH_O, cmath_asin__doc__},
 
 static Py_complex
-cmath_asin_impl(PyModuleDef *module, Py_complex z);
+cmath_asin_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_asin(PyModuleDef *module, PyObject *arg)
@@ -141,7 +141,7 @@
     {"asinh", (PyCFunction)cmath_asinh, METH_O, cmath_asinh__doc__},
 
 static Py_complex
-cmath_asinh_impl(PyModuleDef *module, Py_complex z);
+cmath_asinh_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_asinh(PyModuleDef *module, PyObject *arg)
@@ -184,7 +184,7 @@
     {"atan", (PyCFunction)cmath_atan, METH_O, cmath_atan__doc__},
 
 static Py_complex
-cmath_atan_impl(PyModuleDef *module, Py_complex z);
+cmath_atan_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_atan(PyModuleDef *module, PyObject *arg)
@@ -227,7 +227,7 @@
     {"atanh", (PyCFunction)cmath_atanh, METH_O, cmath_atanh__doc__},
 
 static Py_complex
-cmath_atanh_impl(PyModuleDef *module, Py_complex z);
+cmath_atanh_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_atanh(PyModuleDef *module, PyObject *arg)
@@ -270,7 +270,7 @@
     {"cos", (PyCFunction)cmath_cos, METH_O, cmath_cos__doc__},
 
 static Py_complex
-cmath_cos_impl(PyModuleDef *module, Py_complex z);
+cmath_cos_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_cos(PyModuleDef *module, PyObject *arg)
@@ -313,7 +313,7 @@
     {"cosh", (PyCFunction)cmath_cosh, METH_O, cmath_cosh__doc__},
 
 static Py_complex
-cmath_cosh_impl(PyModuleDef *module, Py_complex z);
+cmath_cosh_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_cosh(PyModuleDef *module, PyObject *arg)
@@ -356,7 +356,7 @@
     {"exp", (PyCFunction)cmath_exp, METH_O, cmath_exp__doc__},
 
 static Py_complex
-cmath_exp_impl(PyModuleDef *module, Py_complex z);
+cmath_exp_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_exp(PyModuleDef *module, PyObject *arg)
@@ -399,7 +399,7 @@
     {"log10", (PyCFunction)cmath_log10, METH_O, cmath_log10__doc__},
 
 static Py_complex
-cmath_log10_impl(PyModuleDef *module, Py_complex z);
+cmath_log10_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_log10(PyModuleDef *module, PyObject *arg)
@@ -442,7 +442,7 @@
     {"sin", (PyCFunction)cmath_sin, METH_O, cmath_sin__doc__},
 
 static Py_complex
-cmath_sin_impl(PyModuleDef *module, Py_complex z);
+cmath_sin_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_sin(PyModuleDef *module, PyObject *arg)
@@ -485,7 +485,7 @@
     {"sinh", (PyCFunction)cmath_sinh, METH_O, cmath_sinh__doc__},
 
 static Py_complex
-cmath_sinh_impl(PyModuleDef *module, Py_complex z);
+cmath_sinh_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_sinh(PyModuleDef *module, PyObject *arg)
@@ -528,7 +528,7 @@
     {"sqrt", (PyCFunction)cmath_sqrt, METH_O, cmath_sqrt__doc__},
 
 static Py_complex
-cmath_sqrt_impl(PyModuleDef *module, Py_complex z);
+cmath_sqrt_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_sqrt(PyModuleDef *module, PyObject *arg)
@@ -571,7 +571,7 @@
     {"tan", (PyCFunction)cmath_tan, METH_O, cmath_tan__doc__},
 
 static Py_complex
-cmath_tan_impl(PyModuleDef *module, Py_complex z);
+cmath_tan_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_tan(PyModuleDef *module, PyObject *arg)
@@ -614,7 +614,7 @@
     {"tanh", (PyCFunction)cmath_tanh, METH_O, cmath_tanh__doc__},
 
 static Py_complex
-cmath_tanh_impl(PyModuleDef *module, Py_complex z);
+cmath_tanh_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_tanh(PyModuleDef *module, PyObject *arg)
@@ -659,7 +659,7 @@
     {"log", (PyCFunction)cmath_log, METH_VARARGS, cmath_log__doc__},
 
 static PyObject *
-cmath_log_impl(PyModuleDef *module, Py_complex x, PyObject *y_obj);
+cmath_log_impl(PyModuleDef *module, Py_complex x, PyObject *y_obj)
 
 static PyObject *
 cmath_log(PyModuleDef *module, PyObject *args)
@@ -688,7 +688,7 @@
     {"phase", (PyCFunction)cmath_phase, METH_O, cmath_phase__doc__},
 
 static PyObject *
-cmath_phase_impl(PyModuleDef *module, Py_complex z);
+cmath_phase_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_phase(PyModuleDef *module, PyObject *arg)
@@ -718,7 +718,7 @@
     {"polar", (PyCFunction)cmath_polar, METH_O, cmath_polar__doc__},
 
 static PyObject *
-cmath_polar_impl(PyModuleDef *module, Py_complex z);
+cmath_polar_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_polar(PyModuleDef *module, PyObject *arg)
@@ -746,7 +746,7 @@
     {"rect", (PyCFunction)cmath_rect, METH_VARARGS, cmath_rect__doc__},
 
 static PyObject *
-cmath_rect_impl(PyModuleDef *module, double r, double phi);
+cmath_rect_impl(PyModuleDef *module, double r, double phi)
 
 static PyObject *
 cmath_rect(PyModuleDef *module, PyObject *args)
@@ -775,7 +775,7 @@
     {"isfinite", (PyCFunction)cmath_isfinite, METH_O, cmath_isfinite__doc__},
 
 static PyObject *
-cmath_isfinite_impl(PyModuleDef *module, Py_complex z);
+cmath_isfinite_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_isfinite(PyModuleDef *module, PyObject *arg)
@@ -803,7 +803,7 @@
     {"isnan", (PyCFunction)cmath_isnan, METH_O, cmath_isnan__doc__},
 
 static PyObject *
-cmath_isnan_impl(PyModuleDef *module, Py_complex z);
+cmath_isnan_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_isnan(PyModuleDef *module, PyObject *arg)
@@ -831,7 +831,7 @@
     {"isinf", (PyCFunction)cmath_isinf, METH_O, cmath_isinf__doc__},
 
 static PyObject *
-cmath_isinf_impl(PyModuleDef *module, Py_complex z);
+cmath_isinf_impl(PyModuleDef *module, Py_complex z)
 
 static PyObject *
 cmath_isinf(PyModuleDef *module, PyObject *arg)
@@ -848,4 +848,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=9143b8dcc8069024 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=079b76ff71c9913f input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/fcntlmodule.c.h
--- a/Modules/clinic/fcntlmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/fcntlmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -22,7 +22,7 @@
     {"fcntl", (PyCFunction)fcntl_fcntl, METH_VARARGS, fcntl_fcntl__doc__},
 
 static PyObject *
-fcntl_fcntl_impl(PyModuleDef *module, int fd, int code, PyObject *arg);
+fcntl_fcntl_impl(PyModuleDef *module, int fd, int code, PyObject *arg)
 
 static PyObject *
 fcntl_fcntl(PyModuleDef *module, PyObject *args)
@@ -79,7 +79,8 @@
     {"ioctl", (PyCFunction)fcntl_ioctl, METH_VARARGS, fcntl_ioctl__doc__},
 
 static PyObject *
-fcntl_ioctl_impl(PyModuleDef *module, int fd, unsigned int code, PyObject *ob_arg, int mutate_arg);
+fcntl_ioctl_impl(PyModuleDef *module, int fd, unsigned int code,
+                 PyObject *ob_arg, int mutate_arg)
 
 static PyObject *
 fcntl_ioctl(PyModuleDef *module, PyObject *args)
@@ -113,7 +114,7 @@
     {"flock", (PyCFunction)fcntl_flock, METH_VARARGS, fcntl_flock__doc__},
 
 static PyObject *
-fcntl_flock_impl(PyModuleDef *module, int fd, int code);
+fcntl_flock_impl(PyModuleDef *module, int fd, int code)
 
 static PyObject *
 fcntl_flock(PyModuleDef *module, PyObject *args)
@@ -163,7 +164,8 @@
     {"lockf", (PyCFunction)fcntl_lockf, METH_VARARGS, fcntl_lockf__doc__},
 
 static PyObject *
-fcntl_lockf_impl(PyModuleDef *module, int fd, int code, PyObject *lenobj, PyObject *startobj, int whence);
+fcntl_lockf_impl(PyModuleDef *module, int fd, int code, PyObject *lenobj,
+                 PyObject *startobj, int whence)
 
 static PyObject *
 fcntl_lockf(PyModuleDef *module, PyObject *args)
@@ -184,4 +186,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=ec482672292aab0c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=26ea4ee0e7e19a4d input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/grpmodule.c.h
--- a/Modules/clinic/grpmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/grpmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -14,7 +14,7 @@
     {"getgrgid", (PyCFunction)grp_getgrgid, METH_VARARGS|METH_KEYWORDS, grp_getgrgid__doc__},
 
 static PyObject *
-grp_getgrgid_impl(PyModuleDef *module, PyObject *id);
+grp_getgrgid_impl(PyModuleDef *module, PyObject *id)
 
 static PyObject *
 grp_getgrgid(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -45,7 +45,7 @@
     {"getgrnam", (PyCFunction)grp_getgrnam, METH_VARARGS|METH_KEYWORDS, grp_getgrnam__doc__},
 
 static PyObject *
-grp_getgrnam_impl(PyModuleDef *module, PyObject *name);
+grp_getgrnam_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 grp_getgrnam(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -84,4 +84,4 @@
 {
     return grp_getgrall_impl(module);
 }
-/*[clinic end generated code: output=4709a6ba40bb8df9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fea578c262268eb3 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/md5module.c.h
--- a/Modules/clinic/md5module.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/md5module.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -75,7 +75,7 @@
     {"md5", (PyCFunction)_md5_md5, METH_VARARGS|METH_KEYWORDS, _md5_md5__doc__},
 
 static PyObject *
-_md5_md5_impl(PyModuleDef *module, PyObject *string);
+_md5_md5_impl(PyModuleDef *module, PyObject *string)
 
 static PyObject *
 _md5_md5(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -93,4 +93,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=f72618edfd35d984 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=255375f4151f5c43 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/posixmodule.c.h
--- a/Modules/clinic/posixmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/posixmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -30,7 +30,8 @@
     {"stat", (PyCFunction)os_stat, METH_VARARGS|METH_KEYWORDS, os_stat__doc__},
 
 static PyObject *
-os_stat_impl(PyModuleDef *module, path_t *path, int dir_fd, int follow_symlinks);
+os_stat_impl(PyModuleDef *module, path_t *path, int dir_fd,
+             int follow_symlinks)
 
 static PyObject *
 os_stat(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -67,7 +68,7 @@
     {"lstat", (PyCFunction)os_lstat, METH_VARARGS|METH_KEYWORDS, os_lstat__doc__},
 
 static PyObject *
-os_lstat_impl(PyModuleDef *module, path_t *path, int dir_fd);
+os_lstat_impl(PyModuleDef *module, path_t *path, int dir_fd)
 
 static PyObject *
 os_lstat(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -126,7 +127,8 @@
     {"access", (PyCFunction)os_access, METH_VARARGS|METH_KEYWORDS, os_access__doc__},
 
 static int
-os_access_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd, int effective_ids, int follow_symlinks);
+os_access_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd,
+               int effective_ids, int follow_symlinks)
 
 static PyObject *
 os_access(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -171,7 +173,7 @@
     {"ttyname", (PyCFunction)os_ttyname, METH_O, os_ttyname__doc__},
 
 static char *
-os_ttyname_impl(PyModuleDef *module, int fd);
+os_ttyname_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_ttyname(PyModuleDef *module, PyObject *arg)
@@ -231,7 +233,7 @@
     {"chdir", (PyCFunction)os_chdir, METH_VARARGS|METH_KEYWORDS, os_chdir__doc__},
 
 static PyObject *
-os_chdir_impl(PyModuleDef *module, path_t *path);
+os_chdir_impl(PyModuleDef *module, path_t *path)
 
 static PyObject *
 os_chdir(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -268,7 +270,7 @@
     {"fchdir", (PyCFunction)os_fchdir, METH_VARARGS|METH_KEYWORDS, os_fchdir__doc__},
 
 static PyObject *
-os_fchdir_impl(PyModuleDef *module, int fd);
+os_fchdir_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_fchdir(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -319,7 +321,8 @@
     {"chmod", (PyCFunction)os_chmod, METH_VARARGS|METH_KEYWORDS, os_chmod__doc__},
 
 static PyObject *
-os_chmod_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd, int follow_symlinks);
+os_chmod_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd,
+              int follow_symlinks)
 
 static PyObject *
 os_chmod(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -358,7 +361,7 @@
     {"fchmod", (PyCFunction)os_fchmod, METH_VARARGS|METH_KEYWORDS, os_fchmod__doc__},
 
 static PyObject *
-os_fchmod_impl(PyModuleDef *module, int fd, int mode);
+os_fchmod_impl(PyModuleDef *module, int fd, int mode)
 
 static PyObject *
 os_fchmod(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -395,7 +398,7 @@
     {"lchmod", (PyCFunction)os_lchmod, METH_VARARGS|METH_KEYWORDS, os_lchmod__doc__},
 
 static PyObject *
-os_lchmod_impl(PyModuleDef *module, path_t *path, int mode);
+os_lchmod_impl(PyModuleDef *module, path_t *path, int mode)
 
 static PyObject *
 os_lchmod(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -438,7 +441,8 @@
     {"chflags", (PyCFunction)os_chflags, METH_VARARGS|METH_KEYWORDS, os_chflags__doc__},
 
 static PyObject *
-os_chflags_impl(PyModuleDef *module, path_t *path, unsigned long flags, int follow_symlinks);
+os_chflags_impl(PyModuleDef *module, path_t *path, unsigned long flags,
+                int follow_symlinks)
 
 static PyObject *
 os_chflags(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -479,7 +483,7 @@
     {"lchflags", (PyCFunction)os_lchflags, METH_VARARGS|METH_KEYWORDS, os_lchflags__doc__},
 
 static PyObject *
-os_lchflags_impl(PyModuleDef *module, path_t *path, unsigned long flags);
+os_lchflags_impl(PyModuleDef *module, path_t *path, unsigned long flags)
 
 static PyObject *
 os_lchflags(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -516,7 +520,7 @@
     {"chroot", (PyCFunction)os_chroot, METH_VARARGS|METH_KEYWORDS, os_chroot__doc__},
 
 static PyObject *
-os_chroot_impl(PyModuleDef *module, path_t *path);
+os_chroot_impl(PyModuleDef *module, path_t *path)
 
 static PyObject *
 os_chroot(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -552,7 +556,7 @@
     {"fsync", (PyCFunction)os_fsync, METH_VARARGS|METH_KEYWORDS, os_fsync__doc__},
 
 static PyObject *
-os_fsync_impl(PyModuleDef *module, int fd);
+os_fsync_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_fsync(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -607,7 +611,7 @@
     {"fdatasync", (PyCFunction)os_fdatasync, METH_VARARGS|METH_KEYWORDS, os_fdatasync__doc__},
 
 static PyObject *
-os_fdatasync_impl(PyModuleDef *module, int fd);
+os_fdatasync_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_fdatasync(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -664,7 +668,8 @@
     {"chown", (PyCFunction)os_chown, METH_VARARGS|METH_KEYWORDS, os_chown__doc__},
 
 static PyObject *
-os_chown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid, int dir_fd, int follow_symlinks);
+os_chown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid,
+              int dir_fd, int follow_symlinks)
 
 static PyObject *
 os_chown(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -706,7 +711,7 @@
     {"fchown", (PyCFunction)os_fchown, METH_VARARGS|METH_KEYWORDS, os_fchown__doc__},
 
 static PyObject *
-os_fchown_impl(PyModuleDef *module, int fd, uid_t uid, gid_t gid);
+os_fchown_impl(PyModuleDef *module, int fd, uid_t uid, gid_t gid)
 
 static PyObject *
 os_fchown(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -744,7 +749,7 @@
     {"lchown", (PyCFunction)os_lchown, METH_VARARGS|METH_KEYWORDS, os_lchown__doc__},
 
 static PyObject *
-os_lchown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid);
+os_lchown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid)
 
 static PyObject *
 os_lchown(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -829,7 +834,8 @@
     {"link", (PyCFunction)os_link, METH_VARARGS|METH_KEYWORDS, os_link__doc__},
 
 static PyObject *
-os_link_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int follow_symlinks);
+os_link_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd,
+             int dst_dir_fd, int follow_symlinks)
 
 static PyObject *
 os_link(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -880,7 +886,7 @@
     {"listdir", (PyCFunction)os_listdir, METH_VARARGS|METH_KEYWORDS, os_listdir__doc__},
 
 static PyObject *
-os_listdir_impl(PyModuleDef *module, path_t *path);
+os_listdir_impl(PyModuleDef *module, path_t *path)
 
 static PyObject *
 os_listdir(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -914,7 +920,7 @@
     {"_getfinalpathname", (PyCFunction)os__getfinalpathname, METH_O, os__getfinalpathname__doc__},
 
 static PyObject *
-os__getfinalpathname_impl(PyModuleDef *module, PyObject *path);
+os__getfinalpathname_impl(PyModuleDef *module, PyObject *path)
 
 static PyObject *
 os__getfinalpathname(PyModuleDef *module, PyObject *arg)
@@ -946,7 +952,7 @@
     {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_VARARGS|METH_KEYWORDS, os__getvolumepathname__doc__},
 
 static PyObject *
-os__getvolumepathname_impl(PyModuleDef *module, PyObject *path);
+os__getvolumepathname_impl(PyModuleDef *module, PyObject *path)
 
 static PyObject *
 os__getvolumepathname(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -984,7 +990,7 @@
     {"mkdir", (PyCFunction)os_mkdir, METH_VARARGS|METH_KEYWORDS, os_mkdir__doc__},
 
 static PyObject *
-os_mkdir_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd);
+os_mkdir_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd)
 
 static PyObject *
 os_mkdir(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1020,7 +1026,7 @@
     {"nice", (PyCFunction)os_nice, METH_O, os_nice__doc__},
 
 static PyObject *
-os_nice_impl(PyModuleDef *module, int increment);
+os_nice_impl(PyModuleDef *module, int increment)
 
 static PyObject *
 os_nice(PyModuleDef *module, PyObject *arg)
@@ -1052,7 +1058,7 @@
     {"getpriority", (PyCFunction)os_getpriority, METH_VARARGS|METH_KEYWORDS, os_getpriority__doc__},
 
 static PyObject *
-os_getpriority_impl(PyModuleDef *module, int which, int who);
+os_getpriority_impl(PyModuleDef *module, int which, int who)
 
 static PyObject *
 os_getpriority(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1086,7 +1092,7 @@
     {"setpriority", (PyCFunction)os_setpriority, METH_VARARGS|METH_KEYWORDS, os_setpriority__doc__},
 
 static PyObject *
-os_setpriority_impl(PyModuleDef *module, int which, int who, int priority);
+os_setpriority_impl(PyModuleDef *module, int which, int who, int priority)
 
 static PyObject *
 os_setpriority(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1125,7 +1131,8 @@
     {"rename", (PyCFunction)os_rename, METH_VARARGS|METH_KEYWORDS, os_rename__doc__},
 
 static PyObject *
-os_rename_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd);
+os_rename_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd,
+               int dst_dir_fd)
 
 static PyObject *
 os_rename(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1168,7 +1175,8 @@
     {"replace", (PyCFunction)os_replace, METH_VARARGS|METH_KEYWORDS, os_replace__doc__},
 
 static PyObject *
-os_replace_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd);
+os_replace_impl(PyModuleDef *module, path_t *src, path_t *dst,
+                int src_dir_fd, int dst_dir_fd)
 
 static PyObject *
 os_replace(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1210,7 +1218,7 @@
     {"rmdir", (PyCFunction)os_rmdir, METH_VARARGS|METH_KEYWORDS, os_rmdir__doc__},
 
 static PyObject *
-os_rmdir_impl(PyModuleDef *module, path_t *path, int dir_fd);
+os_rmdir_impl(PyModuleDef *module, path_t *path, int dir_fd)
 
 static PyObject *
 os_rmdir(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1245,7 +1253,7 @@
     {"system", (PyCFunction)os_system, METH_VARARGS|METH_KEYWORDS, os_system__doc__},
 
 static long
-os_system_impl(PyModuleDef *module, Py_UNICODE *command);
+os_system_impl(PyModuleDef *module, Py_UNICODE *command)
 
 static PyObject *
 os_system(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1282,7 +1290,7 @@
     {"system", (PyCFunction)os_system, METH_VARARGS|METH_KEYWORDS, os_system__doc__},
 
 static long
-os_system_impl(PyModuleDef *module, PyObject *command);
+os_system_impl(PyModuleDef *module, PyObject *command)
 
 static PyObject *
 os_system(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1320,7 +1328,7 @@
     {"umask", (PyCFunction)os_umask, METH_O, os_umask__doc__},
 
 static PyObject *
-os_umask_impl(PyModuleDef *module, int mask);
+os_umask_impl(PyModuleDef *module, int mask)
 
 static PyObject *
 os_umask(PyModuleDef *module, PyObject *arg)
@@ -1353,7 +1361,7 @@
     {"unlink", (PyCFunction)os_unlink, METH_VARARGS|METH_KEYWORDS, os_unlink__doc__},
 
 static PyObject *
-os_unlink_impl(PyModuleDef *module, path_t *path, int dir_fd);
+os_unlink_impl(PyModuleDef *module, path_t *path, int dir_fd)
 
 static PyObject *
 os_unlink(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1391,7 +1399,7 @@
     {"remove", (PyCFunction)os_remove, METH_VARARGS|METH_KEYWORDS, os_remove__doc__},
 
 static PyObject *
-os_remove_impl(PyModuleDef *module, path_t *path, int dir_fd);
+os_remove_impl(PyModuleDef *module, path_t *path, int dir_fd)
 
 static PyObject *
 os_remove(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1472,7 +1480,8 @@
     {"utime", (PyCFunction)os_utime, METH_VARARGS|METH_KEYWORDS, os_utime__doc__},
 
 static PyObject *
-os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times, PyObject *ns, int dir_fd, int follow_symlinks);
+os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times,
+              PyObject *ns, int dir_fd, int follow_symlinks)
 
 static PyObject *
 os_utime(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1508,7 +1517,7 @@
     {"_exit", (PyCFunction)os__exit, METH_VARARGS|METH_KEYWORDS, os__exit__doc__},
 
 static PyObject *
-os__exit_impl(PyModuleDef *module, int status);
+os__exit_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os__exit(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1544,7 +1553,7 @@
     {"execv", (PyCFunction)os_execv, METH_VARARGS, os_execv__doc__},
 
 static PyObject *
-os_execv_impl(PyModuleDef *module, PyObject *path, PyObject *argv);
+os_execv_impl(PyModuleDef *module, PyObject *path, PyObject *argv)
 
 static PyObject *
 os_execv(PyModuleDef *module, PyObject *args)
@@ -1587,7 +1596,8 @@
     {"execve", (PyCFunction)os_execve, METH_VARARGS|METH_KEYWORDS, os_execve__doc__},
 
 static PyObject *
-os_execve_impl(PyModuleDef *module, path_t *path, PyObject *argv, PyObject *env);
+os_execve_impl(PyModuleDef *module, path_t *path, PyObject *argv,
+               PyObject *env)
 
 static PyObject *
 os_execve(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1632,7 +1642,7 @@
     {"spawnv", (PyCFunction)os_spawnv, METH_VARARGS, os_spawnv__doc__},
 
 static PyObject *
-os_spawnv_impl(PyModuleDef *module, int mode, PyObject *path, PyObject *argv);
+os_spawnv_impl(PyModuleDef *module, int mode, PyObject *path, PyObject *argv)
 
 static PyObject *
 os_spawnv(PyModuleDef *module, PyObject *args)
@@ -1678,7 +1688,8 @@
     {"spawnve", (PyCFunction)os_spawnve, METH_VARARGS, os_spawnve__doc__},
 
 static PyObject *
-os_spawnve_impl(PyModuleDef *module, int mode, PyObject *path, PyObject *argv, PyObject *env);
+os_spawnve_impl(PyModuleDef *module, int mode, PyObject *path,
+                PyObject *argv, PyObject *env)
 
 static PyObject *
 os_spawnve(PyModuleDef *module, PyObject *args)
@@ -1764,7 +1775,7 @@
     {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_VARARGS|METH_KEYWORDS, os_sched_get_priority_max__doc__},
 
 static PyObject *
-os_sched_get_priority_max_impl(PyModuleDef *module, int policy);
+os_sched_get_priority_max_impl(PyModuleDef *module, int policy)
 
 static PyObject *
 os_sched_get_priority_max(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1797,7 +1808,7 @@
     {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_VARARGS|METH_KEYWORDS, os_sched_get_priority_min__doc__},
 
 static PyObject *
-os_sched_get_priority_min_impl(PyModuleDef *module, int policy);
+os_sched_get_priority_min_impl(PyModuleDef *module, int policy)
 
 static PyObject *
 os_sched_get_priority_min(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -1832,7 +1843,7 @@
     {"sched_getscheduler", (PyCFunction)os_sched_getscheduler, METH_O, os_sched_getscheduler__doc__},
 
 static PyObject *
-os_sched_getscheduler_impl(PyModuleDef *module, pid_t pid);
+os_sched_getscheduler_impl(PyModuleDef *module, pid_t pid)
 
 static PyObject *
 os_sched_getscheduler(PyModuleDef *module, PyObject *arg)
@@ -1864,7 +1875,7 @@
 "    A scheduling parameter.");
 
 static PyObject *
-os_sched_param_impl(PyTypeObject *type, PyObject *sched_priority);
+os_sched_param_impl(PyTypeObject *type, PyObject *sched_priority)
 
 static PyObject *
 os_sched_param(PyTypeObject *type, PyObject *args, PyObject *kwargs)
@@ -1900,7 +1911,8 @@
     {"sched_setscheduler", (PyCFunction)os_sched_setscheduler, METH_VARARGS, os_sched_setscheduler__doc__},
 
 static PyObject *
-os_sched_setscheduler_impl(PyModuleDef *module, pid_t pid, int policy, struct sched_param *param);
+os_sched_setscheduler_impl(PyModuleDef *module, pid_t pid, int policy,
+                           struct sched_param *param)
 
 static PyObject *
 os_sched_setscheduler(PyModuleDef *module, PyObject *args)
@@ -1937,7 +1949,7 @@
     {"sched_getparam", (PyCFunction)os_sched_getparam, METH_O, os_sched_getparam__doc__},
 
 static PyObject *
-os_sched_getparam_impl(PyModuleDef *module, pid_t pid);
+os_sched_getparam_impl(PyModuleDef *module, pid_t pid)
 
 static PyObject *
 os_sched_getparam(PyModuleDef *module, PyObject *arg)
@@ -1972,7 +1984,8 @@
     {"sched_setparam", (PyCFunction)os_sched_setparam, METH_VARARGS, os_sched_setparam__doc__},
 
 static PyObject *
-os_sched_setparam_impl(PyModuleDef *module, pid_t pid, struct sched_param *param);
+os_sched_setparam_impl(PyModuleDef *module, pid_t pid,
+                       struct sched_param *param)
 
 static PyObject *
 os_sched_setparam(PyModuleDef *module, PyObject *args)
@@ -2007,7 +2020,7 @@
     {"sched_rr_get_interval", (PyCFunction)os_sched_rr_get_interval, METH_O, os_sched_rr_get_interval__doc__},
 
 static double
-os_sched_rr_get_interval_impl(PyModuleDef *module, pid_t pid);
+os_sched_rr_get_interval_impl(PyModuleDef *module, pid_t pid)
 
 static PyObject *
 os_sched_rr_get_interval(PyModuleDef *module, PyObject *arg)
@@ -2067,7 +2080,7 @@
     {"sched_setaffinity", (PyCFunction)os_sched_setaffinity, METH_VARARGS, os_sched_setaffinity__doc__},
 
 static PyObject *
-os_sched_setaffinity_impl(PyModuleDef *module, pid_t pid, PyObject *mask);
+os_sched_setaffinity_impl(PyModuleDef *module, pid_t pid, PyObject *mask)
 
 static PyObject *
 os_sched_setaffinity(PyModuleDef *module, PyObject *args)
@@ -2102,7 +2115,7 @@
     {"sched_getaffinity", (PyCFunction)os_sched_getaffinity, METH_O, os_sched_getaffinity__doc__},
 
 static PyObject *
-os_sched_getaffinity_impl(PyModuleDef *module, pid_t pid);
+os_sched_getaffinity_impl(PyModuleDef *module, pid_t pid)
 
 static PyObject *
 os_sched_getaffinity(PyModuleDef *module, PyObject *arg)
@@ -2292,7 +2305,7 @@
     {"getpgid", (PyCFunction)os_getpgid, METH_VARARGS|METH_KEYWORDS, os_getpgid__doc__},
 
 static PyObject *
-os_getpgid_impl(PyModuleDef *module, pid_t pid);
+os_getpgid_impl(PyModuleDef *module, pid_t pid)
 
 static PyObject *
 os_getpgid(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -2438,7 +2451,7 @@
     {"kill", (PyCFunction)os_kill, METH_VARARGS, os_kill__doc__},
 
 static PyObject *
-os_kill_impl(PyModuleDef *module, pid_t pid, Py_ssize_t signal);
+os_kill_impl(PyModuleDef *module, pid_t pid, Py_ssize_t signal)
 
 static PyObject *
 os_kill(PyModuleDef *module, PyObject *args)
@@ -2471,7 +2484,7 @@
     {"killpg", (PyCFunction)os_killpg, METH_VARARGS, os_killpg__doc__},
 
 static PyObject *
-os_killpg_impl(PyModuleDef *module, pid_t pgid, int signal);
+os_killpg_impl(PyModuleDef *module, pid_t pgid, int signal)
 
 static PyObject *
 os_killpg(PyModuleDef *module, PyObject *args)
@@ -2504,7 +2517,7 @@
     {"plock", (PyCFunction)os_plock, METH_O, os_plock__doc__},
 
 static PyObject *
-os_plock_impl(PyModuleDef *module, int op);
+os_plock_impl(PyModuleDef *module, int op)
 
 static PyObject *
 os_plock(PyModuleDef *module, PyObject *arg)
@@ -2536,7 +2549,7 @@
     {"setuid", (PyCFunction)os_setuid, METH_O, os_setuid__doc__},
 
 static PyObject *
-os_setuid_impl(PyModuleDef *module, uid_t uid);
+os_setuid_impl(PyModuleDef *module, uid_t uid)
 
 static PyObject *
 os_setuid(PyModuleDef *module, PyObject *arg)
@@ -2568,7 +2581,7 @@
     {"seteuid", (PyCFunction)os_seteuid, METH_O, os_seteuid__doc__},
 
 static PyObject *
-os_seteuid_impl(PyModuleDef *module, uid_t euid);
+os_seteuid_impl(PyModuleDef *module, uid_t euid)
 
 static PyObject *
 os_seteuid(PyModuleDef *module, PyObject *arg)
@@ -2600,7 +2613,7 @@
     {"setegid", (PyCFunction)os_setegid, METH_O, os_setegid__doc__},
 
 static PyObject *
-os_setegid_impl(PyModuleDef *module, gid_t egid);
+os_setegid_impl(PyModuleDef *module, gid_t egid)
 
 static PyObject *
 os_setegid(PyModuleDef *module, PyObject *arg)
@@ -2632,7 +2645,7 @@
     {"setreuid", (PyCFunction)os_setreuid, METH_VARARGS, os_setreuid__doc__},
 
 static PyObject *
-os_setreuid_impl(PyModuleDef *module, uid_t ruid, uid_t euid);
+os_setreuid_impl(PyModuleDef *module, uid_t ruid, uid_t euid)
 
 static PyObject *
 os_setreuid(PyModuleDef *module, PyObject *args)
@@ -2665,7 +2678,7 @@
     {"setregid", (PyCFunction)os_setregid, METH_VARARGS, os_setregid__doc__},
 
 static PyObject *
-os_setregid_impl(PyModuleDef *module, gid_t rgid, gid_t egid);
+os_setregid_impl(PyModuleDef *module, gid_t rgid, gid_t egid)
 
 static PyObject *
 os_setregid(PyModuleDef *module, PyObject *args)
@@ -2698,7 +2711,7 @@
     {"setgid", (PyCFunction)os_setgid, METH_O, os_setgid__doc__},
 
 static PyObject *
-os_setgid_impl(PyModuleDef *module, gid_t gid);
+os_setgid_impl(PyModuleDef *module, gid_t gid)
 
 static PyObject *
 os_setgid(PyModuleDef *module, PyObject *arg)
@@ -2746,7 +2759,7 @@
     {"wait3", (PyCFunction)os_wait3, METH_VARARGS|METH_KEYWORDS, os_wait3__doc__},
 
 static PyObject *
-os_wait3_impl(PyModuleDef *module, int options);
+os_wait3_impl(PyModuleDef *module, int options)
 
 static PyObject *
 os_wait3(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -2782,7 +2795,7 @@
     {"wait4", (PyCFunction)os_wait4, METH_VARARGS|METH_KEYWORDS, os_wait4__doc__},
 
 static PyObject *
-os_wait4_impl(PyModuleDef *module, pid_t pid, int options);
+os_wait4_impl(PyModuleDef *module, pid_t pid, int options)
 
 static PyObject *
 os_wait4(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -2827,7 +2840,7 @@
     {"waitid", (PyCFunction)os_waitid, METH_VARARGS, os_waitid__doc__},
 
 static PyObject *
-os_waitid_impl(PyModuleDef *module, idtype_t idtype, id_t id, int options);
+os_waitid_impl(PyModuleDef *module, idtype_t idtype, id_t id, int options)
 
 static PyObject *
 os_waitid(PyModuleDef *module, PyObject *args)
@@ -2866,7 +2879,7 @@
     {"waitpid", (PyCFunction)os_waitpid, METH_VARARGS, os_waitpid__doc__},
 
 static PyObject *
-os_waitpid_impl(PyModuleDef *module, pid_t pid, int options);
+os_waitpid_impl(PyModuleDef *module, pid_t pid, int options)
 
 static PyObject *
 os_waitpid(PyModuleDef *module, PyObject *args)
@@ -2904,7 +2917,7 @@
     {"waitpid", (PyCFunction)os_waitpid, METH_VARARGS, os_waitpid__doc__},
 
 static PyObject *
-os_waitpid_impl(PyModuleDef *module, Py_intptr_t pid, int options);
+os_waitpid_impl(PyModuleDef *module, Py_intptr_t pid, int options)
 
 static PyObject *
 os_waitpid(PyModuleDef *module, PyObject *args)
@@ -2972,7 +2985,8 @@
     {"symlink", (PyCFunction)os_symlink, METH_VARARGS|METH_KEYWORDS, os_symlink__doc__},
 
 static PyObject *
-os_symlink_impl(PyModuleDef *module, path_t *src, path_t *dst, int target_is_directory, int dir_fd);
+os_symlink_impl(PyModuleDef *module, path_t *src, path_t *dst,
+                int target_is_directory, int dir_fd)
 
 static PyObject *
 os_symlink(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3039,7 +3053,7 @@
     {"getsid", (PyCFunction)os_getsid, METH_O, os_getsid__doc__},
 
 static PyObject *
-os_getsid_impl(PyModuleDef *module, pid_t pid);
+os_getsid_impl(PyModuleDef *module, pid_t pid)
 
 static PyObject *
 os_getsid(PyModuleDef *module, PyObject *arg)
@@ -3093,7 +3107,7 @@
     {"setpgid", (PyCFunction)os_setpgid, METH_VARARGS, os_setpgid__doc__},
 
 static PyObject *
-os_setpgid_impl(PyModuleDef *module, pid_t pid, pid_t pgrp);
+os_setpgid_impl(PyModuleDef *module, pid_t pid, pid_t pgrp)
 
 static PyObject *
 os_setpgid(PyModuleDef *module, PyObject *args)
@@ -3126,7 +3140,7 @@
     {"tcgetpgrp", (PyCFunction)os_tcgetpgrp, METH_O, os_tcgetpgrp__doc__},
 
 static PyObject *
-os_tcgetpgrp_impl(PyModuleDef *module, int fd);
+os_tcgetpgrp_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_tcgetpgrp(PyModuleDef *module, PyObject *arg)
@@ -3158,7 +3172,7 @@
     {"tcsetpgrp", (PyCFunction)os_tcsetpgrp, METH_VARARGS, os_tcsetpgrp__doc__},
 
 static PyObject *
-os_tcsetpgrp_impl(PyModuleDef *module, int fd, pid_t pgid);
+os_tcsetpgrp_impl(PyModuleDef *module, int fd, pid_t pgid)
 
 static PyObject *
 os_tcsetpgrp(PyModuleDef *module, PyObject *args)
@@ -3194,7 +3208,8 @@
     {"open", (PyCFunction)os_open, METH_VARARGS|METH_KEYWORDS, os_open__doc__},
 
 static int
-os_open_impl(PyModuleDef *module, path_t *path, int flags, int mode, int dir_fd);
+os_open_impl(PyModuleDef *module, path_t *path, int flags, int mode,
+             int dir_fd)
 
 static PyObject *
 os_open(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3233,7 +3248,7 @@
     {"close", (PyCFunction)os_close, METH_VARARGS|METH_KEYWORDS, os_close__doc__},
 
 static PyObject *
-os_close_impl(PyModuleDef *module, int fd);
+os_close_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_close(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3262,7 +3277,7 @@
     {"closerange", (PyCFunction)os_closerange, METH_VARARGS, os_closerange__doc__},
 
 static PyObject *
-os_closerange_impl(PyModuleDef *module, int fd_low, int fd_high);
+os_closerange_impl(PyModuleDef *module, int fd_low, int fd_high)
 
 static PyObject *
 os_closerange(PyModuleDef *module, PyObject *args)
@@ -3291,7 +3306,7 @@
     {"dup", (PyCFunction)os_dup, METH_O, os_dup__doc__},
 
 static int
-os_dup_impl(PyModuleDef *module, int fd);
+os_dup_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_dup(PyModuleDef *module, PyObject *arg)
@@ -3323,7 +3338,7 @@
     {"dup2", (PyCFunction)os_dup2, METH_VARARGS|METH_KEYWORDS, os_dup2__doc__},
 
 static PyObject *
-os_dup2_impl(PyModuleDef *module, int fd, int fd2, int inheritable);
+os_dup2_impl(PyModuleDef *module, int fd, int fd2, int inheritable)
 
 static PyObject *
 os_dup2(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3363,7 +3378,7 @@
     {"lockf", (PyCFunction)os_lockf, METH_VARARGS, os_lockf__doc__},
 
 static PyObject *
-os_lockf_impl(PyModuleDef *module, int fd, int command, Py_off_t length);
+os_lockf_impl(PyModuleDef *module, int fd, int command, Py_off_t length)
 
 static PyObject *
 os_lockf(PyModuleDef *module, PyObject *args)
@@ -3398,7 +3413,7 @@
     {"lseek", (PyCFunction)os_lseek, METH_VARARGS, os_lseek__doc__},
 
 static Py_off_t
-os_lseek_impl(PyModuleDef *module, int fd, Py_off_t position, int how);
+os_lseek_impl(PyModuleDef *module, int fd, Py_off_t position, int how)
 
 static PyObject *
 os_lseek(PyModuleDef *module, PyObject *args)
@@ -3432,7 +3447,7 @@
     {"read", (PyCFunction)os_read, METH_VARARGS, os_read__doc__},
 
 static PyObject *
-os_read_impl(PyModuleDef *module, int fd, Py_ssize_t length);
+os_read_impl(PyModuleDef *module, int fd, Py_ssize_t length)
 
 static PyObject *
 os_read(PyModuleDef *module, PyObject *args)
@@ -3471,7 +3486,7 @@
     {"readv", (PyCFunction)os_readv, METH_VARARGS, os_readv__doc__},
 
 static Py_ssize_t
-os_readv_impl(PyModuleDef *module, int fd, PyObject *buffers);
+os_readv_impl(PyModuleDef *module, int fd, PyObject *buffers)
 
 static PyObject *
 os_readv(PyModuleDef *module, PyObject *args)
@@ -3511,7 +3526,7 @@
     {"pread", (PyCFunction)os_pread, METH_VARARGS, os_pread__doc__},
 
 static PyObject *
-os_pread_impl(PyModuleDef *module, int fd, int length, Py_off_t offset);
+os_pread_impl(PyModuleDef *module, int fd, int length, Py_off_t offset)
 
 static PyObject *
 os_pread(PyModuleDef *module, PyObject *args)
@@ -3543,7 +3558,7 @@
     {"write", (PyCFunction)os_write, METH_VARARGS, os_write__doc__},
 
 static Py_ssize_t
-os_write_impl(PyModuleDef *module, int fd, Py_buffer *data);
+os_write_impl(PyModuleDef *module, int fd, Py_buffer *data)
 
 static PyObject *
 os_write(PyModuleDef *module, PyObject *args)
@@ -3583,7 +3598,7 @@
     {"fstat", (PyCFunction)os_fstat, METH_VARARGS|METH_KEYWORDS, os_fstat__doc__},
 
 static PyObject *
-os_fstat_impl(PyModuleDef *module, int fd);
+os_fstat_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_fstat(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3615,7 +3630,7 @@
     {"isatty", (PyCFunction)os_isatty, METH_O, os_isatty__doc__},
 
 static int
-os_isatty_impl(PyModuleDef *module, int fd);
+os_isatty_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_isatty(PyModuleDef *module, PyObject *arg)
@@ -3680,7 +3695,7 @@
     {"pipe2", (PyCFunction)os_pipe2, METH_O, os_pipe2__doc__},
 
 static PyObject *
-os_pipe2_impl(PyModuleDef *module, int flags);
+os_pipe2_impl(PyModuleDef *module, int flags)
 
 static PyObject *
 os_pipe2(PyModuleDef *module, PyObject *arg)
@@ -3715,7 +3730,7 @@
     {"writev", (PyCFunction)os_writev, METH_VARARGS, os_writev__doc__},
 
 static Py_ssize_t
-os_writev_impl(PyModuleDef *module, int fd, PyObject *buffers);
+os_writev_impl(PyModuleDef *module, int fd, PyObject *buffers)
 
 static PyObject *
 os_writev(PyModuleDef *module, PyObject *args)
@@ -3756,7 +3771,8 @@
     {"pwrite", (PyCFunction)os_pwrite, METH_VARARGS, os_pwrite__doc__},
 
 static Py_ssize_t
-os_pwrite_impl(PyModuleDef *module, int fd, Py_buffer *buffer, Py_off_t offset);
+os_pwrite_impl(PyModuleDef *module, int fd, Py_buffer *buffer,
+               Py_off_t offset)
 
 static PyObject *
 os_pwrite(PyModuleDef *module, PyObject *args)
@@ -3803,7 +3819,7 @@
     {"mkfifo", (PyCFunction)os_mkfifo, METH_VARARGS|METH_KEYWORDS, os_mkfifo__doc__},
 
 static PyObject *
-os_mkfifo_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd);
+os_mkfifo_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd)
 
 static PyObject *
 os_mkfifo(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3853,7 +3869,8 @@
     {"mknod", (PyCFunction)os_mknod, METH_VARARGS|METH_KEYWORDS, os_mknod__doc__},
 
 static PyObject *
-os_mknod_impl(PyModuleDef *module, path_t *path, int mode, dev_t device, int dir_fd);
+os_mknod_impl(PyModuleDef *module, path_t *path, int mode, dev_t device,
+              int dir_fd)
 
 static PyObject *
 os_mknod(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -3892,7 +3909,7 @@
     {"major", (PyCFunction)os_major, METH_O, os_major__doc__},
 
 static unsigned int
-os_major_impl(PyModuleDef *module, dev_t device);
+os_major_impl(PyModuleDef *module, dev_t device)
 
 static PyObject *
 os_major(PyModuleDef *module, PyObject *arg)
@@ -3928,7 +3945,7 @@
     {"minor", (PyCFunction)os_minor, METH_O, os_minor__doc__},
 
 static unsigned int
-os_minor_impl(PyModuleDef *module, dev_t device);
+os_minor_impl(PyModuleDef *module, dev_t device)
 
 static PyObject *
 os_minor(PyModuleDef *module, PyObject *arg)
@@ -3964,7 +3981,7 @@
     {"makedev", (PyCFunction)os_makedev, METH_VARARGS, os_makedev__doc__},
 
 static dev_t
-os_makedev_impl(PyModuleDef *module, int major, int minor);
+os_makedev_impl(PyModuleDef *module, int major, int minor)
 
 static PyObject *
 os_makedev(PyModuleDef *module, PyObject *args)
@@ -4001,7 +4018,7 @@
     {"ftruncate", (PyCFunction)os_ftruncate, METH_VARARGS, os_ftruncate__doc__},
 
 static PyObject *
-os_ftruncate_impl(PyModuleDef *module, int fd, Py_off_t length);
+os_ftruncate_impl(PyModuleDef *module, int fd, Py_off_t length)
 
 static PyObject *
 os_ftruncate(PyModuleDef *module, PyObject *args)
@@ -4037,7 +4054,7 @@
     {"truncate", (PyCFunction)os_truncate, METH_VARARGS|METH_KEYWORDS, os_truncate__doc__},
 
 static PyObject *
-os_truncate_impl(PyModuleDef *module, path_t *path, Py_off_t length);
+os_truncate_impl(PyModuleDef *module, path_t *path, Py_off_t length)
 
 static PyObject *
 os_truncate(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4077,7 +4094,8 @@
     {"posix_fallocate", (PyCFunction)os_posix_fallocate, METH_VARARGS, os_posix_fallocate__doc__},
 
 static PyObject *
-os_posix_fallocate_impl(PyModuleDef *module, int fd, Py_off_t offset, Py_off_t length);
+os_posix_fallocate_impl(PyModuleDef *module, int fd, Py_off_t offset,
+                        Py_off_t length)
 
 static PyObject *
 os_posix_fallocate(PyModuleDef *module, PyObject *args)
@@ -4119,7 +4137,8 @@
     {"posix_fadvise", (PyCFunction)os_posix_fadvise, METH_VARARGS, os_posix_fadvise__doc__},
 
 static PyObject *
-os_posix_fadvise_impl(PyModuleDef *module, int fd, Py_off_t offset, Py_off_t length, int advice);
+os_posix_fadvise_impl(PyModuleDef *module, int fd, Py_off_t offset,
+                      Py_off_t length, int advice)
 
 static PyObject *
 os_posix_fadvise(PyModuleDef *module, PyObject *args)
@@ -4154,7 +4173,7 @@
     {"putenv", (PyCFunction)os_putenv, METH_VARARGS, os_putenv__doc__},
 
 static PyObject *
-os_putenv_impl(PyModuleDef *module, PyObject *name, PyObject *value);
+os_putenv_impl(PyModuleDef *module, PyObject *name, PyObject *value)
 
 static PyObject *
 os_putenv(PyModuleDef *module, PyObject *args)
@@ -4187,7 +4206,7 @@
     {"putenv", (PyCFunction)os_putenv, METH_VARARGS, os_putenv__doc__},
 
 static PyObject *
-os_putenv_impl(PyModuleDef *module, PyObject *name, PyObject *value);
+os_putenv_impl(PyModuleDef *module, PyObject *name, PyObject *value)
 
 static PyObject *
 os_putenv(PyModuleDef *module, PyObject *args)
@@ -4225,7 +4244,7 @@
     {"unsetenv", (PyCFunction)os_unsetenv, METH_O, os_unsetenv__doc__},
 
 static PyObject *
-os_unsetenv_impl(PyModuleDef *module, PyObject *name);
+os_unsetenv_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 os_unsetenv(PyModuleDef *module, PyObject *arg)
@@ -4258,7 +4277,7 @@
     {"strerror", (PyCFunction)os_strerror, METH_O, os_strerror__doc__},
 
 static PyObject *
-os_strerror_impl(PyModuleDef *module, int code);
+os_strerror_impl(PyModuleDef *module, int code)
 
 static PyObject *
 os_strerror(PyModuleDef *module, PyObject *arg)
@@ -4288,7 +4307,7 @@
     {"WCOREDUMP", (PyCFunction)os_WCOREDUMP, METH_O, os_WCOREDUMP__doc__},
 
 static int
-os_WCOREDUMP_impl(PyModuleDef *module, int status);
+os_WCOREDUMP_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WCOREDUMP(PyModuleDef *module, PyObject *arg)
@@ -4327,7 +4346,7 @@
     {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_VARARGS|METH_KEYWORDS, os_WIFCONTINUED__doc__},
 
 static int
-os_WIFCONTINUED_impl(PyModuleDef *module, int status);
+os_WIFCONTINUED_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WIFCONTINUED(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4364,7 +4383,7 @@
     {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_VARARGS|METH_KEYWORDS, os_WIFSTOPPED__doc__},
 
 static int
-os_WIFSTOPPED_impl(PyModuleDef *module, int status);
+os_WIFSTOPPED_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WIFSTOPPED(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4401,7 +4420,7 @@
     {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_VARARGS|METH_KEYWORDS, os_WIFSIGNALED__doc__},
 
 static int
-os_WIFSIGNALED_impl(PyModuleDef *module, int status);
+os_WIFSIGNALED_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WIFSIGNALED(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4438,7 +4457,7 @@
     {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_VARARGS|METH_KEYWORDS, os_WIFEXITED__doc__},
 
 static int
-os_WIFEXITED_impl(PyModuleDef *module, int status);
+os_WIFEXITED_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WIFEXITED(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4475,7 +4494,7 @@
     {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_VARARGS|METH_KEYWORDS, os_WEXITSTATUS__doc__},
 
 static int
-os_WEXITSTATUS_impl(PyModuleDef *module, int status);
+os_WEXITSTATUS_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WEXITSTATUS(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4512,7 +4531,7 @@
     {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_VARARGS|METH_KEYWORDS, os_WTERMSIG__doc__},
 
 static int
-os_WTERMSIG_impl(PyModuleDef *module, int status);
+os_WTERMSIG_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WTERMSIG(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4549,7 +4568,7 @@
     {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_VARARGS|METH_KEYWORDS, os_WSTOPSIG__doc__},
 
 static int
-os_WSTOPSIG_impl(PyModuleDef *module, int status);
+os_WSTOPSIG_impl(PyModuleDef *module, int status)
 
 static PyObject *
 os_WSTOPSIG(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4588,7 +4607,7 @@
     {"fstatvfs", (PyCFunction)os_fstatvfs, METH_O, os_fstatvfs__doc__},
 
 static PyObject *
-os_fstatvfs_impl(PyModuleDef *module, int fd);
+os_fstatvfs_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_fstatvfs(PyModuleDef *module, PyObject *arg)
@@ -4624,7 +4643,7 @@
     {"statvfs", (PyCFunction)os_statvfs, METH_VARARGS|METH_KEYWORDS, os_statvfs__doc__},
 
 static PyObject *
-os_statvfs_impl(PyModuleDef *module, path_t *path);
+os_statvfs_impl(PyModuleDef *module, path_t *path)
 
 static PyObject *
 os_statvfs(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4660,7 +4679,7 @@
     {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_VARARGS|METH_KEYWORDS, os__getdiskusage__doc__},
 
 static PyObject *
-os__getdiskusage_impl(PyModuleDef *module, Py_UNICODE *path);
+os__getdiskusage_impl(PyModuleDef *module, Py_UNICODE *path)
 
 static PyObject *
 os__getdiskusage(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4695,7 +4714,7 @@
     {"fpathconf", (PyCFunction)os_fpathconf, METH_VARARGS, os_fpathconf__doc__},
 
 static long
-os_fpathconf_impl(PyModuleDef *module, int fd, int name);
+os_fpathconf_impl(PyModuleDef *module, int fd, int name)
 
 static PyObject *
 os_fpathconf(PyModuleDef *module, PyObject *args)
@@ -4736,7 +4755,7 @@
     {"pathconf", (PyCFunction)os_pathconf, METH_VARARGS|METH_KEYWORDS, os_pathconf__doc__},
 
 static long
-os_pathconf_impl(PyModuleDef *module, path_t *path, int name);
+os_pathconf_impl(PyModuleDef *module, path_t *path, int name)
 
 static PyObject *
 os_pathconf(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4777,7 +4796,7 @@
     {"confstr", (PyCFunction)os_confstr, METH_O, os_confstr__doc__},
 
 static PyObject *
-os_confstr_impl(PyModuleDef *module, int name);
+os_confstr_impl(PyModuleDef *module, int name)
 
 static PyObject *
 os_confstr(PyModuleDef *module, PyObject *arg)
@@ -4809,7 +4828,7 @@
     {"sysconf", (PyCFunction)os_sysconf, METH_O, os_sysconf__doc__},
 
 static long
-os_sysconf_impl(PyModuleDef *module, int name);
+os_sysconf_impl(PyModuleDef *module, int name)
 
 static PyObject *
 os_sysconf(PyModuleDef *module, PyObject *arg)
@@ -4893,7 +4912,7 @@
     {"device_encoding", (PyCFunction)os_device_encoding, METH_VARARGS|METH_KEYWORDS, os_device_encoding__doc__},
 
 static PyObject *
-os_device_encoding_impl(PyModuleDef *module, int fd);
+os_device_encoding_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_device_encoding(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -4924,7 +4943,7 @@
     {"setresuid", (PyCFunction)os_setresuid, METH_VARARGS, os_setresuid__doc__},
 
 static PyObject *
-os_setresuid_impl(PyModuleDef *module, uid_t ruid, uid_t euid, uid_t suid);
+os_setresuid_impl(PyModuleDef *module, uid_t ruid, uid_t euid, uid_t suid)
 
 static PyObject *
 os_setresuid(PyModuleDef *module, PyObject *args)
@@ -4958,7 +4977,7 @@
     {"setresgid", (PyCFunction)os_setresgid, METH_VARARGS, os_setresgid__doc__},
 
 static PyObject *
-os_setresgid_impl(PyModuleDef *module, gid_t rgid, gid_t egid, gid_t sgid);
+os_setresgid_impl(PyModuleDef *module, gid_t rgid, gid_t egid, gid_t sgid)
 
 static PyObject *
 os_setresgid(PyModuleDef *module, PyObject *args)
@@ -5041,7 +5060,8 @@
     {"getxattr", (PyCFunction)os_getxattr, METH_VARARGS|METH_KEYWORDS, os_getxattr__doc__},
 
 static PyObject *
-os_getxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute, int follow_symlinks);
+os_getxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute,
+                 int follow_symlinks)
 
 static PyObject *
 os_getxattr(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -5087,7 +5107,8 @@
     {"setxattr", (PyCFunction)os_setxattr, METH_VARARGS|METH_KEYWORDS, os_setxattr__doc__},
 
 static PyObject *
-os_setxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute, Py_buffer *value, int flags, int follow_symlinks);
+os_setxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute,
+                 Py_buffer *value, int flags, int follow_symlinks)
 
 static PyObject *
 os_setxattr(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -5137,7 +5158,8 @@
     {"removexattr", (PyCFunction)os_removexattr, METH_VARARGS|METH_KEYWORDS, os_removexattr__doc__},
 
 static PyObject *
-os_removexattr_impl(PyModuleDef *module, path_t *path, path_t *attribute, int follow_symlinks);
+os_removexattr_impl(PyModuleDef *module, path_t *path, path_t *attribute,
+                    int follow_symlinks)
 
 static PyObject *
 os_removexattr(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -5183,7 +5205,7 @@
     {"listxattr", (PyCFunction)os_listxattr, METH_VARARGS|METH_KEYWORDS, os_listxattr__doc__},
 
 static PyObject *
-os_listxattr_impl(PyModuleDef *module, path_t *path, int follow_symlinks);
+os_listxattr_impl(PyModuleDef *module, path_t *path, int follow_symlinks)
 
 static PyObject *
 os_listxattr(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -5218,7 +5240,7 @@
     {"urandom", (PyCFunction)os_urandom, METH_O, os_urandom__doc__},
 
 static PyObject *
-os_urandom_impl(PyModuleDef *module, Py_ssize_t size);
+os_urandom_impl(PyModuleDef *module, Py_ssize_t size)
 
 static PyObject *
 os_urandom(PyModuleDef *module, PyObject *arg)
@@ -5264,7 +5286,7 @@
     {"get_inheritable", (PyCFunction)os_get_inheritable, METH_O, os_get_inheritable__doc__},
 
 static int
-os_get_inheritable_impl(PyModuleDef *module, int fd);
+os_get_inheritable_impl(PyModuleDef *module, int fd)
 
 static PyObject *
 os_get_inheritable(PyModuleDef *module, PyObject *arg)
@@ -5296,7 +5318,7 @@
     {"set_inheritable", (PyCFunction)os_set_inheritable, METH_VARARGS, os_set_inheritable__doc__},
 
 static PyObject *
-os_set_inheritable_impl(PyModuleDef *module, int fd, int inheritable);
+os_set_inheritable_impl(PyModuleDef *module, int fd, int inheritable)
 
 static PyObject *
 os_set_inheritable(PyModuleDef *module, PyObject *args)
@@ -5327,7 +5349,7 @@
     {"get_handle_inheritable", (PyCFunction)os_get_handle_inheritable, METH_O, os_get_handle_inheritable__doc__},
 
 static int
-os_get_handle_inheritable_impl(PyModuleDef *module, Py_intptr_t handle);
+os_get_handle_inheritable_impl(PyModuleDef *module, Py_intptr_t handle)
 
 static PyObject *
 os_get_handle_inheritable(PyModuleDef *module, PyObject *arg)
@@ -5363,7 +5385,8 @@
     {"set_handle_inheritable", (PyCFunction)os_set_handle_inheritable, METH_VARARGS, os_set_handle_inheritable__doc__},
 
 static PyObject *
-os_set_handle_inheritable_impl(PyModuleDef *module, Py_intptr_t handle, int inheritable);
+os_set_handle_inheritable_impl(PyModuleDef *module, Py_intptr_t handle,
+                               int inheritable)
 
 static PyObject *
 os_set_handle_inheritable(PyModuleDef *module, PyObject *args)
@@ -5847,4 +5870,4 @@
 #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF
     #define OS_SET_HANDLE_INHERITABLE_METHODDEF
 #endif /* !defined(OS_SET_HANDLE_INHERITABLE_METHODDEF) */
-/*[clinic end generated code: output=22f405f79f87ba20 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=bbcc2699123cf6aa input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/pwdmodule.c.h
--- a/Modules/clinic/pwdmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/pwdmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -25,7 +25,7 @@
     {"getpwnam", (PyCFunction)pwd_getpwnam, METH_O, pwd_getpwnam__doc__},
 
 static PyObject *
-pwd_getpwnam_impl(PyModuleDef *module, PyObject *arg);
+pwd_getpwnam_impl(PyModuleDef *module, PyObject *arg)
 
 static PyObject *
 pwd_getpwnam(PyModuleDef *module, PyObject *arg_)
@@ -70,4 +70,4 @@
 #ifndef PWD_GETPWALL_METHODDEF
     #define PWD_GETPWALL_METHODDEF
 #endif /* !defined(PWD_GETPWALL_METHODDEF) */
-/*[clinic end generated code: output=e7d5ac24b20e91ae input=a9049054013a1b77]*/
+/*[clinic end generated code: output=65b97133ef4891ff input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/pyexpat.c.h
--- a/Modules/clinic/pyexpat.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/pyexpat.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -14,7 +14,8 @@
     {"Parse", (PyCFunction)pyexpat_xmlparser_Parse, METH_VARARGS, pyexpat_xmlparser_Parse__doc__},
 
 static PyObject *
-pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data, int isFinal);
+pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data,
+                             int isFinal)
 
 static PyObject *
 pyexpat_xmlparser_Parse(xmlparseobject *self, PyObject *args)
@@ -52,7 +53,7 @@
     {"SetBase", (PyCFunction)pyexpat_xmlparser_SetBase, METH_O, pyexpat_xmlparser_SetBase__doc__},
 
 static PyObject *
-pyexpat_xmlparser_SetBase_impl(xmlparseobject *self, const char *base);
+pyexpat_xmlparser_SetBase_impl(xmlparseobject *self, const char *base)
 
 static PyObject *
 pyexpat_xmlparser_SetBase(xmlparseobject *self, PyObject *arg)
@@ -119,7 +120,9 @@
     {"ExternalEntityParserCreate", (PyCFunction)pyexpat_xmlparser_ExternalEntityParserCreate, METH_VARARGS, pyexpat_xmlparser_ExternalEntityParserCreate__doc__},
 
 static PyObject *
-pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self, const char *context, const char *encoding);
+pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self,
+                                                  const char *context,
+                                                  const char *encoding)
 
 static PyObject *
 pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyObject *args)
@@ -153,7 +156,7 @@
     {"SetParamEntityParsing", (PyCFunction)pyexpat_xmlparser_SetParamEntityParsing, METH_O, pyexpat_xmlparser_SetParamEntityParsing__doc__},
 
 static PyObject *
-pyexpat_xmlparser_SetParamEntityParsing_impl(xmlparseobject *self, int flag);
+pyexpat_xmlparser_SetParamEntityParsing_impl(xmlparseobject *self, int flag)
 
 static PyObject *
 pyexpat_xmlparser_SetParamEntityParsing(xmlparseobject *self, PyObject *arg)
@@ -187,7 +190,7 @@
     {"UseForeignDTD", (PyCFunction)pyexpat_xmlparser_UseForeignDTD, METH_VARARGS, pyexpat_xmlparser_UseForeignDTD__doc__},
 
 static PyObject *
-pyexpat_xmlparser_UseForeignDTD_impl(xmlparseobject *self, int flag);
+pyexpat_xmlparser_UseForeignDTD_impl(xmlparseobject *self, int flag)
 
 static PyObject *
 pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyObject *args)
@@ -235,7 +238,8 @@
     {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_VARARGS|METH_KEYWORDS, pyexpat_ParserCreate__doc__},
 
 static PyObject *
-pyexpat_ParserCreate_impl(PyModuleDef *module, const char *encoding, const char *namespace_separator, PyObject *intern);
+pyexpat_ParserCreate_impl(PyModuleDef *module, const char *encoding,
+                          const char *namespace_separator, PyObject *intern)
 
 static PyObject *
 pyexpat_ParserCreate(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -266,7 +270,7 @@
     {"ErrorString", (PyCFunction)pyexpat_ErrorString, METH_O, pyexpat_ErrorString__doc__},
 
 static PyObject *
-pyexpat_ErrorString_impl(PyModuleDef *module, long code);
+pyexpat_ErrorString_impl(PyModuleDef *module, long code)
 
 static PyObject *
 pyexpat_ErrorString(PyModuleDef *module, PyObject *arg)
@@ -287,4 +291,4 @@
 #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
     #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
 #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */
-/*[clinic end generated code: output=e5993de4e9dd2236 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=31040df46dd540e0 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/sha1module.c.h
--- a/Modules/clinic/sha1module.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/sha1module.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -75,7 +75,7 @@
     {"sha1", (PyCFunction)_sha1_sha1, METH_VARARGS|METH_KEYWORDS, _sha1_sha1__doc__},
 
 static PyObject *
-_sha1_sha1_impl(PyModuleDef *module, PyObject *string);
+_sha1_sha1_impl(PyModuleDef *module, PyObject *string)
 
 static PyObject *
 _sha1_sha1(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -93,4 +93,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b2890b9ca964b217 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d02b770b3f56d016 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/sha256module.c.h
--- a/Modules/clinic/sha256module.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/sha256module.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -75,7 +75,7 @@
     {"sha256", (PyCFunction)_sha256_sha256, METH_VARARGS|METH_KEYWORDS, _sha256_sha256__doc__},
 
 static PyObject *
-_sha256_sha256_impl(PyModuleDef *module, PyObject *string);
+_sha256_sha256_impl(PyModuleDef *module, PyObject *string)
 
 static PyObject *
 _sha256_sha256(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -104,7 +104,7 @@
     {"sha224", (PyCFunction)_sha256_sha224, METH_VARARGS|METH_KEYWORDS, _sha256_sha224__doc__},
 
 static PyObject *
-_sha256_sha224_impl(PyModuleDef *module, PyObject *string);
+_sha256_sha224_impl(PyModuleDef *module, PyObject *string)
 
 static PyObject *
 _sha256_sha224(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -122,4 +122,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=8a0520371b097358 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=48a9f62319f247ac input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/sha512module.c.h
--- a/Modules/clinic/sha512module.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/sha512module.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -93,7 +93,7 @@
     {"sha512", (PyCFunction)_sha512_sha512, METH_VARARGS|METH_KEYWORDS, _sha512_sha512__doc__},
 
 static PyObject *
-_sha512_sha512_impl(PyModuleDef *module, PyObject *string);
+_sha512_sha512_impl(PyModuleDef *module, PyObject *string)
 
 static PyObject *
 _sha512_sha512(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -126,7 +126,7 @@
     {"sha384", (PyCFunction)_sha512_sha384, METH_VARARGS|METH_KEYWORDS, _sha512_sha384__doc__},
 
 static PyObject *
-_sha512_sha384_impl(PyModuleDef *module, PyObject *string);
+_sha512_sha384_impl(PyModuleDef *module, PyObject *string)
 
 static PyObject *
 _sha512_sha384(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -170,4 +170,4 @@
 #ifndef _SHA512_SHA384_METHODDEF
     #define _SHA512_SHA384_METHODDEF
 #endif /* !defined(_SHA512_SHA384_METHODDEF) */
-/*[clinic end generated code: output=de7bda19fde49310 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=19add3bb0bfd83c0 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/spwdmodule.c.h
--- a/Modules/clinic/spwdmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/spwdmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -16,7 +16,7 @@
     {"getspnam", (PyCFunction)spwd_getspnam, METH_O, spwd_getspnam__doc__},
 
 static PyObject *
-spwd_getspnam_impl(PyModuleDef *module, PyObject *arg);
+spwd_getspnam_impl(PyModuleDef *module, PyObject *arg)
 
 static PyObject *
 spwd_getspnam(PyModuleDef *module, PyObject *arg_)
@@ -67,4 +67,4 @@
 #ifndef SPWD_GETSPALL_METHODDEF
     #define SPWD_GETSPALL_METHODDEF
 #endif /* !defined(SPWD_GETSPALL_METHODDEF) */
-/*[clinic end generated code: output=67a4f8c47008f28f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4fc11ae7078094eb input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/unicodedata.c.h
--- a/Modules/clinic/unicodedata.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/unicodedata.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -16,7 +16,9 @@
     {"decimal", (PyCFunction)unicodedata_UCD_decimal, METH_VARARGS, unicodedata_UCD_decimal__doc__},
 
 static PyObject *
-unicodedata_UCD_decimal_impl(PreviousDBVersion *self, PyUnicodeObject *unichr, PyObject *default_value);
+unicodedata_UCD_decimal_impl(PreviousDBVersion *self,
+                             PyUnicodeObject *unichr,
+                             PyObject *default_value)
 
 static PyObject *
 unicodedata_UCD_decimal(PreviousDBVersion *self, PyObject *args)
@@ -34,4 +36,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=15b82651419cc823 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=57f21018e91b017c input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/clinic/zlibmodule.c.h
--- a/Modules/clinic/zlibmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/clinic/zlibmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -17,7 +17,7 @@
     {"compress", (PyCFunction)zlib_compress, METH_VARARGS, zlib_compress__doc__},
 
 static PyObject *
-zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int level);
+zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int level)
 
 static PyObject *
 zlib_compress(PyModuleDef *module, PyObject *args)
@@ -57,7 +57,8 @@
     {"decompress", (PyCFunction)zlib_decompress, METH_VARARGS, zlib_decompress__doc__},
 
 static PyObject *
-zlib_decompress_impl(PyModuleDef *module, Py_buffer *data, int wbits, unsigned int bufsize);
+zlib_decompress_impl(PyModuleDef *module, Py_buffer *data, int wbits,
+                     unsigned int bufsize)
 
 static PyObject *
 zlib_decompress(PyModuleDef *module, PyObject *args)
@@ -111,7 +112,8 @@
     {"compressobj", (PyCFunction)zlib_compressobj, METH_VARARGS|METH_KEYWORDS, zlib_compressobj__doc__},
 
 static PyObject *
-zlib_compressobj_impl(PyModuleDef *module, int level, int method, int wbits, int memLevel, int strategy, Py_buffer *zdict);
+zlib_compressobj_impl(PyModuleDef *module, int level, int method, int wbits,
+                      int memLevel, int strategy, Py_buffer *zdict)
 
 static PyObject *
 zlib_compressobj(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -155,7 +157,7 @@
     {"decompressobj", (PyCFunction)zlib_decompressobj, METH_VARARGS|METH_KEYWORDS, zlib_decompressobj__doc__},
 
 static PyObject *
-zlib_decompressobj_impl(PyModuleDef *module, int wbits, PyObject *zdict);
+zlib_decompressobj_impl(PyModuleDef *module, int wbits, PyObject *zdict)
 
 static PyObject *
 zlib_decompressobj(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -192,7 +194,7 @@
     {"compress", (PyCFunction)zlib_Compress_compress, METH_O, zlib_Compress_compress__doc__},
 
 static PyObject *
-zlib_Compress_compress_impl(compobject *self, Py_buffer *data);
+zlib_Compress_compress_impl(compobject *self, Py_buffer *data)
 
 static PyObject *
 zlib_Compress_compress(compobject *self, PyObject *arg)
@@ -235,7 +237,8 @@
     {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_VARARGS, zlib_Decompress_decompress__doc__},
 
 static PyObject *
-zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, unsigned int max_length);
+zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data,
+                                unsigned int max_length)
 
 static PyObject *
 zlib_Decompress_decompress(compobject *self, PyObject *args)
@@ -274,7 +277,7 @@
     {"flush", (PyCFunction)zlib_Compress_flush, METH_VARARGS, zlib_Compress_flush__doc__},
 
 static PyObject *
-zlib_Compress_flush_impl(compobject *self, int mode);
+zlib_Compress_flush_impl(compobject *self, int mode)
 
 static PyObject *
 zlib_Compress_flush(compobject *self, PyObject *args)
@@ -349,7 +352,7 @@
     {"flush", (PyCFunction)zlib_Decompress_flush, METH_VARARGS, zlib_Decompress_flush__doc__},
 
 static PyObject *
-zlib_Decompress_flush_impl(compobject *self, unsigned int length);
+zlib_Decompress_flush_impl(compobject *self, unsigned int length)
 
 static PyObject *
 zlib_Decompress_flush(compobject *self, PyObject *args)
@@ -382,7 +385,7 @@
     {"adler32", (PyCFunction)zlib_adler32, METH_VARARGS, zlib_adler32__doc__},
 
 static PyObject *
-zlib_adler32_impl(PyModuleDef *module, Py_buffer *data, unsigned int value);
+zlib_adler32_impl(PyModuleDef *module, Py_buffer *data, unsigned int value)
 
 static PyObject *
 zlib_adler32(PyModuleDef *module, PyObject *args)
@@ -420,7 +423,7 @@
     {"crc32", (PyCFunction)zlib_crc32, METH_VARARGS, zlib_crc32__doc__},
 
 static PyObject *
-zlib_crc32_impl(PyModuleDef *module, Py_buffer *data, unsigned int value);
+zlib_crc32_impl(PyModuleDef *module, Py_buffer *data, unsigned int value)
 
 static PyObject *
 zlib_crc32(PyModuleDef *module, PyObject *args)
@@ -446,4 +449,4 @@
 #ifndef ZLIB_COMPRESS_COPY_METHODDEF
     #define ZLIB_COMPRESS_COPY_METHODDEF
 #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */
-/*[clinic end generated code: output=0743b1aa908f0b68 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=977be82a9c7cbacc input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Modules/fcntlmodule.c
--- a/Modules/fcntlmodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/fcntlmodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -146,8 +146,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-fcntl_ioctl_impl(PyModuleDef *module, int fd, unsigned int code, PyObject *ob_arg, int mutate_arg)
-/*[clinic end generated code: output=ad47738c118622bf input=ede70c433cccbbb2]*/
+fcntl_ioctl_impl(PyModuleDef *module, int fd, unsigned int code,
+                 PyObject *ob_arg, int mutate_arg)
+/*[clinic end generated code: output=102faa0f7ebe2210 input=ede70c433cccbbb2]*/
 {
 #define IOCTL_BUFSZ 1024
     /* We use the unsigned non-checked 'I' format for the 'code' parameter
@@ -357,8 +358,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-fcntl_lockf_impl(PyModuleDef *module, int fd, int code, PyObject *lenobj, PyObject *startobj, int whence)
-/*[clinic end generated code: output=5536df2892bf3ce9 input=9c594391de821f24]*/
+fcntl_lockf_impl(PyModuleDef *module, int fd, int code, PyObject *lenobj,
+                 PyObject *startobj, int whence)
+/*[clinic end generated code: output=31af35eba08b9af7 input=9c594391de821f24]*/
 {
     int ret;
 
diff -r a5a2b33993e3 Modules/posixmodule.c
--- a/Modules/posixmodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/posixmodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -2476,8 +2476,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_stat_impl(PyModuleDef *module, path_t *path, int dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=708c225f94fcfc8e input=099d356c306fa24a]*/
+os_stat_impl(PyModuleDef *module, path_t *path, int dir_fd,
+             int follow_symlinks)
+/*[clinic end generated code: output=e4f7569f95d523ca input=099d356c306fa24a]*/
 {
     return posix_do_stat("stat", path, dir_fd, follow_symlinks);
 }
@@ -2547,8 +2548,9 @@
 [clinic start generated code]*/
 
 static int
-os_access_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd, int effective_ids, int follow_symlinks)
-/*[clinic end generated code: output=f9e734db3d88b767 input=b75a756797af45ec]*/
+os_access_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd,
+               int effective_ids, int follow_symlinks)
+/*[clinic end generated code: output=abaa53340210088d input=b75a756797af45ec]*/
 {
     int return_value;
 
@@ -2775,8 +2777,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_chmod_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=96063c976f23106a input=7f1618e5e15cc196]*/
+os_chmod_impl(PyModuleDef *module, path_t *path, int mode, int dir_fd,
+              int follow_symlinks)
+/*[clinic end generated code: output=05e7f73b1a843ba2 input=7f1618e5e15cc196]*/
 {
     int result;
 
@@ -2956,8 +2959,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_chflags_impl(PyModuleDef *module, path_t *path, unsigned long flags, int follow_symlinks)
-/*[clinic end generated code: output=9e5f9417afc20c4b input=0327e29feb876236]*/
+os_chflags_impl(PyModuleDef *module, path_t *path, unsigned long flags,
+                int follow_symlinks)
+/*[clinic end generated code: output=ff2d6e73534a95b9 input=0327e29feb876236]*/
 {
     int result;
 
@@ -3136,8 +3140,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_chown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid, int dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=59a8db91897fb46c input=a61cc35574814d5d]*/
+os_chown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid,
+              int dir_fd, int follow_symlinks)
+/*[clinic end generated code: output=e0a4559f394dbd91 input=a61cc35574814d5d]*/
 {
     int result;
 
@@ -3365,8 +3370,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_link_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=c0a9ded8111d2a79 input=b0095ebbcbaa7e04]*/
+os_link_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd,
+             int dst_dir_fd, int follow_symlinks)
+/*[clinic end generated code: output=f47a7e88f7b391b6 input=b0095ebbcbaa7e04]*/
 {
 #ifdef MS_WINDOWS
     BOOL result;
@@ -4162,8 +4168,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_rename_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd)
-/*[clinic end generated code: output=1bb520bf2fad186d input=faa61c847912c850]*/
+os_rename_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd,
+               int dst_dir_fd)
+/*[clinic end generated code: output=08033bb2ec27fb5f input=faa61c847912c850]*/
 {
     return internal_rename(src, dst, src_dir_fd, dst_dir_fd, 0);
 }
@@ -4182,8 +4189,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_replace_impl(PyModuleDef *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd)
-/*[clinic end generated code: output=aa9ddad55fdef8e3 input=25515dfb107c8421]*/
+os_replace_impl(PyModuleDef *module, path_t *src, path_t *dst,
+                int src_dir_fd, int dst_dir_fd)
+/*[clinic end generated code: output=131d012eed8d3b8b input=25515dfb107c8421]*/
 {
     return internal_rename(src, dst, src_dir_fd, dst_dir_fd, 1);
 }
@@ -4697,8 +4705,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times, PyObject *ns, int dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=c52d8fd0d1067f0b input=1f18c17d5941aa82]*/
+os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times,
+              PyObject *ns, int dir_fd, int follow_symlinks)
+/*[clinic end generated code: output=31f3434e560ba2f0 input=1f18c17d5941aa82]*/
 {
 #ifdef MS_WINDOWS
     HANDLE hFile;
@@ -5072,8 +5081,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_execve_impl(PyModuleDef *module, path_t *path, PyObject *argv, PyObject *env)
-/*[clinic end generated code: output=7758d4f230d8aac6 input=626804fa092606d9]*/
+os_execve_impl(PyModuleDef *module, path_t *path, PyObject *argv,
+               PyObject *env)
+/*[clinic end generated code: output=181884fcdb21508e input=626804fa092606d9]*/
 {
     char **argvlist = NULL;
     char **envlist;
@@ -5219,8 +5229,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_spawnve_impl(PyModuleDef *module, int mode, PyObject *path, PyObject *argv, PyObject *env)
-/*[clinic end generated code: output=1c52955789461be8 input=02362fd937963f8f]*/
+os_spawnve_impl(PyModuleDef *module, int mode, PyObject *path,
+                PyObject *argv, PyObject *env)
+/*[clinic end generated code: output=e7f5f0703610531f input=02362fd937963f8f]*/
 {
     char *path_char;
     char **argvlist;
@@ -5521,8 +5532,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_sched_setscheduler_impl(PyModuleDef *module, pid_t pid, int policy, struct sched_param *param)
-/*[clinic end generated code: output=97f40f8384e554b0 input=c581f9469a5327dd]*/
+os_sched_setscheduler_impl(PyModuleDef *module, pid_t pid, int policy,
+                           struct sched_param *param)
+/*[clinic end generated code: output=37053e5c528c35c9 input=c581f9469a5327dd]*/
 {
     /*
     ** sched_setscheduler() returns 0 in Linux, but the previous
@@ -5584,8 +5596,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_sched_setparam_impl(PyModuleDef *module, pid_t pid, struct sched_param *param)
-/*[clinic end generated code: output=c6560b34395bb343 input=6b8d6dfcecdc21bd]*/
+os_sched_setparam_impl(PyModuleDef *module, pid_t pid,
+                       struct sched_param *param)
+/*[clinic end generated code: output=b7a3c589436cec9b input=6b8d6dfcecdc21bd]*/
 {
     if (sched_setparam(pid, param))
         return posix_error();
@@ -7353,8 +7366,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_symlink_impl(PyModuleDef *module, path_t *src, path_t *dst, int target_is_directory, int dir_fd)
-/*[clinic end generated code: output=11aa03f278bb2c8a input=e820ec4472547bc3]*/
+os_symlink_impl(PyModuleDef *module, path_t *src, path_t *dst,
+                int target_is_directory, int dir_fd)
+/*[clinic end generated code: output=a01b4bcf32403ccd input=e820ec4472547bc3]*/
 {
 #ifdef MS_WINDOWS
     DWORD result;
@@ -7677,8 +7691,9 @@
 [clinic start generated code]*/
 
 static int
-os_open_impl(PyModuleDef *module, path_t *path, int flags, int mode, int dir_fd)
-/*[clinic end generated code: output=c95a64f0e62f199b input=ad8623b29acd2934]*/
+os_open_impl(PyModuleDef *module, path_t *path, int flags, int mode,
+             int dir_fd)
+/*[clinic end generated code: output=47e8cc63559f5ddd input=ad8623b29acd2934]*/
 {
     int fd;
     int async_err = 0;
@@ -8606,8 +8621,9 @@
 [clinic start generated code]*/
 
 static Py_ssize_t
-os_pwrite_impl(PyModuleDef *module, int fd, Py_buffer *buffer, Py_off_t offset)
-/*[clinic end generated code: output=95225f3b496feaf3 input=19903f1b3dd26377]*/
+os_pwrite_impl(PyModuleDef *module, int fd, Py_buffer *buffer,
+               Py_off_t offset)
+/*[clinic end generated code: output=93aabdb40e17d325 input=19903f1b3dd26377]*/
 {
     Py_ssize_t size;
     int async_err = 0;
@@ -8701,8 +8717,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_mknod_impl(PyModuleDef *module, path_t *path, int mode, dev_t device, int dir_fd)
-/*[clinic end generated code: output=f7f813e8847de12f input=ee44531551a4d83b]*/
+os_mknod_impl(PyModuleDef *module, path_t *path, int mode, dev_t device,
+              int dir_fd)
+/*[clinic end generated code: output=5151a8a9f754d272 input=ee44531551a4d83b]*/
 {
     int result;
     int async_err = 0;
@@ -8897,8 +8914,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_posix_fallocate_impl(PyModuleDef *module, int fd, Py_off_t offset, Py_off_t length)
-/*[clinic end generated code: output=8ae5f7837004d454 input=d7a2ef0ab2ca52fb]*/
+os_posix_fallocate_impl(PyModuleDef *module, int fd, Py_off_t offset,
+                        Py_off_t length)
+/*[clinic end generated code: output=7f6f87a8c751e1b4 input=d7a2ef0ab2ca52fb]*/
 {
     int result;
     int async_err = 0;
@@ -8938,8 +8956,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_posix_fadvise_impl(PyModuleDef *module, int fd, Py_off_t offset, Py_off_t length, int advice)
-/*[clinic end generated code: output=0e3f09f651661257 input=0fbe554edc2f04b5]*/
+os_posix_fadvise_impl(PyModuleDef *module, int fd, Py_off_t offset,
+                      Py_off_t length, int advice)
+/*[clinic end generated code: output=457ce6a67189e10d input=0fbe554edc2f04b5]*/
 {
     int result;
     int async_err = 0;
@@ -10785,8 +10804,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_getxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute, int follow_symlinks)
-/*[clinic end generated code: output=d90086b314859f8b input=8c8ea3bab78d89c2]*/
+os_getxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute,
+                 int follow_symlinks)
+/*[clinic end generated code: output=cf2cede74bd5d412 input=8c8ea3bab78d89c2]*/
 {
     Py_ssize_t i;
     PyObject *buffer = NULL;
@@ -10856,8 +10876,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_setxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute, Py_buffer *value, int flags, int follow_symlinks)
-/*[clinic end generated code: output=e3defa5c4b1ad0ae input=f0d26833992015c2]*/
+os_setxattr_impl(PyModuleDef *module, path_t *path, path_t *attribute,
+                 Py_buffer *value, int flags, int follow_symlinks)
+/*[clinic end generated code: output=1b395ef82880fea0 input=f0d26833992015c2]*/
 {
     ssize_t result;
 
@@ -10903,8 +10924,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_removexattr_impl(PyModuleDef *module, path_t *path, path_t *attribute, int follow_symlinks)
-/*[clinic end generated code: output=4870ec90249af875 input=cdb54834161e3329]*/
+os_removexattr_impl(PyModuleDef *module, path_t *path, path_t *attribute,
+                    int follow_symlinks)
+/*[clinic end generated code: output=f92bb39ab992650d input=cdb54834161e3329]*/
 {
     ssize_t result;
 
@@ -11293,8 +11315,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-os_set_handle_inheritable_impl(PyModuleDef *module, Py_intptr_t handle, int inheritable)
-/*[clinic end generated code: output=627aa5b158b69338 input=e64b2b2730469def]*/
+os_set_handle_inheritable_impl(PyModuleDef *module, Py_intptr_t handle,
+                               int inheritable)
+/*[clinic end generated code: output=d2e111a96c9eb296 input=e64b2b2730469def]*/
 {
     DWORD flags = inheritable ? HANDLE_FLAG_INHERIT : 0;
     if (!SetHandleInformation((HANDLE)handle, HANDLE_FLAG_INHERIT, flags)) {
diff -r a5a2b33993e3 Modules/pyexpat.c
--- a/Modules/pyexpat.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/pyexpat.c	Tue Apr 14 15:32:07 2015 -0400
@@ -716,8 +716,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data, int isFinal)
-/*[clinic end generated code: output=2d4dc77f4d434854 input=e37b81b8948ca7e0]*/
+pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data,
+                             int isFinal)
+/*[clinic end generated code: output=37e105d55645b0f2 input=e37b81b8948ca7e0]*/
 {
     const char *s;
     Py_ssize_t slen;
@@ -918,8 +919,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self, const char *context, const char *encoding)
-/*[clinic end generated code: output=942f300ed0e56054 input=283206575d960272]*/
+pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self,
+                                                  const char *context,
+                                                  const char *encoding)
+/*[clinic end generated code: output=535cda9d7a0fbcd6 input=283206575d960272]*/
 {
     xmlparseobject *new_parser;
     int i;
@@ -1551,8 +1554,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-pyexpat_ParserCreate_impl(PyModuleDef *module, const char *encoding, const char *namespace_separator, PyObject *intern)
-/*[clinic end generated code: output=b839b60992d8ce71 input=71b9f471aa6f8f86]*/
+pyexpat_ParserCreate_impl(PyModuleDef *module, const char *encoding,
+                          const char *namespace_separator, PyObject *intern)
+/*[clinic end generated code: output=81fccd233e1743a8 input=71b9f471aa6f8f86]*/
 {
     PyObject *result;
     int intern_decref = 0;
diff -r a5a2b33993e3 Modules/unicodedata.c
--- a/Modules/unicodedata.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/unicodedata.c	Tue Apr 14 15:32:07 2015 -0400
@@ -133,8 +133,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-unicodedata_UCD_decimal_impl(PreviousDBVersion *self, PyUnicodeObject *unichr, PyObject *default_value)
-/*[clinic end generated code: output=d285215533b58b28 input=c25c9d2b4de076b1]*/
+unicodedata_UCD_decimal_impl(PreviousDBVersion *self,
+                             PyUnicodeObject *unichr,
+                             PyObject *default_value)
+/*[clinic end generated code: output=bf853108f246ba19 input=c25c9d2b4de076b1]*/
 {
     int have_old = 0;
     long rc;
diff -r a5a2b33993e3 Modules/zlibmodule.c
--- a/Modules/zlibmodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Modules/zlibmodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -280,8 +280,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-zlib_decompress_impl(PyModuleDef *module, Py_buffer *data, int wbits, unsigned int bufsize)
-/*[clinic end generated code: output=9e5464e72df9cb5f input=0f4b9abb7103f50e]*/
+zlib_decompress_impl(PyModuleDef *module, Py_buffer *data, int wbits,
+                     unsigned int bufsize)
+/*[clinic end generated code: output=444d0987f3429574 input=0f4b9abb7103f50e]*/
 {
     PyObject *result_str = NULL;
     Byte *input;
@@ -410,8 +411,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-zlib_compressobj_impl(PyModuleDef *module, int level, int method, int wbits, int memLevel, int strategy, Py_buffer *zdict)
-/*[clinic end generated code: output=89e5a6c1449caa9e input=b034847f8821f6af]*/
+zlib_compressobj_impl(PyModuleDef *module, int level, int method, int wbits,
+                      int memLevel, int strategy, Py_buffer *zdict)
+/*[clinic end generated code: output=2949bbb9a5723ccd input=b034847f8821f6af]*/
 {
     compobject *self = NULL;
     int err;
@@ -703,8 +705,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, unsigned int max_length)
-/*[clinic end generated code: output=755cccc9087bfe55 input=02cfc047377cec86]*/
+zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data,
+                                unsigned int max_length)
+/*[clinic end generated code: output=b82e2a2c19f5fe7b input=02cfc047377cec86]*/
 {
     int err;
     unsigned int old_length, length = DEF_BUF_SIZE;
diff -r a5a2b33993e3 Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Objects/bytearrayobject.c	Tue Apr 14 15:32:07 2015 -0400
@@ -1524,8 +1524,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, int group_right_1, PyObject *deletechars)
-/*[clinic end generated code: output=fa3ea4f9a8d58bc7 input=b749ad85f4860824]*/
+bytearray_translate_impl(PyByteArrayObject *self, PyObject *table,
+                         int group_right_1, PyObject *deletechars)
+/*[clinic end generated code: output=2bebc86a9a1ff083 input=b749ad85f4860824]*/
 {
     char *input, *output;
     const char *table_chars;
@@ -2142,8 +2143,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count)
-/*[clinic end generated code: output=3fc105c8232d7b3f input=aa379d988637c7fb]*/
+bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old,
+                       Py_buffer *new, Py_ssize_t count)
+/*[clinic end generated code: output=d39884c4dc59412a input=aa379d988637c7fb]*/
 {
     return (PyObject *)replace((PyByteArrayObject *) self,
                                old->buf, old->len,
@@ -2165,8 +2167,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytearray_split_impl(PyByteArrayObject *self, PyObject *sep, Py_ssize_t maxsplit)
-/*[clinic end generated code: output=cdccf5a29dbf7eb5 input=24f82669f41bf523]*/
+bytearray_split_impl(PyByteArrayObject *self, PyObject *sep,
+                     Py_ssize_t maxsplit)
+/*[clinic end generated code: output=833e2cf385d9a04d input=24f82669f41bf523]*/
 {
     Py_ssize_t len = PyByteArray_GET_SIZE(self), n;
     const char *s = PyByteArray_AS_STRING(self), *sub;
@@ -2276,8 +2279,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep, Py_ssize_t maxsplit)
-/*[clinic end generated code: output=4d648cf3ac65c9e9 input=a68286e4dd692ffe]*/
+bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep,
+                      Py_ssize_t maxsplit)
+/*[clinic end generated code: output=a55e0b5a03cb6190 input=a68286e4dd692ffe]*/
 {
     Py_ssize_t len = PyByteArray_GET_SIZE(self), n;
     const char *s = PyByteArray_AS_STRING(self), *sub;
@@ -2730,8 +2734,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytearray_decode_impl(PyByteArrayObject *self, const char *encoding, const char *errors)
-/*[clinic end generated code: output=7e64e2cc91573b26 input=f28d8f903020257b]*/
+bytearray_decode_impl(PyByteArrayObject *self, const char *encoding,
+                      const char *errors)
+/*[clinic end generated code: output=f57d43f4a00b42c5 input=f28d8f903020257b]*/
 {
     if (encoding == NULL)
         encoding = PyUnicode_GetDefaultEncoding();
diff -r a5a2b33993e3 Objects/bytesobject.c
--- a/Objects/bytesobject.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Objects/bytesobject.c	Tue Apr 14 15:32:07 2015 -0400
@@ -2113,8 +2113,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1, PyObject *deletechars)
-/*[clinic end generated code: output=0ddd2cef4f4918f2 input=d8fa5519d7cc4be7]*/
+bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1,
+                     PyObject *deletechars)
+/*[clinic end generated code: output=233df850eb50bf8d input=d8fa5519d7cc4be7]*/
 {
     char *input, *output;
     Py_buffer table_view = {NULL, NULL};
@@ -2761,8 +2762,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytes_replace_impl(PyBytesObject*self, Py_buffer *old, Py_buffer *new, Py_ssize_t count)
-/*[clinic end generated code: output=3fe052c3c60cffc2 input=b2fbbf0bf04de8e5]*/
+bytes_replace_impl(PyBytesObject*self, Py_buffer *old, Py_buffer *new,
+                   Py_ssize_t count)
+/*[clinic end generated code: output=403dc9d7a83c5a1d input=b2fbbf0bf04de8e5]*/
 {
     return (PyObject *)replace((PyBytesObject *) self,
                                (const char *)old->buf, old->len,
@@ -2929,8 +2931,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-bytes_decode_impl(PyBytesObject*self, const char *encoding, const char *errors)
-/*[clinic end generated code: output=8038751c823b9038 input=958174769d2a40ca]*/
+bytes_decode_impl(PyBytesObject*self, const char *encoding,
+                  const char *errors)
+/*[clinic end generated code: output=2d2016ff8e0bb176 input=958174769d2a40ca]*/
 {
     return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors);
 }
diff -r a5a2b33993e3 Objects/clinic/bytearrayobject.c.h
--- a/Objects/clinic/bytearrayobject.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Objects/clinic/bytearrayobject.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -52,7 +52,8 @@
     {"translate", (PyCFunction)bytearray_translate, METH_VARARGS, bytearray_translate__doc__},
 
 static PyObject *
-bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, int group_right_1, PyObject *deletechars);
+bytearray_translate_impl(PyByteArrayObject *self, PyObject *table,
+                         int group_right_1, PyObject *deletechars)
 
 static PyObject *
 bytearray_translate(PyByteArrayObject *self, PyObject *args)
@@ -97,7 +98,7 @@
     {"maketrans", (PyCFunction)bytearray_maketrans, METH_VARARGS|METH_STATIC, bytearray_maketrans__doc__},
 
 static PyObject *
-bytearray_maketrans_impl(Py_buffer *frm, Py_buffer *to);
+bytearray_maketrans_impl(Py_buffer *frm, Py_buffer *to)
 
 static PyObject *
 bytearray_maketrans(void *null, PyObject *args)
@@ -140,7 +141,8 @@
     {"replace", (PyCFunction)bytearray_replace, METH_VARARGS, bytearray_replace__doc__},
 
 static PyObject *
-bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count);
+bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old,
+                       Py_buffer *new, Py_ssize_t count)
 
 static PyObject *
 bytearray_replace(PyByteArrayObject *self, PyObject *args)
@@ -185,7 +187,8 @@
     {"split", (PyCFunction)bytearray_split, METH_VARARGS|METH_KEYWORDS, bytearray_split__doc__},
 
 static PyObject *
-bytearray_split_impl(PyByteArrayObject *self, PyObject *sep, Py_ssize_t maxsplit);
+bytearray_split_impl(PyByteArrayObject *self, PyObject *sep,
+                     Py_ssize_t maxsplit)
 
 static PyObject *
 bytearray_split(PyByteArrayObject *self, PyObject *args, PyObject *kwargs)
@@ -257,7 +260,8 @@
     {"rsplit", (PyCFunction)bytearray_rsplit, METH_VARARGS|METH_KEYWORDS, bytearray_rsplit__doc__},
 
 static PyObject *
-bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep, Py_ssize_t maxsplit);
+bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep,
+                      Py_ssize_t maxsplit)
 
 static PyObject *
 bytearray_rsplit(PyByteArrayObject *self, PyObject *args, PyObject *kwargs)
@@ -310,7 +314,7 @@
     {"insert", (PyCFunction)bytearray_insert, METH_VARARGS, bytearray_insert__doc__},
 
 static PyObject *
-bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item);
+bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item)
 
 static PyObject *
 bytearray_insert(PyByteArrayObject *self, PyObject *args)
@@ -342,7 +346,7 @@
     {"append", (PyCFunction)bytearray_append, METH_O, bytearray_append__doc__},
 
 static PyObject *
-bytearray_append_impl(PyByteArrayObject *self, int item);
+bytearray_append_impl(PyByteArrayObject *self, int item)
 
 static PyObject *
 bytearray_append(PyByteArrayObject *self, PyObject *arg)
@@ -388,7 +392,7 @@
     {"pop", (PyCFunction)bytearray_pop, METH_VARARGS, bytearray_pop__doc__},
 
 static PyObject *
-bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index);
+bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index)
 
 static PyObject *
 bytearray_pop(PyByteArrayObject *self, PyObject *args)
@@ -419,7 +423,7 @@
     {"remove", (PyCFunction)bytearray_remove, METH_O, bytearray_remove__doc__},
 
 static PyObject *
-bytearray_remove_impl(PyByteArrayObject *self, int value);
+bytearray_remove_impl(PyByteArrayObject *self, int value)
 
 static PyObject *
 bytearray_remove(PyByteArrayObject *self, PyObject *arg)
@@ -449,7 +453,7 @@
     {"strip", (PyCFunction)bytearray_strip, METH_VARARGS, bytearray_strip__doc__},
 
 static PyObject *
-bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes);
+bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes)
 
 static PyObject *
 bytearray_strip(PyByteArrayObject *self, PyObject *args)
@@ -479,7 +483,7 @@
     {"lstrip", (PyCFunction)bytearray_lstrip, METH_VARARGS, bytearray_lstrip__doc__},
 
 static PyObject *
-bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes);
+bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes)
 
 static PyObject *
 bytearray_lstrip(PyByteArrayObject *self, PyObject *args)
@@ -509,7 +513,7 @@
     {"rstrip", (PyCFunction)bytearray_rstrip, METH_VARARGS, bytearray_rstrip__doc__},
 
 static PyObject *
-bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes);
+bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes)
 
 static PyObject *
 bytearray_rstrip(PyByteArrayObject *self, PyObject *args)
@@ -546,7 +550,8 @@
     {"decode", (PyCFunction)bytearray_decode, METH_VARARGS|METH_KEYWORDS, bytearray_decode__doc__},
 
 static PyObject *
-bytearray_decode_impl(PyByteArrayObject *self, const char *encoding, const char *errors);
+bytearray_decode_impl(PyByteArrayObject *self, const char *encoding,
+                      const char *errors)
 
 static PyObject *
 bytearray_decode(PyByteArrayObject *self, PyObject *args, PyObject *kwargs)
@@ -592,7 +597,7 @@
     {"splitlines", (PyCFunction)bytearray_splitlines, METH_VARARGS|METH_KEYWORDS, bytearray_splitlines__doc__},
 
 static PyObject *
-bytearray_splitlines_impl(PyByteArrayObject *self, int keepends);
+bytearray_splitlines_impl(PyByteArrayObject *self, int keepends)
 
 static PyObject *
 bytearray_splitlines(PyByteArrayObject *self, PyObject *args, PyObject *kwargs)
@@ -624,7 +629,7 @@
     {"fromhex", (PyCFunction)bytearray_fromhex, METH_O|METH_CLASS, bytearray_fromhex__doc__},
 
 static PyObject *
-bytearray_fromhex_impl(PyObject*cls, PyObject *string);
+bytearray_fromhex_impl(PyObject*cls, PyObject *string)
 
 static PyObject *
 bytearray_fromhex(PyTypeObject *cls, PyObject *arg)
@@ -670,7 +675,7 @@
     {"__reduce_ex__", (PyCFunction)bytearray_reduce_ex, METH_VARARGS, bytearray_reduce_ex__doc__},
 
 static PyObject *
-bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto);
+bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto)
 
 static PyObject *
 bytearray_reduce_ex(PyByteArrayObject *self, PyObject *args)
@@ -705,4 +710,4 @@
 {
     return bytearray_sizeof_impl(self);
 }
-/*[clinic end generated code: output=d763876718a66fc3 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4298e3a89fd43ae2 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Objects/clinic/bytesobject.c.h
--- a/Objects/clinic/bytesobject.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Objects/clinic/bytesobject.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -20,7 +20,7 @@
     {"split", (PyCFunction)bytes_split, METH_VARARGS|METH_KEYWORDS, bytes_split__doc__},
 
 static PyObject *
-bytes_split_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit);
+bytes_split_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit)
 
 static PyObject *
 bytes_split(PyBytesObject*self, PyObject *args, PyObject *kwargs)
@@ -57,7 +57,7 @@
     {"partition", (PyCFunction)bytes_partition, METH_O, bytes_partition__doc__},
 
 static PyObject *
-bytes_partition_impl(PyBytesObject *self, Py_buffer *sep);
+bytes_partition_impl(PyBytesObject *self, Py_buffer *sep)
 
 static PyObject *
 bytes_partition(PyBytesObject *self, PyObject *arg)
@@ -96,7 +96,7 @@
     {"rpartition", (PyCFunction)bytes_rpartition, METH_O, bytes_rpartition__doc__},
 
 static PyObject *
-bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep);
+bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep)
 
 static PyObject *
 bytes_rpartition(PyBytesObject *self, PyObject *arg)
@@ -138,7 +138,7 @@
     {"rsplit", (PyCFunction)bytes_rsplit, METH_VARARGS|METH_KEYWORDS, bytes_rsplit__doc__},
 
 static PyObject *
-bytes_rsplit_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit);
+bytes_rsplit_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit)
 
 static PyObject *
 bytes_rsplit(PyBytesObject*self, PyObject *args, PyObject *kwargs)
@@ -185,7 +185,7 @@
     {"strip", (PyCFunction)bytes_strip, METH_VARARGS, bytes_strip__doc__},
 
 static PyObject *
-bytes_strip_impl(PyBytesObject *self, PyObject *bytes);
+bytes_strip_impl(PyBytesObject *self, PyObject *bytes)
 
 static PyObject *
 bytes_strip(PyBytesObject *self, PyObject *args)
@@ -215,7 +215,7 @@
     {"lstrip", (PyCFunction)bytes_lstrip, METH_VARARGS, bytes_lstrip__doc__},
 
 static PyObject *
-bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes);
+bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes)
 
 static PyObject *
 bytes_lstrip(PyBytesObject *self, PyObject *args)
@@ -245,7 +245,7 @@
     {"rstrip", (PyCFunction)bytes_rstrip, METH_VARARGS, bytes_rstrip__doc__},
 
 static PyObject *
-bytes_rstrip_impl(PyBytesObject *self, PyObject *bytes);
+bytes_rstrip_impl(PyBytesObject *self, PyObject *bytes)
 
 static PyObject *
 bytes_rstrip(PyBytesObject *self, PyObject *args)
@@ -277,7 +277,8 @@
     {"translate", (PyCFunction)bytes_translate, METH_VARARGS, bytes_translate__doc__},
 
 static PyObject *
-bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1, PyObject *deletechars);
+bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1,
+                     PyObject *deletechars)
 
 static PyObject *
 bytes_translate(PyBytesObject *self, PyObject *args)
@@ -322,7 +323,7 @@
     {"maketrans", (PyCFunction)bytes_maketrans, METH_VARARGS|METH_STATIC, bytes_maketrans__doc__},
 
 static PyObject *
-bytes_maketrans_impl(Py_buffer *frm, Py_buffer *to);
+bytes_maketrans_impl(Py_buffer *frm, Py_buffer *to)
 
 static PyObject *
 bytes_maketrans(void *null, PyObject *args)
@@ -365,7 +366,8 @@
     {"replace", (PyCFunction)bytes_replace, METH_VARARGS, bytes_replace__doc__},
 
 static PyObject *
-bytes_replace_impl(PyBytesObject*self, Py_buffer *old, Py_buffer *new, Py_ssize_t count);
+bytes_replace_impl(PyBytesObject*self, Py_buffer *old, Py_buffer *new,
+                   Py_ssize_t count)
 
 static PyObject *
 bytes_replace(PyBytesObject*self, PyObject *args)
@@ -411,7 +413,8 @@
     {"decode", (PyCFunction)bytes_decode, METH_VARARGS|METH_KEYWORDS, bytes_decode__doc__},
 
 static PyObject *
-bytes_decode_impl(PyBytesObject*self, const char *encoding, const char *errors);
+bytes_decode_impl(PyBytesObject*self, const char *encoding,
+                  const char *errors)
 
 static PyObject *
 bytes_decode(PyBytesObject*self, PyObject *args, PyObject *kwargs)
@@ -444,7 +447,7 @@
     {"splitlines", (PyCFunction)bytes_splitlines, METH_VARARGS|METH_KEYWORDS, bytes_splitlines__doc__},
 
 static PyObject *
-bytes_splitlines_impl(PyBytesObject*self, int keepends);
+bytes_splitlines_impl(PyBytesObject*self, int keepends)
 
 static PyObject *
 bytes_splitlines(PyBytesObject*self, PyObject *args, PyObject *kwargs)
@@ -476,7 +479,7 @@
     {"fromhex", (PyCFunction)bytes_fromhex, METH_O|METH_CLASS, bytes_fromhex__doc__},
 
 static PyObject *
-bytes_fromhex_impl(PyTypeObject *type, PyObject *string);
+bytes_fromhex_impl(PyTypeObject *type, PyObject *string)
 
 static PyObject *
 bytes_fromhex(PyTypeObject *type, PyObject *arg)
@@ -493,4 +496,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b9e69e1f7c8ccd14 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=215e4bf66e460c86 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Objects/clinic/dictobject.c.h
--- a/Objects/clinic/dictobject.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Objects/clinic/dictobject.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -12,7 +12,7 @@
     {"fromkeys", (PyCFunction)dict_fromkeys, METH_VARARGS|METH_CLASS, dict_fromkeys__doc__},
 
 static PyObject *
-dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value);
+dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value)
 
 static PyObject *
 dict_fromkeys(PyTypeObject *type, PyObject *args)
@@ -39,4 +39,4 @@
 
 #define DICT___CONTAINS___METHODDEF    \
     {"__contains__", (PyCFunction)dict___contains__, METH_O|METH_COEXIST, dict___contains____doc__},
-/*[clinic end generated code: output=fe74d676332fdba6 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=827ab7fd542cea3e input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Objects/clinic/unicodeobject.c.h
--- a/Objects/clinic/unicodeobject.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Objects/clinic/unicodeobject.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -20,7 +20,7 @@
     {"maketrans", (PyCFunction)unicode_maketrans, METH_VARARGS|METH_STATIC, unicode_maketrans__doc__},
 
 static PyObject *
-unicode_maketrans_impl(PyObject *x, PyObject *y, PyObject *z);
+unicode_maketrans_impl(PyObject *x, PyObject *y, PyObject *z)
 
 static PyObject *
 unicode_maketrans(void *null, PyObject *args)
@@ -39,4 +39,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=4670413843c53055 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=de8baa18c5e8814c input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Python/bltinmodule.c
--- a/Python/bltinmodule.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Python/bltinmodule.c	Tue Apr 14 15:32:07 2015 -0400
@@ -574,8 +574,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_format_impl(PyModuleDef *module, PyObject *value, PyObject *format_spec)
-/*[clinic end generated code: output=fae3e927cc715466 input=e23f2f11e0098c64]*/
+builtin_format_impl(PyModuleDef *module, PyObject *value,
+                    PyObject *format_spec)
+/*[clinic end generated code: output=4341fd78a5f01764 input=e23f2f11e0098c64]*/
 {
     return PyObject_Format(value, format_spec);
 }
@@ -654,8 +655,10 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_compile_impl(PyModuleDef *module, PyObject *source, PyObject *filename, const char *mode, int flags, int dont_inherit, int optimize)
-/*[clinic end generated code: output=4f41a315386bab9f input=c6212a9d21472f7e]*/
+builtin_compile_impl(PyModuleDef *module, PyObject *source,
+                     PyObject *filename, const char *mode, int flags,
+                     int dont_inherit, int optimize)
+/*[clinic end generated code: output=31881762c1bb90c4 input=c6212a9d21472f7e]*/
 {
     Py_buffer view = {NULL, NULL};
     const char *str;
@@ -805,8 +808,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_eval_impl(PyModuleDef *module, PyObject *source, PyObject *globals, PyObject *locals)
-/*[clinic end generated code: output=90642b79dd8b08d6 input=31e42c1d2125b50b]*/
+builtin_eval_impl(PyModuleDef *module, PyObject *source, PyObject *globals,
+                  PyObject *locals)
+/*[clinic end generated code: output=7284501fb7b4d666 input=31e42c1d2125b50b]*/
 {
     PyObject *result, *tmp = NULL;
     Py_buffer view = {NULL, NULL};
@@ -889,8 +893,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_exec_impl(PyModuleDef *module, PyObject *source, PyObject *globals, PyObject *locals)
-/*[clinic end generated code: output=e8e0bbcde826a048 input=536e057b5e00d89e]*/
+builtin_exec_impl(PyModuleDef *module, PyObject *source, PyObject *globals,
+                  PyObject *locals)
+/*[clinic end generated code: output=83d574ef9d5d0b46 input=536e057b5e00d89e]*/
 {
     PyObject *v;
 
@@ -1303,8 +1308,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_setattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name, PyObject *value)
-/*[clinic end generated code: output=c5e0a3a3971333ed input=fbe7e53403116b93]*/
+builtin_setattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name,
+                     PyObject *value)
+/*[clinic end generated code: output=d881c655c0f7e34f input=fbe7e53403116b93]*/
 {
     if (PyObject_SetAttr(obj, name, value) != 0)
         return NULL;
@@ -2328,8 +2334,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_isinstance_impl(PyModuleDef *module, PyObject *obj, PyObject *class_or_tuple)
-/*[clinic end generated code: output=5e234dc3872d75a2 input=cf9eb0ad6bb9bad6]*/
+builtin_isinstance_impl(PyModuleDef *module, PyObject *obj,
+                        PyObject *class_or_tuple)
+/*[clinic end generated code: output=f960b7c12dbbeda0 input=cf9eb0ad6bb9bad6]*/
 {
     int retval;
 
@@ -2355,8 +2362,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-builtin_issubclass_impl(PyModuleDef *module, PyObject *cls, PyObject *class_or_tuple)
-/*[clinic end generated code: output=6346a85ba15dbd7d input=923d03fa41fc352a]*/
+builtin_issubclass_impl(PyModuleDef *module, PyObject *cls,
+                        PyObject *class_or_tuple)
+/*[clinic end generated code: output=8b012a151940bbf2 input=923d03fa41fc352a]*/
 {
     int retval;
 
diff -r a5a2b33993e3 Python/clinic/bltinmodule.c.h
--- a/Python/clinic/bltinmodule.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Python/clinic/bltinmodule.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -83,7 +83,8 @@
     {"format", (PyCFunction)builtin_format, METH_VARARGS, builtin_format__doc__},
 
 static PyObject *
-builtin_format_impl(PyModuleDef *module, PyObject *value, PyObject *format_spec);
+builtin_format_impl(PyModuleDef *module, PyObject *value,
+                    PyObject *format_spec)
 
 static PyObject *
 builtin_format(PyModuleDef *module, PyObject *args)
@@ -112,7 +113,7 @@
     {"chr", (PyCFunction)builtin_chr, METH_O, builtin_chr__doc__},
 
 static PyObject *
-builtin_chr_impl(PyModuleDef *module, int i);
+builtin_chr_impl(PyModuleDef *module, int i)
 
 static PyObject *
 builtin_chr(PyModuleDef *module, PyObject *arg)
@@ -152,7 +153,9 @@
     {"compile", (PyCFunction)builtin_compile, METH_VARARGS|METH_KEYWORDS, builtin_compile__doc__},
 
 static PyObject *
-builtin_compile_impl(PyModuleDef *module, PyObject *source, PyObject *filename, const char *mode, int flags, int dont_inherit, int optimize);
+builtin_compile_impl(PyModuleDef *module, PyObject *source,
+                     PyObject *filename, const char *mode, int flags,
+                     int dont_inherit, int optimize)
 
 static PyObject *
 builtin_compile(PyModuleDef *module, PyObject *args, PyObject *kwargs)
@@ -186,7 +189,7 @@
     {"divmod", (PyCFunction)builtin_divmod, METH_VARARGS, builtin_divmod__doc__},
 
 static PyObject *
-builtin_divmod_impl(PyModuleDef *module, PyObject *x, PyObject *y);
+builtin_divmod_impl(PyModuleDef *module, PyObject *x, PyObject *y)
 
 static PyObject *
 builtin_divmod(PyModuleDef *module, PyObject *args)
@@ -221,7 +224,8 @@
     {"eval", (PyCFunction)builtin_eval, METH_VARARGS, builtin_eval__doc__},
 
 static PyObject *
-builtin_eval_impl(PyModuleDef *module, PyObject *source, PyObject *globals, PyObject *locals);
+builtin_eval_impl(PyModuleDef *module, PyObject *source, PyObject *globals,
+                  PyObject *locals)
 
 static PyObject *
 builtin_eval(PyModuleDef *module, PyObject *args)
@@ -257,7 +261,8 @@
     {"exec", (PyCFunction)builtin_exec, METH_VARARGS, builtin_exec__doc__},
 
 static PyObject *
-builtin_exec_impl(PyModuleDef *module, PyObject *source, PyObject *globals, PyObject *locals);
+builtin_exec_impl(PyModuleDef *module, PyObject *source, PyObject *globals,
+                  PyObject *locals)
 
 static PyObject *
 builtin_exec(PyModuleDef *module, PyObject *args)
@@ -310,7 +315,7 @@
     {"hasattr", (PyCFunction)builtin_hasattr, METH_VARARGS, builtin_hasattr__doc__},
 
 static PyObject *
-builtin_hasattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name);
+builtin_hasattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name)
 
 static PyObject *
 builtin_hasattr(PyModuleDef *module, PyObject *args)
@@ -353,7 +358,8 @@
     {"setattr", (PyCFunction)builtin_setattr, METH_VARARGS, builtin_setattr__doc__},
 
 static PyObject *
-builtin_setattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name, PyObject *value);
+builtin_setattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name,
+                     PyObject *value)
 
 static PyObject *
 builtin_setattr(PyModuleDef *module, PyObject *args)
@@ -385,7 +391,7 @@
     {"delattr", (PyCFunction)builtin_delattr, METH_VARARGS, builtin_delattr__doc__},
 
 static PyObject *
-builtin_delattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name);
+builtin_delattr_impl(PyModuleDef *module, PyObject *obj, PyObject *name)
 
 static PyObject *
 builtin_delattr(PyModuleDef *module, PyObject *args)
@@ -493,7 +499,7 @@
     {"pow", (PyCFunction)builtin_pow, METH_VARARGS, builtin_pow__doc__},
 
 static PyObject *
-builtin_pow_impl(PyModuleDef *module, PyObject *x, PyObject *y, PyObject *z);
+builtin_pow_impl(PyModuleDef *module, PyObject *x, PyObject *y, PyObject *z)
 
 static PyObject *
 builtin_pow(PyModuleDef *module, PyObject *args)
@@ -529,7 +535,7 @@
     {"input", (PyCFunction)builtin_input, METH_VARARGS, builtin_input__doc__},
 
 static PyObject *
-builtin_input_impl(PyModuleDef *module, PyObject *prompt);
+builtin_input_impl(PyModuleDef *module, PyObject *prompt)
 
 static PyObject *
 builtin_input(PyModuleDef *module, PyObject *args)
@@ -572,7 +578,7 @@
     {"sum", (PyCFunction)builtin_sum, METH_VARARGS, builtin_sum__doc__},
 
 static PyObject *
-builtin_sum_impl(PyModuleDef *module, PyObject *iterable, PyObject *start);
+builtin_sum_impl(PyModuleDef *module, PyObject *iterable, PyObject *start)
 
 static PyObject *
 builtin_sum(PyModuleDef *module, PyObject *args)
@@ -605,7 +611,8 @@
     {"isinstance", (PyCFunction)builtin_isinstance, METH_VARARGS, builtin_isinstance__doc__},
 
 static PyObject *
-builtin_isinstance_impl(PyModuleDef *module, PyObject *obj, PyObject *class_or_tuple);
+builtin_isinstance_impl(PyModuleDef *module, PyObject *obj,
+                        PyObject *class_or_tuple)
 
 static PyObject *
 builtin_isinstance(PyModuleDef *module, PyObject *args)
@@ -638,7 +645,8 @@
     {"issubclass", (PyCFunction)builtin_issubclass, METH_VARARGS, builtin_issubclass__doc__},
 
 static PyObject *
-builtin_issubclass_impl(PyModuleDef *module, PyObject *cls, PyObject *class_or_tuple);
+builtin_issubclass_impl(PyModuleDef *module, PyObject *cls,
+                        PyObject *class_or_tuple)
 
 static PyObject *
 builtin_issubclass(PyModuleDef *module, PyObject *args)
@@ -656,4 +664,4 @@
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=12db4cde92eb11b3 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d0534ba8882d1978 input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Python/clinic/import.c.h
--- a/Python/clinic/import.c.h	Tue Apr 14 10:58:06 2015 -0500
+++ b/Python/clinic/import.c.h	Tue Apr 14 15:32:07 2015 -0400
@@ -78,7 +78,8 @@
     {"_fix_co_filename", (PyCFunction)_imp__fix_co_filename, METH_VARARGS, _imp__fix_co_filename__doc__},
 
 static PyObject *
-_imp__fix_co_filename_impl(PyModuleDef *module, PyCodeObject *code, PyObject *path);
+_imp__fix_co_filename_impl(PyModuleDef *module, PyCodeObject *code,
+                           PyObject *path)
 
 static PyObject *
 _imp__fix_co_filename(PyModuleDef *module, PyObject *args)
@@ -125,7 +126,7 @@
     {"init_builtin", (PyCFunction)_imp_init_builtin, METH_O, _imp_init_builtin__doc__},
 
 static PyObject *
-_imp_init_builtin_impl(PyModuleDef *module, PyObject *name);
+_imp_init_builtin_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 _imp_init_builtin(PyModuleDef *module, PyObject *arg)
@@ -153,7 +154,7 @@
     {"init_frozen", (PyCFunction)_imp_init_frozen, METH_O, _imp_init_frozen__doc__},
 
 static PyObject *
-_imp_init_frozen_impl(PyModuleDef *module, PyObject *name);
+_imp_init_frozen_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 _imp_init_frozen(PyModuleDef *module, PyObject *arg)
@@ -181,7 +182,7 @@
     {"get_frozen_object", (PyCFunction)_imp_get_frozen_object, METH_O, _imp_get_frozen_object__doc__},
 
 static PyObject *
-_imp_get_frozen_object_impl(PyModuleDef *module, PyObject *name);
+_imp_get_frozen_object_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 _imp_get_frozen_object(PyModuleDef *module, PyObject *arg)
@@ -209,7 +210,7 @@
     {"is_frozen_package", (PyCFunction)_imp_is_frozen_package, METH_O, _imp_is_frozen_package__doc__},
 
 static PyObject *
-_imp_is_frozen_package_impl(PyModuleDef *module, PyObject *name);
+_imp_is_frozen_package_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 _imp_is_frozen_package(PyModuleDef *module, PyObject *arg)
@@ -237,7 +238,7 @@
     {"is_builtin", (PyCFunction)_imp_is_builtin, METH_O, _imp_is_builtin__doc__},
 
 static PyObject *
-_imp_is_builtin_impl(PyModuleDef *module, PyObject *name);
+_imp_is_builtin_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 _imp_is_builtin(PyModuleDef *module, PyObject *arg)
@@ -265,7 +266,7 @@
     {"is_frozen", (PyCFunction)_imp_is_frozen, METH_O, _imp_is_frozen__doc__},
 
 static PyObject *
-_imp_is_frozen_impl(PyModuleDef *module, PyObject *name);
+_imp_is_frozen_impl(PyModuleDef *module, PyObject *name)
 
 static PyObject *
 _imp_is_frozen(PyModuleDef *module, PyObject *arg)
@@ -295,7 +296,8 @@
     {"load_dynamic", (PyCFunction)_imp_load_dynamic, METH_VARARGS, _imp_load_dynamic__doc__},
 
 static PyObject *
-_imp_load_dynamic_impl(PyModuleDef *module, PyObject *name, PyObject *path, PyObject *file);
+_imp_load_dynamic_impl(PyModuleDef *module, PyObject *name, PyObject *path,
+                       PyObject *file)
 
 static PyObject *
 _imp_load_dynamic(PyModuleDef *module, PyObject *args)
@@ -320,4 +322,4 @@
 #ifndef _IMP_LOAD_DYNAMIC_METHODDEF
     #define _IMP_LOAD_DYNAMIC_METHODDEF
 #endif /* !defined(_IMP_LOAD_DYNAMIC_METHODDEF) */
-/*[clinic end generated code: output=d41c392510815c5b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=abc5aa83d9e0d3ec input=a9049054013a1b77]*/
diff -r a5a2b33993e3 Python/import.c
--- a/Python/import.c	Tue Apr 14 10:58:06 2015 -0500
+++ b/Python/import.c	Tue Apr 14 15:32:07 2015 -0400
@@ -904,8 +904,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_imp__fix_co_filename_impl(PyModuleDef *module, PyCodeObject *code, PyObject *path)
-/*[clinic end generated code: output=7afe5ba6b9d383e4 input=895ba50e78b82f05]*/
+_imp__fix_co_filename_impl(PyModuleDef *module, PyCodeObject *code,
+                           PyObject *path)
+/*[clinic end generated code: output=f4db56aac0a1327f input=895ba50e78b82f05]*/
 
 {
     update_compiled_module(code, path);
@@ -1934,8 +1935,9 @@
 [clinic start generated code]*/
 
 static PyObject *
-_imp_load_dynamic_impl(PyModuleDef *module, PyObject *name, PyObject *path, PyObject *file)
-/*[clinic end generated code: output=8b7ae431d795e1ba input=af64f06e4bad3526]*/
+_imp_load_dynamic_impl(PyModuleDef *module, PyObject *name, PyObject *path,
+                       PyObject *file)
+/*[clinic end generated code: output=e84e5f7f0f39bc54 input=af64f06e4bad3526]*/
 {
     PyObject *mod;
     FILE *fp;
diff -r a5a2b33993e3 Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py	Tue Apr 14 10:58:06 2015 -0500
+++ b/Tools/clinic/clinic.py	Tue Apr 14 15:32:07 2015 -0400
@@ -527,6 +527,56 @@
     return s
 
 
+def wrap_declarations(text, length=78):
+    """
+    A simple-minded text wrapper for C function declarations.
+    It views a declaration line as looking like this:
+        xxxxxxxx(xxxxxxxxx,xxxxxxxxx)
+    With a sufficiently short 
+    If called with length=30, it would wrap that line into
+        xxxxxxxx(xxxxxxxxx,
+                 xxxxxxxxx)
+
+    If this doesn't work properly, it's probably better to
+    start from scratch with a more sophisticated algorithm,
+    rather than try and improve/debug this dumb little function.
+    """
+    lines = []
+    for line in text.split('\n'):
+        prefix, _, after_l_paren = line.partition('(')
+        if not after_l_paren:
+            lines.append(line)
+            continue
+        parameters, _, after_r_paren = after_l_paren.partition(')')
+        if not _:
+            lines.append(line)
+            continue
+        if ',' not in parameters:
+            lines.append(line)
+            continue
+        parameters = [x.strip() + ", " for x in parameters.split(',')]
+        prefix += "("
+        if len(prefix) < length:
+            spaces = " " * len(prefix)
+        else:
+            spaces = " " * 4
+
+        while parameters:
+            line = prefix
+            first = True
+            while parameters:
+                if (not first and
+                    (len(line) + len(parameters[0]) > length)):
+                    break
+                line += parameters.pop(0)
+                first = False
+            if not parameters:
+                line = line.rstrip(", ") + ")"
+            lines.append(line.rstrip())
+            prefix = spaces
+    return "\n".join(lines)
+
+
 class CLanguage(Language):
 
     body_prefix   = "#"
@@ -1129,6 +1179,11 @@
 
             s = template.format_map(template_dict)
 
+            # mild hack:
+            # reflow long impl declarations
+            if name in {"impl_prototype", "impl_definition"}:
+                s = wrap_declarations(s)
+
             if clinic.line_prefix:
                 s = indent_all_lines(s, clinic.line_prefix)
             if clinic.line_suffix: