diff -r 5b90da280515 Include/object.h
--- a/Include/object.h	Sat Jun 15 23:24:11 2013 -0400
+++ b/Include/object.h	Mon Jun 17 13:06:07 2013 -0600
@@ -760,14 +760,19 @@
     _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
     ((PyObject *)(op))->ob_refcnt++)
 
-#define Py_DECREF(op)                                   \
-    do {                                                \
-        PyObject *_py_decref_tmp = (PyObject *)(op);    \
-        if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-        --(_py_decref_tmp)->ob_refcnt != 0)             \
-            _Py_CHECK_REFCNT(_py_decref_tmp)            \
-        else                                            \
-        _Py_Dealloc(_py_decref_tmp);                    \
+#define _Py_DEC_REFCNT(op)                          \
+    do {                                            \
+        if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA   \
+        --((PyObject *)(op))->ob_refcnt != 0)       \
+            _Py_CHECK_REFCNT(op)                    \
+        else                                        \
+        _Py_Dealloc(((PyObject *)(op)))             \
+    } while (0)
+
+#define Py_DECREF(op)                           \
+    do {                                        \
+        PyObject *_py_tmp = (PyObject *)(op);   \
+        _Py_DEC_REFCNT(_py_tmp);                \
     } while (0)
 
 /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
@@ -809,23 +814,23 @@
         PyObject *_py_tmp = (PyObject *)(op);   \
         if (_py_tmp != NULL) {                  \
             (op) = NULL;                        \
-            Py_DECREF(_py_tmp);                 \
+            _Py_DEC_REFCNT(_py_tmp);            \
         }                                       \
     } while (0)
 
 /* Macros to use in case the object pointer may be NULL: */
-#define Py_XINCREF(op)                                \
-    do {                                              \
-        PyObject *_py_xincref_tmp = (PyObject *)(op); \
-        if (_py_xincref_tmp != NULL)                  \
-            Py_INCREF(_py_xincref_tmp);               \
-    } while (0)                                    
+#define Py_XINCREF(op)                          \
+    do {                                        \
+        PyObject *_py_tmp = (PyObject *)(op);   \
+        if (_py_tmp != NULL)                    \
+            Py_INCREF(_py_tmp);                 \
+    } while (0)
 
-#define Py_XDECREF(op)                                \
-    do {                                              \
-        PyObject *_py_xdecref_tmp = (PyObject *)(op); \
-        if (_py_xdecref_tmp != NULL)                  \
-            Py_DECREF(_py_xdecref_tmp);               \
+#define Py_XDECREF(op)                          \
+    do {                                        \
+        PyObject *_py_tmp = (PyObject *)(op);   \
+        if (_py_tmp != NULL)                    \
+            _Py_DEC_REFCNT(_py_tmp);            \
     } while (0)
 
 /*