Make documentation match the implementation.
diff --git a/Doc/api/concrete.tex b/Doc/api/concrete.tex
index 3b12b5c..fd02ecd 100644
--- a/Doc/api/concrete.tex
+++ b/Doc/api/concrete.tex
@@ -65,7 +65,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyType_GenericAlloc}{PyTypeObject *type,
-                                                  int nitems}
+                                                  Py_ssize_t nitems}
   \versionadded{2.2}
 \end{cfuncdesc}
 
@@ -179,7 +179,7 @@
   \versionadded{2.3}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{unsigned long long}{PyInt_AsUnsignedLongLongMask}{PyObject *io}
+\begin{cfuncdesc}{unsigned PY_LONG_LONG}{PyInt_AsUnsignedLongLongMask}{PyObject *io}
   Will first attempt to cast the object to a \ctype{PyIntObject} or
   \ctype{PyLongObject}, if it is not already one, and then return its
   value as unsigned long long, without checking for overflow.
@@ -268,12 +268,12 @@
   long}, or \NULL{} on failure.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyLong_FromLongLong}{long long v}
+\begin{cfuncdesc}{PyObject*}{PyLong_FromLongLong}{PY_LONG_LONG v}
   Return a new \ctype{PyLongObject} object from a C \ctype{long long},
   or \NULL{} on failure.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyLong_FromUnsignedLongLong}{unsigned long long v}
+\begin{cfuncdesc}{PyObject*}{PyLong_FromUnsignedLongLong}{unsigned PY_LONG_LONG v}
   Return a new \ctype{PyLongObject} object from a C \ctype{unsigned
   long long}, or \NULL{} on failure.
 \end{cfuncdesc}
@@ -300,7 +300,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyLong_FromUnicode}{Py_UNICODE *u,
-                                                 int length, int base}
+                                                 Py_ssize_t length, int base}
   Convert a sequence of Unicode digits to a Python long integer
   value.  The first parameter, \var{u}, points to the first character
   of the Unicode string, \var{length} gives the number of characters,
@@ -333,14 +333,14 @@
   \withsubitem{(built-in exception)}{\ttindex{OverflowError}}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{long long}{PyLong_AsLongLong}{PyObject *pylong}
+\begin{cfuncdesc}{PY_LONG_LONG}{PyLong_AsLongLong}{PyObject *pylong}
   Return a C \ctype{long long} from a Python long integer.  If
   \var{pylong} cannot be represented as a \ctype{long long}, an
   \exception{OverflowError} will be raised.
   \versionadded{2.2}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{unsigned long long}{PyLong_AsUnsignedLongLong}{PyObject
+\begin{cfuncdesc}{unsigned PY_LONG_LONG}{PyLong_AsUnsignedLongLong}{PyObject
                                                                  *pylong}
   Return a C \ctype{unsigned long long} from a Python long integer.
   If \var{pylong} cannot be represented as an \ctype{unsigned long
@@ -582,7 +582,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyString_FromStringAndSize}{const char *v,
-                                                         int len}
+                                                         Py_ssize_t len}
   Return a new string object with the value \var{v} and length
   \var{len} on success, and \NULL{} on failure.  If \var{v} is
   \NULL{}, the contents of the string are uninitialized.
@@ -601,6 +601,7 @@
     \lineiii{\%c}{int}{A single character, represented as an C int.}
     \lineiii{\%d}{int}{Exactly equivalent to \code{printf("\%d")}.}
     \lineiii{\%ld}{long}{Exactly equivalent to \code{printf("\%ld")}.}
+    \lineiii{\%zd}{long}{Exactly equivalent to \code{printf("\%zd")}.}
     \lineiii{\%i}{int}{Exactly equivalent to \code{printf("\%i")}.}
     \lineiii{\%x}{int}{Exactly equivalent to \code{printf("\%x")}.}
     \lineiii{\%s}{char*}{A null-terminated C character array.}
@@ -617,11 +618,11 @@
   exactly two arguments.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyString_Size}{PyObject *string}
+\begin{cfuncdesc}{Py_ssize_t}{PyString_Size}{PyObject *string}
   Return the length of the string in string object \var{string}.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyString_GET_SIZE}{PyObject *string}
+\begin{cfuncdesc}{Py_ssize_t}{PyString_GET_SIZE}{PyObject *string}
   Macro form of \cfunction{PyString_Size()} but without error
   checking.
 \end{cfuncdesc}
@@ -647,7 +648,7 @@
 
 \begin{cfuncdesc}{int}{PyString_AsStringAndSize}{PyObject *obj,
                                                  char **buffer,
-                                                 int *length}
+                                                 Py_ssize_t *length}
   Return a NUL-terminated representation of the contents of the
   object \var{obj} through the output variables \var{buffer} and
   \var{length}.
@@ -686,7 +687,7 @@
   the reference count of \var{newpart}.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{_PyString_Resize}{PyObject **string, int newsize}
+\begin{cfuncdesc}{int}{_PyString_Resize}{PyObject **string, Py_ssize_t newsize}
   A way to resize a string object even though it is ``immutable''.
   Only use this to build up a brand new string object; don't use this
   if the string may already be known in other parts of the code.  It
@@ -730,7 +731,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyString_Decode}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *encoding,
                                                const char *errors}
   Create an object by decoding \var{size} bytes of the encoded
@@ -754,7 +755,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyString_Encode}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *encoding,
                                                const char *errors}
   Encode the \ctype{char} buffer of the given size by passing it to
@@ -829,12 +830,12 @@
   \versionadded{2.2}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyUnicode_GET_SIZE}{PyObject *o}
+\begin{cfuncdesc}{Py_ssize_t}{PyUnicode_GET_SIZE}{PyObject *o}
   Return the size of the object.  \var{o} has to be a
   \ctype{PyUnicodeObject} (not checked).
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyUnicode_GET_DATA_SIZE}{PyObject *o}
+\begin{cfuncdesc}{Py_ssize_t}{PyUnicode_GET_DATA_SIZE}{PyObject *o}
   Return the size of the object's internal buffer in bytes.  \var{o}
   has to be a \ctype{PyUnicodeObject} (not checked).
 \end{cfuncdesc}
@@ -937,7 +938,7 @@
 use these APIs:
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_FromUnicode}{const Py_UNICODE *u,
-                                                    int size}
+                                                    Py_ssize_t size}
   Create a Unicode Object from the Py_UNICODE buffer \var{u} of the
   given size. \var{u} may be \NULL{} which causes the contents to be
   undefined. It is the user's responsibility to fill in the needed
@@ -953,7 +954,7 @@
   object.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyUnicode_GetSize}{PyObject *unicode}
+\begin{cfuncdesc}{Py_ssize_t}{PyUnicode_GetSize}{PyObject *unicode}
   Return the length of the Unicode object.
 \end{cfuncdesc}
 
@@ -996,14 +997,14 @@
 \ctype{Py_UNICODE} type is identical to the system's \ctype{wchar_t}.
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_FromWideChar}{const wchar_t *w,
-                                                     int size}
+                                                     Py_ssize_t size}
   Create a Unicode object from the \ctype{wchar_t} buffer \var{w} of
   the given size.  Return \NULL{} on failure.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyUnicode_AsWideChar}{PyUnicodeObject *unicode,
+\begin{cfuncdesc}{Py_ssize_t}{PyUnicode_AsWideChar}{PyUnicodeObject *unicode,
                                              wchar_t *w,
-                                             int size}
+                                             Py_ssize_t size}
   Copy the Unicode object contents into the \ctype{wchar_t} buffer
   \var{w}.  At most \var{size} \ctype{wchar_t} characters are copied
   (excluding a possibly trailing 0-termination character).  Return
@@ -1045,7 +1046,7 @@
 These are the generic codec APIs:
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_Decode}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *encoding,
                                                const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the encoded
@@ -1057,7 +1058,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_Encode}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *encoding,
                                                const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size and return
@@ -1083,7 +1084,7 @@
 These are the UTF-8 codec APIs:
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeUTF8}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the UTF-8
   encoded string \var{s}. Return \NULL{} if an exception was raised
@@ -1091,9 +1092,9 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeUTF8Stateful}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors,
-                                               int *consumed}
+                                               Py_ssize_t *consumed}
   If \var{consumed} is \NULL{}, behave like \cfunction{PyUnicode_DecodeUTF8()}.
   If \var{consumed} is not \NULL{}, trailing incomplete UTF-8 byte sequences
   will not be treated as an error. Those bytes will not be decoded and the
@@ -1102,7 +1103,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeUTF8}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size using UTF-8
   and return a Python string object.  Return \NULL{} if an exception
@@ -1120,7 +1121,7 @@
 These are the UTF-16 codec APIs:
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeUTF16}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors,
                                                int *byteorder}
   Decode \var{length} bytes from a UTF-16 encoded buffer string and
@@ -1147,10 +1148,10 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeUTF16Stateful}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors,
                                                int *byteorder,
-                                               int *consumed}
+                                               Py_ssize_t *consumed}
   If \var{consumed} is \NULL{}, behave like
   \cfunction{PyUnicode_DecodeUTF16()}. If \var{consumed} is not \NULL{},
   \cfunction{PyUnicode_DecodeUTF16Stateful()} will not treat trailing incomplete
@@ -1161,7 +1162,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeUTF16}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors,
                                                int byteorder}
   Return a Python string object holding the UTF-16 encoded value of
@@ -1198,7 +1199,7 @@
 These are the ``Unicode Escape'' codec APIs:
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeUnicodeEscape}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the
   Unicode-Escape encoded string \var{s}.  Return \NULL{} if an
@@ -1206,8 +1207,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeUnicodeEscape}{const Py_UNICODE *s,
-                                               int size,
-                                               const char *errors}
+                                               Py_ssize_t size}
   Encode the \ctype{Py_UNICODE} buffer of the given size using
   Unicode-Escape and return a Python string object.  Return \NULL{}
   if an exception was raised by the codec.
@@ -1224,7 +1224,7 @@
 These are the ``Raw Unicode Escape'' codec APIs:
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeRawUnicodeEscape}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the
   Raw-Unicode-Escape encoded string \var{s}.  Return \NULL{} if an
@@ -1232,7 +1232,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeRawUnicodeEscape}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size using
   Raw-Unicode-Escape and return a Python string object.  Return
@@ -1252,7 +1252,7 @@
 are accepted by the codecs during encoding.
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeLatin1}{const char *s,
-                                                     int size,
+                                                     Py_ssize_t size,
                                                      const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the Latin-1
   encoded string \var{s}.  Return \NULL{} if an exception was raised
@@ -1260,7 +1260,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeLatin1}{const Py_UNICODE *s,
-                                                     int size,
+                                                     Py_ssize_t size,
                                                      const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size using
   Latin-1 and return a Python string object.  Return \NULL{} if an
@@ -1279,7 +1279,7 @@
 accepted. All other codes generate errors.
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeASCII}{const char *s,
-                                                    int size,
+                                                    Py_ssize_t size,
                                                     const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the
   \ASCII{} encoded string \var{s}.  Return \NULL{} if an exception
@@ -1287,7 +1287,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeASCII}{const Py_UNICODE *s,
-                                                    int size,
+                                                    Py_ssize_t size,
                                                     const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size using
   \ASCII{} and return a Python string object.  Return \NULL{} if an
@@ -1327,7 +1327,7 @@
 points.
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeCharmap}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                PyObject *mapping,
                                                const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the encoded
@@ -1341,7 +1341,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeCharmap}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                PyObject *mapping,
                                                const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size using the
@@ -1360,7 +1360,7 @@
 The following codec API is special in that maps Unicode to Unicode.
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_TranslateCharmap}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                PyObject *table,
                                                const char *errors}
   Translate a \ctype{Py_UNICODE} buffer of the given length by
@@ -1386,7 +1386,7 @@
 machine running the codec.
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_DecodeMBCS}{const char *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Create a Unicode object by decoding \var{size} bytes of the MBCS
   encoded string \var{s}.  Return \NULL{} if an exception was
@@ -1394,7 +1394,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_EncodeMBCS}{const Py_UNICODE *s,
-                                               int size,
+                                               Py_ssize_t size,
                                                const char *errors}
   Encode the \ctype{Py_UNICODE} buffer of the given size using MBCS
   and return a Python string object.  Return \NULL{} if an exception
@@ -1424,7 +1424,7 @@
 
 \begin{cfuncdesc}{PyObject*}{PyUnicode_Split}{PyObject *s,
                                               PyObject *sep,
-                                              int maxsplit}
+                                              Py_ssize_t maxsplit}
   Split a string giving a list of Unicode strings.  If sep is \NULL{},
   splitting will be done at all whitespace substrings.  Otherwise,
   splits occur at the given separator.  At most \var{maxsplit} splits
@@ -1466,8 +1466,8 @@
 
 \begin{cfuncdesc}{int}{PyUnicode_Tailmatch}{PyObject *str,
                                                   PyObject *substr,
-                                                  int start,
-                                                  int end,
+                                                  Py_ssize_t start,
+                                                  Py_ssize_t end,
                                                   int direction}
   Return 1 if \var{substr} matches \var{str}[\var{start}:\var{end}] at
   the given tail end (\var{direction} == -1 means to do a prefix
@@ -1475,10 +1475,10 @@
   Return \code{-1} if an error occurred.                         
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyUnicode_Find}{PyObject *str,
+\begin{cfuncdesc}{Py_ssize_t}{PyUnicode_Find}{PyObject *str,
                                        PyObject *substr,
-                                       int start,
-                                       int end,
+                                       Py_ssize_t start,
+                                       Py_ssize_t end,
                                        int direction}
   Return the first position of \var{substr} in
   \var{str}[\var{start}:\var{end}] using the given \var{direction}
@@ -1489,10 +1489,10 @@
   an exception has been set.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyUnicode_Count}{PyObject *str,
+\begin{cfuncdesc}{Py_ssize_t}{PyUnicode_Count}{PyObject *str,
                                         PyObject *substr,
-                                        int start,
-                                        int end}
+                                        Py_ssize_t start,
+                                        Py_ssize_t end}
   Return the number of non-overlapping occurrences of \var{substr} in
   \code{\var{str}[\var{start}:\var{end}]}.  Return \code{-1} if an
   error occurred.
@@ -1501,7 +1501,7 @@
 \begin{cfuncdesc}{PyObject*}{PyUnicode_Replace}{PyObject *str,
                                                 PyObject *substr,
                                                 PyObject *replstr,
-                                                int maxcount}
+                                                Py_ssize_t maxcount}
   Replace at most \var{maxcount} occurrences of \var{substr} in
   \var{str} with \var{replstr} and return the resulting Unicode object.
   \var{maxcount} == -1 means replace all occurrences.
@@ -1599,7 +1599,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyBuffer_FromObject}{PyObject *base,
-                                                  int offset, int size}
+                                                  Py_ssize_t offset, Py_ssize_t size}
   Return a new read-only buffer object.  This raises
   \exception{TypeError} if \var{base} doesn't support the read-only
   buffer protocol or doesn't provide exactly one buffer segment, or it
@@ -1613,15 +1613,15 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteObject}{PyObject *base,
-                                                           int offset,
-                                                           int size}
+                                                           Py_ssize_t offset,
+                                                           Py_ssize_t size}
   Return a new writable buffer object.  Parameters and exceptions are
   similar to those for \cfunction{PyBuffer_FromObject()}.  If the
   \var{base} object does not export the writeable buffer protocol,
   then \exception{TypeError} is raised.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyBuffer_FromMemory}{void *ptr, int size}
+\begin{cfuncdesc}{PyObject*}{PyBuffer_FromMemory}{void *ptr, Py_ssize_t size}
   Return a new read-only buffer object that reads from a specified
   location in memory, with a specified size.  The caller is
   responsible for ensuring that the memory buffer, passed in as
@@ -1632,12 +1632,12 @@
   raised in that case.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteMemory}{void *ptr, int size}
+\begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteMemory}{void *ptr, Py_ssize_t size}
   Similar to \cfunction{PyBuffer_FromMemory()}, but the returned
   buffer is writable.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyBuffer_New}{int size}
+\begin{cfuncdesc}{PyObject*}{PyBuffer_New}{Py_ssize_t size}
   Return a new writable buffer object that maintains its own memory
   buffer of \var{size} bytes.  \exception{ValueError} is returned if
   \var{size} is not zero or positive.  Note that the memory buffer (as
@@ -1671,11 +1671,11 @@
   \versionadded{2.2}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyTuple_New}{int len}
+\begin{cfuncdesc}{PyObject*}{PyTuple_New}{Py_ssize_t len}
   Return a new tuple object of size \var{len}, or \NULL{} on failure.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyTuple_Pack}{int n, \moreargs}
+\begin{cfuncdesc}{PyObject*}{PyTuple_Pack}{Py_ssize_t n, \moreargs}
   Return a new tuple object of size \var{n}, or \NULL{} on failure.
   The tuple values are initialized to the subsequent \var{n} C arguments
   pointing to Python objects.  \samp{PyTuple_Pack(2, \var{a}, \var{b})}
@@ -1693,38 +1693,38 @@
   point to a tuple; no error checking is performed.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyTuple_GetItem}{PyObject *p, int pos}
+\begin{cfuncdesc}{PyObject*}{PyTuple_GetItem}{PyObject *p, Py_ssize_t pos}
   Return the object at position \var{pos} in the tuple pointed to by
   \var{p}.  If \var{pos} is out of bounds, return \NULL{} and sets an
   \exception{IndexError} exception.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyTuple_GET_ITEM}{PyObject *p, int pos}
+\begin{cfuncdesc}{PyObject*}{PyTuple_GET_ITEM}{PyObject *p, Py_ssize_t pos}
   Like \cfunction{PyTuple_GetItem()}, but does no checking of its
   arguments.
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyTuple_GetSlice}{PyObject *p,
-                                               int low, int high}
+                                               Py_ssize_t low, Py_ssize_t high}
   Take a slice of the tuple pointed to by \var{p} from \var{low} to
   \var{high} and return it as a new tuple.
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{int}{PyTuple_SetItem}{PyObject *p,
-                                        int pos, PyObject *o}
+                                        Py_ssize_t pos, PyObject *o}
   Insert a reference to object \var{o} at position \var{pos} of the
   tuple pointed to by \var{p}. Return \code{0} on success.
   \note{This function ``steals'' a reference to \var{o}.}
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{void}{PyTuple_SET_ITEM}{PyObject *p,
-                                          int pos, PyObject *o}
+                                          Py_ssize_t pos, PyObject *o}
   Like \cfunction{PyTuple_SetItem()}, but does no error checking, and
   should \emph{only} be used to fill in brand new tuples.  \note{This
   function ``steals'' a reference to \var{o}.}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{_PyTuple_Resize}{PyObject **p, int newsize}
+\begin{cfuncdesc}{int}{_PyTuple_Resize}{PyObject **p, Py_ssize_t newsize}
   Can be used to resize a tuple.  \var{newsize} will be the new length
   of the tuple.  Because tuples are \emph{supposed} to be immutable,
   this should only be used if there is only one reference to the
@@ -1768,32 +1768,32 @@
   \versionadded{2.2}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyList_New}{int len}
+\begin{cfuncdesc}{PyObject*}{PyList_New}{Py_ssize_t len}
   Return a new list of length \var{len} on success, or \NULL{} on
   failure.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyList_Size}{PyObject *list}
+\begin{cfuncdesc}{Py_ssize_t}{PyList_Size}{PyObject *list}
   Return the length of the list object in \var{list}; this is
   equivalent to \samp{len(\var{list})} on a list object.
   \bifuncindex{len}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyList_GET_SIZE}{PyObject *list}
+\begin{cfuncdesc}{Py_ssize_t}{PyList_GET_SIZE}{PyObject *list}
   Macro form of \cfunction{PyList_Size()} without error checking.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyList_GetItem}{PyObject *list, int index}
+\begin{cfuncdesc}{PyObject*}{PyList_GetItem}{PyObject *list, Py_ssize_t index}
   Return the object at position \var{pos} in the list pointed to by
   \var{p}.  If \var{pos} is out of bounds, return \NULL{} and set an
   \exception{IndexError} exception.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyList_GET_ITEM}{PyObject *list, int i}
+\begin{cfuncdesc}{PyObject*}{PyList_GET_ITEM}{PyObject *list, Py_ssize_t i}
   Macro form of \cfunction{PyList_GetItem()} without error checking.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyList_SetItem}{PyObject *list, int index,
+\begin{cfuncdesc}{int}{PyList_SetItem}{PyObject *list, Py_ssize_t index,
                                        PyObject *item}
   Set the item at index \var{index} in list to \var{item}.  Return
   \code{0} on success or \code{-1} on failure.  \note{This function
@@ -1801,7 +1801,7 @@
   item already in the list at the affected position.}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{void}{PyList_SET_ITEM}{PyObject *list, int i,
+\begin{cfuncdesc}{void}{PyList_SET_ITEM}{PyObject *list, Py_ssize_t i,
                                               PyObject *o}
   Macro form of \cfunction{PyList_SetItem()} without error checking.
   This is normally only used to fill in new lists where there is no
@@ -1812,7 +1812,7 @@
   \var{list} at position \var{i} will be leaked.}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyList_Insert}{PyObject *list, int index,
+\begin{cfuncdesc}{int}{PyList_Insert}{PyObject *list, Py_ssize_t index,
                                       PyObject *item}
   Insert the item \var{item} into list \var{list} in front of index
   \var{index}.  Return \code{0} if successful; return \code{-1} and
@@ -1828,7 +1828,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyList_GetSlice}{PyObject *list,
-                                              int low, int high}
+                                              Py_ssize_t low, Py_ssize_t high}
   Return a list of the objects in \var{list} containing the objects
   \emph{between} \var{low} and \var{high}.  Return \NULL{} and set
   an exception if unsuccessful.
@@ -1836,7 +1836,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{int}{PyList_SetSlice}{PyObject *list,
-                                        int low, int high,
+                                        Py_ssize_t low, Py_ssize_t high,
                                         PyObject *itemlist}
   Set the slice of \var{list} between \var{low} and \var{high} to the
   contents of \var{itemlist}.  Analogous to
@@ -1934,7 +1934,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{int}{PyDict_SetItemString}{PyObject *p,
-            char *key,
+            const char *key,
             PyObject *val}
   Insert \var{value} into the dictionary \var{p} using \var{key} as a
   key. \var{key} should be a \ctype{char*}.  The key object is created
@@ -1961,7 +1961,7 @@
   \emph{without} setting an exception.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyDict_GetItemString}{PyObject *p, char *key}
+\begin{cfuncdesc}{PyObject*}{PyDict_GetItemString}{PyObject *p, const char *key}
   This is the same as \cfunction{PyDict_GetItem()}, but \var{key} is
   specified as a \ctype{char*}, rather than a \ctype{PyObject*}.
 \end{cfuncdesc}
@@ -1984,12 +1984,12 @@
   (see the \citetitle[../lib/lib.html]{Python Library Reference}).
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyDict_Size}{PyObject *p}
+\begin{cfuncdesc}{Py_ssize_t}{PyDict_Size}{PyObject *p}
   Return the number of items in the dictionary.  This is equivalent
   to \samp{len(\var{p})} on a dictionary.\bifuncindex{len}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyDict_Next}{PyObject *p, int *ppos,
+\begin{cfuncdesc}{int}{PyDict_Next}{PyObject *p, Py_ssize_t *ppos,
                                     PyObject **pkey, PyObject **pvalue}
   Iterate over all key-value pairs in the dictionary \var{p}.  The
   \ctype{int} referred to by \var{ppos} must be initialized to
@@ -2126,7 +2126,7 @@
   when the file should be closed.  Return \NULL{} on failure.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{FILE*}{PyFile_AsFile}{PyFileObject *p}
+\begin{cfuncdesc}{FILE*}{PyFile_AsFile}{PyObject *p}
   Return the file object associated with \var{p} as a \ctype{FILE*}.
 \end{cfuncdesc}
 
@@ -2175,7 +2175,7 @@
   function, but doing so should not be needed.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyFile_WriteObject}{PyObject *obj, PyFileObject *p,
+\begin{cfuncdesc}{int}{PyFile_WriteObject}{PyObject *obj, PyObject *p,
                                            int flags}
   Write object \var{obj} to file object \var{p}.  The only supported
   flag for \var{flags} is
@@ -2185,7 +2185,7 @@
   failure; the appropriate exception will be set.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PyFile_WriteString}{const char *s, PyFileObject *p}
+\begin{cfuncdesc}{int}{PyFile_WriteString}{const char *s, PyObject *p}
   Write string \var{s} to file object \var{p}.  Return \code{0} on
   success or \code{-1} on failure; the appropriate exception will be
   set.
@@ -2313,7 +2313,7 @@
   \cdata{PyMethod_Type}).  The parameter must not be \NULL{}.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyMethod_New}{PyObject *func.
+\begin{cfuncdesc}{PyObject*}{PyMethod_New}{PyObject *func,
                                            PyObject *self, PyObject *class}
   Return a new method object, with \var{func} being any callable
   object; this is the function that will be called when the method is
@@ -2378,7 +2378,7 @@
   \versionadded{2.2}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{PyObject*}{PyModule_New}{char *name}
+\begin{cfuncdesc}{PyObject*}{PyModule_New}{const char *name}
   Return a new module object with the \member{__name__} attribute set
   to \var{name}.  Only the module's \member{__doc__} and
   \member{__name__} attributes are filled in; the caller is
@@ -2415,7 +2415,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{int}{PyModule_AddObject}{PyObject *module,
-                                           char *name, PyObject *value}
+                                           const char *name, PyObject *value}
   Add an object to \var{module} as \var{name}.  This is a convenience
   function which can be used from the module's initialization
   function.  This steals a reference to \var{value}.  Return
@@ -2424,7 +2424,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{int}{PyModule_AddIntConstant}{PyObject *module,
-                                                char *name, long value}
+                                                const char *name, long value}
   Add an integer constant to \var{module} as \var{name}.  This
   convenience function can be used from the module's initialization
   function. Return \code{-1} on error, \code{0} on success.
@@ -2432,7 +2432,7 @@
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{int}{PyModule_AddStringConstant}{PyObject *module,
-                                                   char *name, char *value}
+                                                   const char *name, const char *value}
   Add a string constant to \var{module} as \var{name}.  This
   convenience function can be used from the module's initialization
   function.  The string \var{value} must be null-terminated.  Return
@@ -2503,17 +2503,17 @@
 \end{cvardesc}
 
 \begin{cfuncdesc}{PyObject*}{PyDescr_NewGetSet}{PyTypeObject *type,
-					        PyGetSetDef *getset}
+					        struct PyGetSetDef *getset}
   \versionadded{2.2}
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyDescr_NewMember}{PyTypeObject *type,
-					        PyMemberDef *meth}
+					        struct PyMemberDef *meth}
   \versionadded{2.2}
 \end{cfuncdesc}
 
 \begin{cfuncdesc}{PyObject*}{PyDescr_NewMethod}{PyTypeObject *type,
-                                                PyMethodDef *meth}
+                                                struct PyMethodDef *meth}
   \versionadded{2.2}
 \end{cfuncdesc}
 
@@ -2563,8 +2563,8 @@
   not be allocated.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PySlice_GetIndices}{PySliceObject *slice, int length,
-                                           int *start, int *stop, int *step}
+\begin{cfuncdesc}{int}{PySlice_GetIndices}{PySliceObject *slice, Py_ssize_t length,
+                                           Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step}
 Retrieve the start, stop and step indices from the slice object
 \var{slice}, assuming a sequence of length \var{length}. Treats
 indices greater than \var{length} as errors.
@@ -2579,9 +2579,9 @@
 suitably renamed, in the source of your extension.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PySlice_GetIndicesEx}{PySliceObject *slice, int length,
-                                             int *start, int *stop, int *step,
-                                             int *slicelength}
+\begin{cfuncdesc}{int}{PySlice_GetIndicesEx}{PySliceObject *slice, Py_ssize_t length,
+                                             Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
+                                             Py_ssize_t *slicelength}
 Usable replacement for \cfunction{PySlice_GetIndices}.  Retrieve the
 start, stop, and step indices from the slice object \var{slice}
 assuming a sequence of length \var{length}, and store the length of