[Numpy-svn] r3147 - in trunk/numpy: core/src core/tests random/mtrand

numpy-svn at scipy.org numpy-svn at scipy.org
Wed Sep 13 18:56:09 CDT 2006


Author: oliphant
Date: 2006-09-13 18:55:37 -0500 (Wed, 13 Sep 2006)
New Revision: 3147

Modified:
   trunk/numpy/core/src/arraymethods.c
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/tests/test_defmatrix.py
   trunk/numpy/random/mtrand/distributions.c
   trunk/numpy/random/mtrand/mtrand.c
   trunk/numpy/random/mtrand/mtrand.pyx
Log:
Fix random.poisson(0) to return 0 (#229)

Modified: trunk/numpy/core/src/arraymethods.c
===================================================================
--- trunk/numpy/core/src/arraymethods.c	2006-09-13 22:06:48 UTC (rev 3146)
+++ trunk/numpy/core/src/arraymethods.c	2006-09-13 23:55:37 UTC (rev 3147)
@@ -543,7 +543,7 @@
         
         if (n < 0) {
                 PyErr_SetString(PyExc_ValueError, 
-                                "setitem must have at least one argument");
+                                "itemset must have at least one argument");
                 return NULL;
         }
         obj = PyTuple_GET_ITEM(args, n);

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-09-13 22:06:48 UTC (rev 3146)
+++ trunk/numpy/core/src/arrayobject.c	2006-09-13 23:55:37 UTC (rev 3147)
@@ -3391,6 +3391,18 @@
                     return 1;
             }
     }
+#if (PY_VERSION_HEX >= 0x02050000)
+    if (PyIndex_Check(o2)) {
+            Py_ssize_t val;
+            val = PyNumber_Index(obj);
+            if (val == -1 && PyErr_Occurred()) {
+                    PyErr_Clear();
+                    return 0;
+            }
+            *exp = (double) val;
+            return 1;
+    }
+#endif
     return 0;
 }
 
@@ -3398,10 +3410,9 @@
 static PyObject *
 fast_scalar_power(PyArrayObject *a1, PyObject *o2, int inplace) {
         double exp;
-        if (PyArray_Check(a1) && (PyArray_ISFLOAT(a1) ||
-                                  PyArray_ISCOMPLEX(a1))) {
-                if (array_power_is_scalar(o2, &exp)) {
-                        PyObject *fastop = NULL;
+        if (PyArray_Check(a1) && array_power_is_scalar(o2, &exp)) {
+                PyObject *fastop = NULL;
+                if (PyArray_ISFLOAT(a1) || PyArray_ISCOMPLEX(a1)) {
                         if (exp == 1.0) {
                                 /* we have to do this one special, as the
                                    "copy" method of array objects isn't set
@@ -3433,6 +3444,17 @@
                                                                     fastop);
                         }
                 }
+                else if (exp==2.0) {
+                        fastop = n_ops.multiply;
+                        if (inplace) {
+                                return PyArray_GenericInplaceBinaryFunction \
+                                        (a1, (PyObject *)a1, fastop);
+                        }
+                        else {
+                                return PyArray_GenericBinaryFunction \
+                                        (a1, (PyObject *)a1, fastop);
+                        }
+                }
         }
         return NULL;
 }

Modified: trunk/numpy/core/tests/test_defmatrix.py
===================================================================
--- trunk/numpy/core/tests/test_defmatrix.py	2006-09-13 22:06:48 UTC (rev 3146)
+++ trunk/numpy/core/tests/test_defmatrix.py	2006-09-13 23:55:37 UTC (rev 3147)
@@ -149,7 +149,7 @@
             'searchsorted', 'setflags', 'setfield', 'sort', 'take',
             'tofile', 'tolist', 'tostring', 'all', 'any', 'sum',
             'argmax', 'argmin', 'min', 'max', 'mean', 'var', 'ptp',
-            'prod', 'std', 'ctypes'
+            'prod', 'std', 'ctypes', 'itemset'
             ]
         for attrib in dir(a):
             if attrib.startswith('_') or attrib in excluded_methods:

Modified: trunk/numpy/random/mtrand/distributions.c
===================================================================
--- trunk/numpy/random/mtrand/distributions.c	2006-09-13 22:06:48 UTC (rev 3146)
+++ trunk/numpy/random/mtrand/distributions.c	2006-09-13 23:55:37 UTC (rev 3147)
@@ -524,8 +524,12 @@
     {
         return rk_poisson_ptrs(state, lam);
     }
-    else
+    else if (lam == 0) 
     {
+        return 0;
+    }
+    else 
+    {
         return rk_poisson_mult(state, lam);
     }
 }

Modified: trunk/numpy/random/mtrand/mtrand.c
===================================================================
--- trunk/numpy/random/mtrand/mtrand.c	2006-09-13 22:06:48 UTC (rev 3146)
+++ trunk/numpy/random/mtrand/mtrand.c	2006-09-13 23:55:37 UTC (rev 3147)
@@ -1,10 +1,16 @@
-/* Generated by Pyrex 0.9.3.1 on Mon Sep 11 17:34:30 2006 */
+/* Generated by Pyrex 0.9.4.1 on Wed Sep 13 17:52:51 2006 */
 
 #include "Python.h"
 #include "structmember.h"
 #ifndef PY_LONG_LONG
   #define PY_LONG_LONG LONG_LONG
 #endif
+#ifdef __cplusplus
+#define __PYX_EXTERN_C extern "C"
+#else
+#define __PYX_EXTERN_C extern
+#endif
+__PYX_EXTERN_C double pow(double, double);
 #include "string.h"
 #include "math.h"
 #include "numpy/arrayobject.h"
@@ -32,11 +38,10 @@
 static PyObject *__pyx_b;
 static int __pyx_lineno;
 static char *__pyx_filename;
-staticforward char **__pyx_f;
+static char **__pyx_f;
 
 /* Declarations from mtrand */
 
-staticforward PyTypeObject __pyx_type_6mtrand_RandomState;
 
 struct __pyx_obj_6mtrand_RandomState {
   PyObject_HEAD
@@ -182,13 +187,13 @@
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
   Py_INCREF(__pyx_v_size);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":128 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":128 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":129 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":129 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -197,7 +202,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":131 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":131 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -212,34 +217,34 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)__pyx_4));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":132 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":132 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":133 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":133 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":134 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":134 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":135 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":135 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
       __pyx_L3:;
     }
     __pyx_L4:;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":136 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":136 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
   }
   __pyx_L2:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -276,35 +281,35 @@
   npy_intp __pyx_5;
   Py_INCREF(__pyx_v_size);
   Py_INCREF(__pyx_v_oa);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
-  __pyx_v_itera = Py_None; Py_INCREF((PyObject *) __pyx_v_itera);
-  __pyx_v_multi = Py_None; Py_INCREF((PyObject *) __pyx_v_multi);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":148 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":148 */
   __pyx_v_scalar = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":149 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":149 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":150 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":150 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":151 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":151 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":153 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":153 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":154 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":154 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":155 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":155 */
       __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -313,33 +318,33 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":157 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":157 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":158 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":158 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":159 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":159 */
       __pyx_v_array_data = ((double (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":160 */
-      __pyx_2 = PyArray_IterNew(((PyObject *)((PyObject *)__pyx_v_oa))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":160 */
+      __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_itera));
-      __pyx_v_itera = ((PyObject *)__pyx_2);
+      __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":161 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":161 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":162 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":162 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":163 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":163 */
         PyArray_ITER_NEXT(__pyx_v_itera);
         __pyx_L5:;
       }
@@ -350,7 +355,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":165 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":165 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -365,25 +370,25 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)__pyx_4));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":166 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":166 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":167 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":167 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":168 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":168 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":169 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":169 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":170 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":170 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
         __pyx_L8:;
       }
@@ -392,18 +397,18 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":172 */
-      __pyx_3 = PyArray_MultiIterNew(2,((void (*))((PyObject *)arrayObject)),((void (*))((PyObject *)__pyx_v_oa))); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_3));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":172 */
+      __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_3);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
       Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":174 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":174 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":175 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":175 */
         __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
         __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
         Py_INCREF(__pyx_k60p);
@@ -418,17 +423,17 @@
       }
       __pyx_L10:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":176 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":176 */
       __pyx_5 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":177 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":177 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":178 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":178 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":179 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":179 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
         __pyx_L11:;
       }
@@ -438,12 +443,12 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":180 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":180 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -482,40 +487,40 @@
   Py_INCREF(__pyx_v_size);
   Py_INCREF(__pyx_v_oa);
   Py_INCREF(__pyx_v_ob);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
-  __pyx_v_multi = Py_None; Py_INCREF((PyObject *) __pyx_v_multi);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":193 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":193 */
   __pyx_v_scalar = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":194 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":194 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_ob->nd == 0);
   }
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":195 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":195 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":196 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":196 */
     __pyx_v_ob_data = ((double (*))__pyx_v_ob->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":197 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":197 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":199 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":199 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":200 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":200 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":201 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":201 */
       __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -524,37 +529,37 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":203 */
-      __pyx_2 = PyArray_MultiIterNew(2,((void (*))((PyObject *)__pyx_v_oa)),((void (*))((PyObject *)__pyx_v_ob))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":203 */
+      __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_2);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":204 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":204 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":205 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":205 */
       __pyx_v_array_data = ((double (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":206 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":206 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":207 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":207 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":208 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":208 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":209 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":209 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":210 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":210 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -565,7 +570,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":212 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":212 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -580,25 +585,25 @@
     __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)__pyx_5));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":213 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":213 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":214 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":214 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":215 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":215 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":216 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":216 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":217 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":217 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
         __pyx_L8:;
       }
@@ -607,18 +612,18 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":219 */
-      __pyx_4 = PyArray_MultiIterNew(3,((void (*))((PyObject *)arrayObject)),((void (*))((PyObject *)__pyx_v_oa)),((void (*))((PyObject *)__pyx_v_ob))); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_4));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":219 */
+      __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_4);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":220 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":220 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":221 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":221 */
         __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; goto __pyx_L1;}
         __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; goto __pyx_L1;}
         Py_INCREF(__pyx_k61p);
@@ -633,23 +638,23 @@
       }
       __pyx_L10:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":222 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":222 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":223 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":223 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":224 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":224 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":225 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":225 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":226 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":226 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":227 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":227 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
         __pyx_L11:;
       }
@@ -659,12 +664,12 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":228 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":228 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -705,13 +710,13 @@
   Py_INCREF(__pyx_v_oa);
   Py_INCREF(__pyx_v_ob);
   Py_INCREF(__pyx_v_oc);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
-  __pyx_v_multi = Py_None; Py_INCREF((PyObject *) __pyx_v_multi);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":243 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":243 */
   __pyx_v_scalar = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":244 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":244 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_ob->nd == 0);
@@ -721,30 +726,30 @@
   }
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":245 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":245 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":246 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":246 */
     __pyx_v_ob_data = ((double (*))__pyx_v_ob->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":247 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":247 */
     __pyx_v_oc_data = ((double (*))__pyx_v_oc->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":248 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":248 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":250 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":250 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":251 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":251 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":252 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":252 */
       __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -753,40 +758,40 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":254 */
-      __pyx_2 = PyArray_MultiIterNew(3,((void (*))((PyObject *)__pyx_v_oa)),((void (*))((PyObject *)__pyx_v_ob)),((void (*))((PyObject *)__pyx_v_oc))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":254 */
+      __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_2);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":255 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":255 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":256 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":256 */
       __pyx_v_array_data = ((double (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":257 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":257 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":258 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":258 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":259 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":259 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":260 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":260 */
         __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":261 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":261 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":262 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":262 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -797,7 +802,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":264 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":264 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -812,25 +817,25 @@
     __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)__pyx_5));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":265 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":265 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":266 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":266 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":267 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":267 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":268 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":268 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":269 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":269 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
         __pyx_L8:;
       }
@@ -839,18 +844,18 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":271 */
-      __pyx_4 = PyArray_MultiIterNew(4,((void (*))((PyObject *)arrayObject)),((void (*))((PyObject *)__pyx_v_oa)),((void (*))((PyObject *)__pyx_v_ob)),((void (*))((PyObject *)__pyx_v_oc))); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_4));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":271 */
+      __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_4);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":273 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":273 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":274 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":274 */
         __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; goto __pyx_L1;}
         __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; goto __pyx_L1;}
         Py_INCREF(__pyx_k62p);
@@ -865,23 +870,23 @@
       }
       __pyx_L10:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":275 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":275 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":276 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":276 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":277 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":277 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":278 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":278 */
         __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":279 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":279 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":280 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":280 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L11:;
       }
@@ -891,12 +896,12 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":281 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":281 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -927,13 +932,13 @@
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
   Py_INCREF(__pyx_v_size);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":289 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":289 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":290 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":290 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 290; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -942,7 +947,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":292 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":292 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -955,34 +960,34 @@
     __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
-    Py_INCREF(((PyObject *)__pyx_2));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":293 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":293 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":294 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":294 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":295 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":295 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":296 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":296 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
       __pyx_L3:;
     }
     __pyx_L4:;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":297 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":297 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
   }
   __pyx_L2:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -1018,40 +1023,40 @@
   Py_INCREF(__pyx_v_size);
   Py_INCREF(__pyx_v_on);
   Py_INCREF(__pyx_v_op);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
-  __pyx_v_multi = Py_None; Py_INCREF((PyObject *) __pyx_v_multi);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":309 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":309 */
   __pyx_v_scalar = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":310 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":310 */
   __pyx_1 = (__pyx_v_on->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_op->nd == 0);
   }
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":311 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":311 */
     __pyx_v_on_data = ((long (*))__pyx_v_on->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":312 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":312 */
     __pyx_v_op_data = ((double (*))__pyx_v_op->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":313 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":313 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":315 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":315 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":316 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":316 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":317 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":317 */
       __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -1060,37 +1065,37 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":319 */
-      __pyx_2 = PyArray_MultiIterNew(2,((void (*))((PyObject *)__pyx_v_on)),((void (*))((PyObject *)__pyx_v_op))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":319 */
+      __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_2);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":320 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":320 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 320; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":321 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":321 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":322 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":322 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":323 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":323 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":324 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":324 */
         __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":325 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":325 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":326 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":326 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -1101,7 +1106,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":328 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":328 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1114,25 +1119,25 @@
     __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_5); __pyx_5 = 0;
-    Py_INCREF(((PyObject *)__pyx_2));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":329 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":329 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":330 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":330 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":331 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":331 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":332 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":332 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":333 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":333 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
         __pyx_L8:;
       }
@@ -1141,18 +1146,18 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":335 */
-      __pyx_4 = PyArray_MultiIterNew(3,((void (*))((PyObject *)arrayObject)),((void (*))((PyObject *)__pyx_v_on)),((void (*))((PyObject *)__pyx_v_op))); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_4));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":335 */
+      __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_4);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":336 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":336 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":337 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":337 */
         __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
         __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
         Py_INCREF(__pyx_k63p);
@@ -1167,23 +1172,23 @@
       }
       __pyx_L10:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":338 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":338 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":339 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":339 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":340 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":340 */
         __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":341 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":341 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":342 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":342 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":343 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":343 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
         __pyx_L11:;
       }
@@ -1193,12 +1198,12 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":345 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":345 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -1239,13 +1244,13 @@
   Py_INCREF(__pyx_v_on);
   Py_INCREF(__pyx_v_om);
   Py_INCREF(__pyx_v_oN);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
-  __pyx_v_multi = Py_None; Py_INCREF((PyObject *) __pyx_v_multi);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":359 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":359 */
   __pyx_v_scalar = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":360 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":360 */
   __pyx_1 = (__pyx_v_on->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_om->nd == 0);
@@ -1255,30 +1260,30 @@
   }
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":361 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":361 */
     __pyx_v_scalar = 1;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":362 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":362 */
     __pyx_v_on_data = ((long (*))__pyx_v_on->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":363 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":363 */
     __pyx_v_om_data = ((long (*))__pyx_v_om->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":364 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":364 */
     __pyx_v_oN_data = ((long (*))__pyx_v_oN->data);
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":366 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":366 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":367 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":367 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":368 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":368 */
       __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -1287,40 +1292,40 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":370 */
-      __pyx_2 = PyArray_MultiIterNew(3,((void (*))((PyObject *)__pyx_v_on)),((void (*))((PyObject *)__pyx_v_om)),((void (*))((PyObject *)__pyx_v_oN))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 370; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":370 */
+      __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 370; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_2);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":371 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":371 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 371; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":372 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":372 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":373 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":373 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":374 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":374 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":375 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":375 */
         __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":376 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":376 */
         __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":377 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":377 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":378 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":378 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -1331,7 +1336,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":380 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":380 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 380; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 380; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1344,25 +1349,25 @@
     __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 380; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_5); __pyx_5 = 0;
-    Py_INCREF(((PyObject *)__pyx_2));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":381 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":381 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":382 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":382 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":383 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":383 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":384 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":384 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":385 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":385 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
         __pyx_L8:;
       }
@@ -1371,18 +1376,18 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":387 */
-      __pyx_4 = PyArray_MultiIterNew(4,((void (*))((PyObject *)arrayObject)),((void (*))((PyObject *)__pyx_v_on)),((void (*))((PyObject *)__pyx_v_om)),((void (*))((PyObject *)__pyx_v_oN))); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_4));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":387 */
+      __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_4);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":389 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":389 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":390 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":390 */
         __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 390; goto __pyx_L1;}
         __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 390; goto __pyx_L1;}
         Py_INCREF(__pyx_k64p);
@@ -1397,23 +1402,23 @@
       }
       __pyx_L10:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":391 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":391 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":392 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":392 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":393 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":393 */
         __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":394 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":394 */
         __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":395 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":395 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":396 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":396 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L11:;
       }
@@ -1423,12 +1428,12 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":398 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":398 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -1467,35 +1472,35 @@
   npy_intp __pyx_5;
   Py_INCREF(__pyx_v_size);
   Py_INCREF(__pyx_v_oa);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
-  __pyx_v_multi = Py_None; Py_INCREF((PyObject *) __pyx_v_multi);
-  __pyx_v_itera = Py_None; Py_INCREF((PyObject *) __pyx_v_itera);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":410 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":410 */
   __pyx_v_scalar = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":411 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":411 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":412 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":412 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":413 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":413 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":415 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":415 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":416 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":416 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":417 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":417 */
       __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -1504,33 +1509,33 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":419 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":419 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 419; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":420 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":420 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":421 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":421 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":422 */
-      __pyx_2 = PyArray_IterNew(((PyObject *)((PyObject *)__pyx_v_oa))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_2));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":422 */
+      __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_itera));
-      __pyx_v_itera = ((PyObject *)__pyx_2);
+      __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":423 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":423 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":424 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":424 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":425 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":425 */
         PyArray_ITER_NEXT(__pyx_v_itera);
         __pyx_L5:;
       }
@@ -1541,7 +1546,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":427 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":427 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1554,25 +1559,25 @@
     __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
-    Py_INCREF(((PyObject *)__pyx_2));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":428 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":428 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":429 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":429 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":430 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":430 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":431 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":431 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":432 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":432 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
         __pyx_L8:;
       }
@@ -1581,18 +1586,18 @@
     }
     /*else*/ {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":434 */
-      __pyx_3 = PyArray_MultiIterNew(2,((void (*))((PyObject *)arrayObject)),((void (*))((PyObject *)__pyx_v_oa))); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 434; goto __pyx_L1;}
-      Py_INCREF(((PyObject *)__pyx_3));
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":434 */
+      __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 434; goto __pyx_L1;}
+      Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
-      __pyx_v_multi = ((PyObject *)__pyx_3);
+      __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
       Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":435 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":435 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":436 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":436 */
         __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; goto __pyx_L1;}
         __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; goto __pyx_L1;}
         Py_INCREF(__pyx_k65p);
@@ -1607,17 +1612,17 @@
       }
       __pyx_L10:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":437 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":437 */
       __pyx_5 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":438 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":438 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":439 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":439 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":440 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":440 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
         __pyx_L11:;
       }
@@ -1627,12 +1632,12 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":441 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":441 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -1657,31 +1662,31 @@
   long __pyx_v_i;
   double __pyx_r;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":446 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":446 */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":447 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":447 */
   __pyx_v_c = 0.0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":448 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":448 */
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":449 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":449 */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":450 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":450 */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":451 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":451 */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":452 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":452 */
     __pyx_v_sum = __pyx_v_t;
     __pyx_L2:;
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":453 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":453 */
   __pyx_r = __pyx_v_sum;
   goto __pyx_L0;
 
@@ -1706,10 +1711,10 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_seed);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":476 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":476 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state ))));
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":478 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":478 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; goto __pyx_L1;}
   Py_INCREF(__pyx_v_seed);
@@ -1738,14 +1743,14 @@
   int __pyx_1;
   Py_INCREF(__pyx_v_self);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":481 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":481 */
   __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != 0);
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":482 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":482 */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":483 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":483 */
     ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = 0;
     goto __pyx_L2;
   }
@@ -1777,13 +1782,13 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_seed)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_seed);
-  arrayObject_obj = Py_None; Py_INCREF((PyObject *) arrayObject_obj);
+  arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":497 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":497 */
   __pyx_1 = __pyx_v_seed == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":498 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":498 */
     __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
@@ -1800,26 +1805,26 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":500 */
-    __pyx_5 = PyLong_AsUnsignedLong(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":500 */
+    __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
     rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":502 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":502 */
     __pyx_3 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 502; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)__pyx_3));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":503 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":503 */
     init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long (*))arrayObject_obj->data),(arrayObject_obj->dimensions[0]));
   }
   __pyx_L2:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -1849,9 +1854,9 @@
   static char *__pyx_argnames[] = {0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
-  arrayObject_state = Py_None; Py_INCREF((PyObject *) arrayObject_state);
+  arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":512 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":512 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1865,15 +1870,15 @@
   __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)arrayObject_state));
   arrayObject_state = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":513 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":513 */
   memcpy(((void (*))arrayObject_state->data),((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,(624 * (sizeof(long ))));
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":514 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":514 */
   __pyx_3 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; goto __pyx_L1;}
   Py_INCREF(__pyx_n_MT19937);
@@ -1886,7 +1891,7 @@
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -1924,11 +1929,11 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_state)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_state);
-  arrayObject_obj = Py_None; Py_INCREF((PyObject *) arrayObject_obj);
-  __pyx_v_algorithm_name = Py_None; Py_INCREF(__pyx_v_algorithm_name);
-  __pyx_v_key = Py_None; Py_INCREF(__pyx_v_key);
+  arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_algorithm_name = Py_None; Py_INCREF(Py_None);
+  __pyx_v_key = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":525 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":525 */
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1936,12 +1941,12 @@
   __pyx_v_algorithm_name = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":526 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":526 */
   if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; goto __pyx_L1;}
   __pyx_3 = __pyx_3 != 0;
   if (__pyx_3) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":527 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":527 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;}
     Py_INCREF(__pyx_k68p);
@@ -1956,7 +1961,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":528 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":528 */
   __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
   __pyx_2 = __Pyx_UnpackItem(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
   Py_DECREF(__pyx_v_key);
@@ -1969,18 +1974,18 @@
   if (__Pyx_EndUnpack(__pyx_1, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":529 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":529 */
   __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_4));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)arrayObject_obj));
   arrayObject_obj = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":530 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":530 */
   __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_3) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":531 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":531 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
     Py_INCREF(__pyx_k69p);
@@ -1995,13 +2000,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":532 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":532 */
   memcpy(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,((void (*))arrayObject_obj->data),(624 * (sizeof(long ))));
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":533 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":533 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2028,7 +2033,7 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":537 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":537 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; goto __pyx_L1;}
   __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; goto __pyx_L1;}
@@ -2038,7 +2043,7 @@
   __pyx_3 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2063,7 +2068,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_state);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":540 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":540 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 540; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 540; goto __pyx_L1;}
   Py_INCREF(__pyx_v_state);
@@ -2073,7 +2078,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2102,7 +2107,7 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":543 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":543 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2125,7 +2130,7 @@
   __pyx_3 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2152,13 +2157,13 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":551 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":551 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_double,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2182,13 +2187,13 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":558 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":558 */
   __pyx_1 = __pyx_f_6mtrand_disc0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_long,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2231,40 +2236,40 @@
   Py_INCREF(__pyx_v_low);
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
-  arrayObject = Py_None; Py_INCREF((PyObject *) arrayObject);
+  arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":573 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":573 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":574 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":574 */
     __pyx_v_lo = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":575 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":575 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":577 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":577 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; goto __pyx_L1;}
     __pyx_v_lo = __pyx_2;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":578 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":578 */
     __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":580 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":580 */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":581 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":581 */
   __pyx_1 = (__pyx_v_diff < 0);
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":582 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":582 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; goto __pyx_L1;}
     Py_INCREF(__pyx_k70p);
@@ -2279,11 +2284,11 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":584 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":584 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":585 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":585 */
     __pyx_3 = PyLong_FromUnsignedLong((rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state) + __pyx_v_lo)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; goto __pyx_L1;}
     __pyx_r = __pyx_3;
     __pyx_3 = 0;
@@ -2292,7 +2297,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":587 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":587 */
     __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 587; goto __pyx_L1;}
     __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 587; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2305,34 +2310,34 @@
     __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 587; goto __pyx_L1;}
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
-    Py_INCREF(((PyObject *)__pyx_3));
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":588 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":588 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":589 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":589 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":590 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":590 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":591 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":591 */
       (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long )rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)));
       __pyx_L5:;
     }
     __pyx_L6:;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":592 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":592 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
   }
   __pyx_L4:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_3);
@@ -2358,31 +2363,31 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   static char *__pyx_argnames[] = {"length",0};
-  if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "i", __pyx_argnames, &__pyx_v_length)) return 0;
+  if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "I", __pyx_argnames, &__pyx_v_length)) return 0;
   Py_INCREF(__pyx_v_self);
-  __pyx_v_bytestring = Py_None; Py_INCREF(__pyx_v_bytestring);
+  __pyx_v_bytestring = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":600 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":600 */
   __pyx_v_bytes = PyMem_Malloc(__pyx_v_length);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":601 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":601 */
   rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":602 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":602 */
   __pyx_1 = PyString_FromStringAndSize(((char (*))__pyx_v_bytes),__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; goto __pyx_L1;}
   Py_DECREF(__pyx_v_bytestring);
   __pyx_v_bytestring = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":603 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":603 */
   PyMem_Free(__pyx_v_bytes);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":604 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":604 */
   Py_INCREF(__pyx_v_bytestring);
   __pyx_r = __pyx_v_bytestring;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2419,26 +2424,26 @@
   Py_INCREF(__pyx_v_low);
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_olow = Py_None; Py_INCREF((PyObject *) __pyx_v_olow);
-  __pyx_v_ohigh = Py_None; Py_INCREF((PyObject *) __pyx_v_ohigh);
-  __pyx_v_odiff = Py_None; Py_INCREF((PyObject *) __pyx_v_odiff);
-  __pyx_v_temp = Py_None; Py_INCREF(__pyx_v_temp);
+  __pyx_v_olow = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_ohigh = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_odiff = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_temp = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":615 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":615 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 615; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_olow));
-  __pyx_v_olow = ((PyObject *)__pyx_1);
+  __pyx_v_olow = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":616 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":616 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 616; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ohigh));
-  __pyx_v_ohigh = ((PyObject *)__pyx_1);
+  __pyx_v_ohigh = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":617 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":617 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_subtract); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2454,23 +2459,23 @@
   __pyx_v_temp = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":618 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":618 */
   Py_INCREF(__pyx_v_temp);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":620 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":620 */
   __pyx_2 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 620; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_2));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_odiff));
-  __pyx_v_odiff = ((PyObject *)__pyx_2);
+  __pyx_v_odiff = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":621 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":621 */
   __pyx_1 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_olow,__pyx_v_odiff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 621; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2514,7 +2519,7 @@
   }
   Py_INCREF(__pyx_v_self);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":634 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":634 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; goto __pyx_L1;}
   Py_INCREF(__pyx_v_args);
@@ -2529,7 +2534,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":635 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":635 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
     __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
@@ -2542,7 +2547,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":637 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":637 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;}
     __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;}
@@ -2557,7 +2562,7 @@
   }
   __pyx_L2:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2593,7 +2598,7 @@
   }
   Py_INCREF(__pyx_v_self);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":649 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":649 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; goto __pyx_L1;}
   Py_INCREF(__pyx_v_args);
@@ -2608,7 +2613,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":650 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":650 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
     __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
@@ -2621,7 +2626,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":652 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":652 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; goto __pyx_L1;}
     Py_INCREF(__pyx_v_args);
@@ -2635,7 +2640,7 @@
   }
   __pyx_L2:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2671,16 +2676,16 @@
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":661 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":661 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":662 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":662 */
     Py_INCREF(__pyx_v_low);
     Py_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":663 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":663 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 663; goto __pyx_L1;}
     Py_DECREF(__pyx_v_low);
     __pyx_v_low = __pyx_2;
@@ -2689,7 +2694,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":664 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":664 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 664; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 664; goto __pyx_L1;}
   __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 664; goto __pyx_L1;}
@@ -2708,7 +2713,7 @@
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
@@ -2736,13 +2741,13 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":672 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":672 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gauss,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2784,24 +2789,24 @@
   Py_INCREF(__pyx_v_loc);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oloc = Py_None; Py_INCREF((PyObject *) __pyx_v_oloc);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":681 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":681 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 681; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oloc));
-  __pyx_v_oloc = ((PyObject *)__pyx_1);
+  __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":682 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":682 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 682; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = ((PyObject *)__pyx_1);
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":683 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":683 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 683; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 683; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2827,7 +2832,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":684 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":684 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
     Py_INCREF(__pyx_k72p);
@@ -2842,13 +2847,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":685 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":685 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -2894,24 +2899,24 @@
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_b);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oa = Py_None; Py_INCREF((PyObject *) __pyx_v_oa);
-  __pyx_v_ob = Py_None; Py_INCREF((PyObject *) __pyx_v_ob);
+  __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_ob = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":694 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":694 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 694; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
-  __pyx_v_oa = ((PyObject *)__pyx_1);
+  __pyx_v_oa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":695 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":695 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ob));
-  __pyx_v_ob = ((PyObject *)__pyx_1);
+  __pyx_v_ob = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":697 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":697 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2937,7 +2942,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":698 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":698 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
     Py_INCREF(__pyx_k73p);
@@ -2952,7 +2957,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":699 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":699 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2978,7 +2983,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":700 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":700 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
     Py_INCREF(__pyx_k74p);
@@ -2993,13 +2998,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":701 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":701 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_oa,__pyx_v_ob); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3041,16 +3046,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":709 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":709 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = ((PyObject *)__pyx_1);
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":710 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":710 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3076,7 +3081,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":711 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":711 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
     Py_INCREF(__pyx_k75p);
@@ -3091,13 +3096,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":712 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":712 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3126,13 +3131,13 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":719 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":719 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_exponential,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3166,16 +3171,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_shape);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oshape = Py_None; Py_INCREF((PyObject *) __pyx_v_oshape);
+  __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":727 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":727 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 727; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oshape));
-  __pyx_v_oshape = ((PyObject *)__pyx_1);
+  __pyx_v_oshape = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":728 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":728 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 728; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 728; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3201,7 +3206,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":729 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":729 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
     Py_INCREF(__pyx_k76p);
@@ -3216,13 +3221,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":730 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":730 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_oshape); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3267,24 +3272,24 @@
   Py_INCREF(__pyx_v_shape);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oshape = Py_None; Py_INCREF((PyObject *) __pyx_v_oshape);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":739 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":739 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oshape));
-  __pyx_v_oshape = ((PyObject *)__pyx_1);
+  __pyx_v_oshape = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":740 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":740 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = ((PyObject *)__pyx_1);
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":741 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":741 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3310,7 +3315,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":742 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":742 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
     Py_INCREF(__pyx_k77p);
@@ -3325,7 +3330,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":743 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":743 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3351,7 +3356,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":744 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":744 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
     Py_INCREF(__pyx_k78p);
@@ -3366,13 +3371,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":745 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":745 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_oshape,__pyx_v_oscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3418,24 +3423,24 @@
   Py_INCREF(__pyx_v_dfnum);
   Py_INCREF(__pyx_v_dfden);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_odfnum = Py_None; Py_INCREF((PyObject *) __pyx_v_odfnum);
-  __pyx_v_odfden = Py_None; Py_INCREF((PyObject *) __pyx_v_odfden);
+  __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":754 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":754 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 754; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
-  __pyx_v_odfnum = ((PyObject *)__pyx_1);
+  __pyx_v_odfnum = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":755 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":755 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 755; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfden));
-  __pyx_v_odfden = ((PyObject *)__pyx_1);
+  __pyx_v_odfden = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":756 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":756 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 756; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 756; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3461,7 +3466,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":757 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":757 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
     Py_INCREF(__pyx_k79p);
@@ -3476,7 +3481,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":758 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":758 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3502,7 +3507,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":759 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":759 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
     Py_INCREF(__pyx_k80p);
@@ -3517,13 +3522,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":760 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":760 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3576,32 +3581,32 @@
   Py_INCREF(__pyx_v_dfden);
   Py_INCREF(__pyx_v_nonc);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_odfnum = Py_None; Py_INCREF((PyObject *) __pyx_v_odfnum);
-  __pyx_v_odfden = Py_None; Py_INCREF((PyObject *) __pyx_v_odfden);
-  __pyx_v_ononc = Py_None; Py_INCREF((PyObject *) __pyx_v_ononc);
+  __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":770 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":770 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
-  __pyx_v_odfnum = ((PyObject *)__pyx_1);
+  __pyx_v_odfnum = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":771 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":771 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 771; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfden));
-  __pyx_v_odfden = ((PyObject *)__pyx_1);
+  __pyx_v_odfden = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":772 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":772 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ononc));
-  __pyx_v_ononc = ((PyObject *)__pyx_1);
+  __pyx_v_ononc = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":774 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":774 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 774; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 774; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3627,7 +3632,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":775 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":775 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
     Py_INCREF(__pyx_k81p);
@@ -3642,7 +3647,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":776 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":776 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3668,7 +3673,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":777 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":777 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
     Py_INCREF(__pyx_k82p);
@@ -3683,7 +3688,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":778 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":778 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -3709,7 +3714,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":779 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":779 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
     Py_INCREF(__pyx_k83p);
@@ -3724,13 +3729,13 @@
   }
   __pyx_L4:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":780 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":780 */
   __pyx_1 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden,__pyx_v_ononc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3773,16 +3778,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_df);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_odf = Py_None; Py_INCREF((PyObject *) __pyx_v_odf);
+  __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":789 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":789 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
-  __pyx_v_odf = ((PyObject *)__pyx_1);
+  __pyx_v_odf = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":790 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":790 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3808,7 +3813,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":791 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":791 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
     Py_INCREF(__pyx_k84p);
@@ -3823,13 +3828,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":792 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":792 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_odf); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -3873,24 +3878,24 @@
   Py_INCREF(__pyx_v_df);
   Py_INCREF(__pyx_v_nonc);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_odf = Py_None; Py_INCREF((PyObject *) __pyx_v_odf);
-  __pyx_v_ononc = Py_None; Py_INCREF((PyObject *) __pyx_v_ononc);
+  __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":801 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":801 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 801; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
-  __pyx_v_odf = ((PyObject *)__pyx_1);
+  __pyx_v_odf = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":802 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":802 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ononc));
-  __pyx_v_ononc = ((PyObject *)__pyx_1);
+  __pyx_v_ononc = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":803 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":803 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3916,7 +3921,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":804 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":804 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
     Py_INCREF(__pyx_k85p);
@@ -3931,7 +3936,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":805 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":805 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3957,7 +3962,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":806 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":806 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
     Py_INCREF(__pyx_k86p);
@@ -3972,13 +3977,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":807 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":807 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_odf,__pyx_v_ononc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4009,13 +4014,13 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":815 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":815 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_cauchy,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4049,16 +4054,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_df);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_odf = Py_None; Py_INCREF((PyObject *) __pyx_v_odf);
+  __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":823 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":823 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 823; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
-  __pyx_v_odf = ((PyObject *)__pyx_1);
+  __pyx_v_odf = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":824 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":824 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4084,7 +4089,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":825 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":825 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
     Py_INCREF(__pyx_k87p);
@@ -4099,13 +4104,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":826 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":826 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_odf); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4147,24 +4152,24 @@
   Py_INCREF(__pyx_v_mu);
   Py_INCREF(__pyx_v_kappa);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_omu = Py_None; Py_INCREF((PyObject *) __pyx_v_omu);
-  __pyx_v_okappa = Py_None; Py_INCREF((PyObject *) __pyx_v_okappa);
+  __pyx_v_omu = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_okappa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":836 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":836 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_omu));
-  __pyx_v_omu = ((PyObject *)__pyx_1);
+  __pyx_v_omu = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":837 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":837 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_okappa));
-  __pyx_v_okappa = ((PyObject *)__pyx_1);
+  __pyx_v_okappa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":838 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":838 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4190,7 +4195,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":839 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":839 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
     Py_INCREF(__pyx_k88p);
@@ -4205,13 +4210,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":840 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":840 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_omu,__pyx_v_okappa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4252,16 +4257,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oa = Py_None; Py_INCREF((PyObject *) __pyx_v_oa);
+  __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":848 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":848 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 848; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
-  __pyx_v_oa = ((PyObject *)__pyx_1);
+  __pyx_v_oa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":849 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":849 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4287,7 +4292,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":850 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":850 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
     Py_INCREF(__pyx_k89p);
@@ -4302,13 +4307,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":851 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":851 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4346,18 +4351,18 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "d|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oa = Py_None; Py_INCREF((PyObject *) __pyx_v_oa);
+  __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":859 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":859 */
   __pyx_1 = PyFloat_FromDouble(__pyx_v_a); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 859; goto __pyx_L1;}
   __pyx_2 = PyArray_FROM_OTF(__pyx_1,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 859; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_INCREF(((PyObject *)__pyx_2));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
-  __pyx_v_oa = ((PyObject *)__pyx_2);
+  __pyx_v_oa = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":860 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":860 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4383,7 +4388,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":861 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":861 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
     Py_INCREF(__pyx_k90p);
@@ -4398,13 +4403,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":862 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":862 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4441,18 +4446,18 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "d|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oa = Py_None; Py_INCREF((PyObject *) __pyx_v_oa);
+  __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":870 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":870 */
   __pyx_1 = PyFloat_FromDouble(__pyx_v_a); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; goto __pyx_L1;}
   __pyx_2 = PyArray_FROM_OTF(__pyx_1,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_INCREF(((PyObject *)__pyx_2));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
-  __pyx_v_oa = ((PyObject *)__pyx_2);
+  __pyx_v_oa = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":871 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":871 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4478,7 +4483,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":872 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":872 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
     Py_INCREF(__pyx_k91p);
@@ -4493,13 +4498,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":873 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":873 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4542,24 +4547,24 @@
   Py_INCREF(__pyx_v_loc);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oloc = Py_None; Py_INCREF((PyObject *) __pyx_v_oloc);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":882 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":882 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
-  __pyx_v_oloc = __pyx_1;
+  __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":883 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":883 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = __pyx_1;
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":884 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":884 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4585,7 +4590,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":885 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":885 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
     Py_INCREF(__pyx_k92p);
@@ -4600,13 +4605,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":886 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":886 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4652,24 +4657,24 @@
   Py_INCREF(__pyx_v_loc);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oloc = Py_None; Py_INCREF((PyObject *) __pyx_v_oloc);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":895 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":895 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
-  __pyx_v_oloc = __pyx_1;
+  __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":896 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":896 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = __pyx_1;
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":897 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":897 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4695,7 +4700,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":898 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":898 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
     Py_INCREF(__pyx_k93p);
@@ -4710,13 +4715,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":899 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":899 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4762,24 +4767,24 @@
   Py_INCREF(__pyx_v_loc);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oloc = Py_None; Py_INCREF((PyObject *) __pyx_v_oloc);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":908 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":908 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 908; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 908; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
-  __pyx_v_oloc = __pyx_1;
+  __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":909 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":909 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = __pyx_1;
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":910 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":910 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4805,7 +4810,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":911 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":911 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
     Py_INCREF(__pyx_k94p);
@@ -4820,13 +4825,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":912 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":912 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4872,24 +4877,24 @@
   Py_INCREF(__pyx_v_mean);
   Py_INCREF(__pyx_v_sigma);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_omean = Py_None; Py_INCREF((PyObject *) __pyx_v_omean);
-  __pyx_v_osigma = Py_None; Py_INCREF((PyObject *) __pyx_v_osigma);
+  __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_osigma = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":926 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":926 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
-  __pyx_v_omean = __pyx_1;
+  __pyx_v_omean = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":927 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":927 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_osigma));
-  __pyx_v_osigma = __pyx_1;
+  __pyx_v_osigma = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":928 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":928 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4915,7 +4920,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":929 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":929 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
     Py_INCREF(__pyx_k95p);
@@ -4930,13 +4935,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":930 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":930 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_omean,__pyx_v_osigma); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -4978,16 +4983,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":938 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":938 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = ((PyObject *)__pyx_1);
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":939 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":939 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5013,7 +5018,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":940 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":940 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
     Py_INCREF(__pyx_k96p);
@@ -5028,13 +5033,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":941 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":941 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -5078,24 +5083,24 @@
   Py_INCREF(__pyx_v_mean);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_omean = Py_None; Py_INCREF((PyObject *) __pyx_v_omean);
-  __pyx_v_oscale = Py_None; Py_INCREF((PyObject *) __pyx_v_oscale);
+  __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":950 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":950 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
-  __pyx_v_omean = __pyx_1;
+  __pyx_v_omean = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":951 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":951 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
-  __pyx_v_oscale = __pyx_1;
+  __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":952 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":952 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5121,7 +5126,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":953 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":953 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
     Py_INCREF(__pyx_k97p);
@@ -5159,7 +5164,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":955 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":955 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
     Py_INCREF(__pyx_k98p);
@@ -5174,13 +5179,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":956 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":956 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_omean,__pyx_v_oscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -5234,32 +5239,32 @@
   Py_INCREF(__pyx_v_mode);
   Py_INCREF(__pyx_v_right);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oleft = Py_None; Py_INCREF((PyObject *) __pyx_v_oleft);
-  __pyx_v_omode = Py_None; Py_INCREF((PyObject *) __pyx_v_omode);
-  __pyx_v_oright = Py_None; Py_INCREF((PyObject *) __pyx_v_oright);
+  __pyx_v_oleft = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_omode = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_oright = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":967 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":967 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oleft));
-  __pyx_v_oleft = ((PyObject *)__pyx_1);
+  __pyx_v_oleft = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":968 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":968 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_omode));
-  __pyx_v_omode = ((PyObject *)__pyx_1);
+  __pyx_v_omode = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":969 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":969 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 969; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oright));
-  __pyx_v_oright = ((PyObject *)__pyx_1);
+  __pyx_v_oright = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":971 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":971 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5284,7 +5289,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":972 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":972 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
     Py_INCREF(__pyx_k99p);
@@ -5299,7 +5304,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":973 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":973 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5324,7 +5329,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":974 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":974 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
     Py_INCREF(__pyx_k100p);
@@ -5339,7 +5344,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":975 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":975 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5364,7 +5369,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":976 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":976 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
     Py_INCREF(__pyx_k101p);
@@ -5379,13 +5384,13 @@
   }
   __pyx_L4:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":977 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":977 */
   __pyx_1 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_oleft,__pyx_v_omode,__pyx_v_oright); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -5435,24 +5440,24 @@
   Py_INCREF(__pyx_v_n);
   Py_INCREF(__pyx_v_p);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_on = Py_None; Py_INCREF((PyObject *) __pyx_v_on);
-  __pyx_v_op = Py_None; Py_INCREF((PyObject *) __pyx_v_op);
+  __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":988 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":988 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 988; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_on));
-  __pyx_v_on = ((PyObject *)__pyx_1);
+  __pyx_v_on = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":989 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":989 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
-  __pyx_v_op = ((PyObject *)__pyx_1);
+  __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":990 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":990 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5478,7 +5483,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":991 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":991 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
     Py_INCREF(__pyx_k102p);
@@ -5493,7 +5498,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":992 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":992 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5519,7 +5524,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":993 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":993 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
     Py_INCREF(__pyx_k103p);
@@ -5534,7 +5539,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":994 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":994 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5560,7 +5565,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":995 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":995 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
     Py_INCREF(__pyx_k104p);
@@ -5575,13 +5580,13 @@
   }
   __pyx_L4:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":996 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":996 */
   __pyx_1 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -5629,24 +5634,24 @@
   Py_INCREF(__pyx_v_n);
   Py_INCREF(__pyx_v_p);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_on = Py_None; Py_INCREF((PyObject *) __pyx_v_on);
-  __pyx_v_op = Py_None; Py_INCREF((PyObject *) __pyx_v_op);
+  __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1005 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1005 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_on));
-  __pyx_v_on = ((PyObject *)__pyx_1);
+  __pyx_v_on = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1006 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1006 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1006; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
-  __pyx_v_op = ((PyObject *)__pyx_1);
+  __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1007 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1007 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1007; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1007; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5672,7 +5677,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1008 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1008 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
     Py_INCREF(__pyx_k105p);
@@ -5687,7 +5692,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1009 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1009 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5713,7 +5718,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1010 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1010 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
     Py_INCREF(__pyx_k106p);
@@ -5728,7 +5733,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1011 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1011 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5754,7 +5759,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1012 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1012 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
     Py_INCREF(__pyx_k107p);
@@ -5769,13 +5774,13 @@
   }
   __pyx_L4:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
   __pyx_1 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -5796,7 +5801,7 @@
 
 static PyObject *__pyx_k108p;
 
-static char (__pyx_k108[]) = "lam <= 0";
+static char (__pyx_k108[]) = "lam < 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_poisson[] = "Poisson distribution.\n\n        poisson(lam=1.0, size=None) -> random values\n        ";
@@ -5817,21 +5822,21 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_lam);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_olam = Py_None; Py_INCREF((PyObject *) __pyx_v_olam);
+  __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1022 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1022 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_olam));
-  __pyx_v_olam = ((PyObject *)__pyx_1);
+  __pyx_v_olam = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1023 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1023 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_less_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
+  __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
   __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
@@ -5852,7 +5857,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1024 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1024 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
     Py_INCREF(__pyx_k108p);
@@ -5867,13 +5872,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1025 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1025 */
   __pyx_4 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_olam); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -5912,16 +5917,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_oa = Py_None; Py_INCREF((PyObject *) __pyx_v_oa);
+  __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1033 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1033 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
-  __pyx_v_oa = ((PyObject *)__pyx_1);
+  __pyx_v_oa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5947,7 +5952,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1035 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1035 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
     Py_INCREF(__pyx_k109p);
@@ -5962,13 +5967,13 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
   __pyx_4 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -6009,16 +6014,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_p);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_op = Py_None; Py_INCREF((PyObject *) __pyx_v_op);
+  __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1045 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1045 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1045; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
-  __pyx_v_op = ((PyObject *)__pyx_1);
+  __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1046 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1046 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6044,7 +6049,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1047 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1047 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
     Py_INCREF(__pyx_k110p);
@@ -6059,7 +6064,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1048 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1048 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6085,7 +6090,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1049 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1049 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
     Py_INCREF(__pyx_k111p);
@@ -6100,13 +6105,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1050 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1050 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -6160,32 +6165,32 @@
   Py_INCREF(__pyx_v_nbad);
   Py_INCREF(__pyx_v_nsample);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_ongood = Py_None; Py_INCREF((PyObject *) __pyx_v_ongood);
-  __pyx_v_onbad = Py_None; Py_INCREF((PyObject *) __pyx_v_onbad);
-  __pyx_v_onsample = Py_None; Py_INCREF((PyObject *) __pyx_v_onsample);
+  __pyx_v_ongood = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_onbad = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_onsample = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1066 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1066 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ongood));
-  __pyx_v_ongood = ((PyObject *)__pyx_1);
+  __pyx_v_ongood = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1067 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1067 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_onbad));
-  __pyx_v_onbad = ((PyObject *)__pyx_1);
+  __pyx_v_onbad = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1068 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1068 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_onsample));
-  __pyx_v_onsample = ((PyObject *)__pyx_1);
+  __pyx_v_onsample = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1069 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1069 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6211,7 +6216,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1070 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1070 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
     Py_INCREF(__pyx_k112p);
@@ -6226,7 +6231,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1071 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1071 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6252,7 +6257,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1072 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1072 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
     Py_INCREF(__pyx_k113p);
@@ -6267,7 +6272,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1073 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1073 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6303,7 +6308,7 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1074 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1074 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
     Py_INCREF(__pyx_k114p);
@@ -6318,7 +6323,7 @@
   }
   __pyx_L4:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1075 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1075 */
   __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;}
   Py_DECREF(__pyx_6); __pyx_6 = 0;
@@ -6344,7 +6349,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1076 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1076 */
     __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
     Py_INCREF(__pyx_k115p);
@@ -6359,13 +6364,13 @@
   }
   __pyx_L5:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
   __pyx_4 = __pyx_f_6mtrand_discnmN_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_ongood,__pyx_v_onbad,__pyx_v_onsample); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -6411,16 +6416,16 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_p);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_op = Py_None; Py_INCREF((PyObject *) __pyx_v_op);
+  __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1086 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1086 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
-  __pyx_v_op = ((PyObject *)__pyx_1);
+  __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1087 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1087 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6446,7 +6451,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1088 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1088 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
     Py_INCREF(__pyx_k116p);
@@ -6461,7 +6466,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1089 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1089 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6487,7 +6492,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1090 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1090 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
     Py_INCREF(__pyx_k117p);
@@ -6502,13 +6507,13 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1091 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1091 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -6573,15 +6578,15 @@
   Py_INCREF(__pyx_v_mean);
   Py_INCREF(__pyx_v_cov);
   Py_INCREF(__pyx_v_size);
-  __pyx_v_shape = Py_None; Py_INCREF(__pyx_v_shape);
-  __pyx_v_final_shape = Py_None; Py_INCREF(__pyx_v_final_shape);
-  __pyx_v_x = Py_None; Py_INCREF(__pyx_v_x);
-  __pyx_v_svd = Py_None; Py_INCREF(__pyx_v_svd);
-  __pyx_v_u = Py_None; Py_INCREF(__pyx_v_u);
-  __pyx_v_s = Py_None; Py_INCREF(__pyx_v_s);
-  __pyx_v_v = Py_None; Py_INCREF(__pyx_v_v);
+  __pyx_v_shape = Py_None; Py_INCREF(Py_None);
+  __pyx_v_final_shape = Py_None; Py_INCREF(Py_None);
+  __pyx_v_x = Py_None; Py_INCREF(Py_None);
+  __pyx_v_svd = Py_None; Py_INCREF(Py_None);
+  __pyx_v_u = Py_None; Py_INCREF(Py_None);
+  __pyx_v_s = Py_None; Py_INCREF(Py_None);
+  __pyx_v_v = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1112 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1112 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6595,7 +6600,7 @@
   __pyx_v_mean = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1113 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1113 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6609,11 +6614,11 @@
   __pyx_v_cov = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1114 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1114 */
   __pyx_4 = __pyx_v_size == Py_None;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1115 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1115 */
     __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; goto __pyx_L1;}
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_1;
@@ -6622,14 +6627,14 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1117 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1117 */
     Py_INCREF(__pyx_v_size);
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_v_size;
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1118 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1118 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; goto __pyx_L1;}
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; goto __pyx_L1;}
@@ -6645,7 +6650,7 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1119 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1119 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
     Py_INCREF(__pyx_k118p);
@@ -6660,7 +6665,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1120 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1120 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
@@ -6692,7 +6697,7 @@
   }
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1121 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1121 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
     Py_INCREF(__pyx_k119p);
@@ -6707,7 +6712,7 @@
   }
   __pyx_L4:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1122 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1122 */
   __pyx_5 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
@@ -6724,7 +6729,7 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1123 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1123 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;}
     Py_INCREF(__pyx_k120p);
@@ -6739,7 +6744,7 @@
   }
   __pyx_L5:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1125 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1125 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; goto __pyx_L1;}
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; goto __pyx_L1;}
@@ -6754,7 +6759,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
     __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
     Py_INCREF(__pyx_v_shape);
     PyList_SET_ITEM(__pyx_1, 0, __pyx_v_shape);
@@ -6765,7 +6770,7 @@
   }
   __pyx_L6:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1127 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1127 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;}
   __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, 0x7fffffff); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;}
@@ -6778,7 +6783,7 @@
   __pyx_v_final_shape = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1128 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1128 */
   __pyx_5 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
@@ -6793,7 +6798,7 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1132 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1132 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; goto __pyx_L1;}
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_multiply); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; goto __pyx_L1;}
@@ -6816,7 +6821,7 @@
   __pyx_v_x = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1133 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1133 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -6855,7 +6860,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1142 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1142 */
   __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;}
   Py_INCREF(__pyx_n_svd);
   PyList_SET_ITEM(__pyx_2, 0, __pyx_n_svd);
@@ -6867,7 +6872,7 @@
   __pyx_5 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1144 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1144 */
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; goto __pyx_L1;}
   Py_INCREF(__pyx_v_cov);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_cov);
@@ -6888,7 +6893,7 @@
   if (__Pyx_EndUnpack(__pyx_2, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1145 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1145 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_dot); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -6915,7 +6920,7 @@
   __pyx_v_x = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1148 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1148 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6931,7 +6936,7 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1149 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1149 */
   __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
@@ -6942,12 +6947,12 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1150 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1150 */
   Py_INCREF(__pyx_v_x);
   __pyx_r = __pyx_v_x;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -7006,12 +7011,12 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_pvals);
   Py_INCREF(__pyx_v_size);
-  arrayObject_parr = Py_None; Py_INCREF((PyObject *) arrayObject_parr);
-  arrayObject_mnarr = Py_None; Py_INCREF((PyObject *) arrayObject_mnarr);
-  __pyx_v_shape = Py_None; Py_INCREF(__pyx_v_shape);
-  __pyx_v_multin = Py_None; Py_INCREF(__pyx_v_multin);
+  arrayObject_parr = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  arrayObject_mnarr = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
+  __pyx_v_shape = Py_None; Py_INCREF(Py_None);
+  __pyx_v_multin = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1168 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1168 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1168; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1168; goto __pyx_L1;}
   Py_INCREF(__pyx_v_pvals);
@@ -7023,21 +7028,21 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_v_d = __pyx_4;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1169 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1169 */
   __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)__pyx_1));
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)arrayObject_parr));
   arrayObject_parr = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1170 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1170 */
   __pyx_v_pix = ((double (*))arrayObject_parr->data);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1172 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1172 */
   __pyx_5 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > 1.0);
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1173 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1173 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1173; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1173; goto __pyx_L1;}
     Py_INCREF(__pyx_k123p);
@@ -7052,11 +7057,11 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1175 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1175 */
   __pyx_5 = __pyx_v_size == Py_None;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1176 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1176 */
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
@@ -7079,7 +7084,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1178 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1178 */
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
     Py_INCREF(__pyx_v_size);
@@ -7093,7 +7098,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1180 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1180 */
     __pyx_1 = PyInt_FromLong(__pyx_v_d); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1180; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1180; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
@@ -7106,7 +7111,7 @@
   }
   __pyx_L3:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1182 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1182 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -7123,76 +7128,76 @@
   __pyx_v_multin = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1183 */
-  Py_INCREF(((PyObject *)__pyx_v_multin));
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1183 */
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_multin)));
   Py_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1184 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1184 */
   __pyx_v_mnix = ((long (*))arrayObject_mnarr->data);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1185 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1185 */
   __pyx_v_i = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1186 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1186 */
   while (1) {
     __pyx_L4:;
     __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
     if (!__pyx_5) break;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1187 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1187 */
     __pyx_v_Sum = 1.0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1188 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1188 */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1189 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1189 */
     __pyx_4 = (__pyx_v_d - 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_4; ++__pyx_v_j) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1190 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1190 */
       (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]) = rk_binomial(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,__pyx_v_dn,((__pyx_v_pix[__pyx_v_j]) / __pyx_v_Sum));
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1191 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1191 */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
       __pyx_5 = (__pyx_v_dn <= 0);
       if (__pyx_5) {
 
-        /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1193 */
+        /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1193 */
         goto __pyx_L7;
         goto __pyx_L8;
       }
       __pyx_L8:;
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1194 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1194 */
       __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j]));
       __pyx_L6:;
     }
     __pyx_L7:;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1195 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1195 */
     __pyx_5 = (__pyx_v_dn > 0);
     if (__pyx_5) {
 
-      /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1196 */
+      /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1196 */
       (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn;
       goto __pyx_L9;
     }
     __pyx_L9:;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1198 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1198 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
   __pyx_L5:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1200 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1200 */
   Py_INCREF(__pyx_v_multin);
   __pyx_r = __pyx_v_multin;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -7228,7 +7233,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1211 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1211 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
@@ -7244,16 +7249,16 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_v_i = __pyx_4;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1212 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1212 */
   while (1) {
     __pyx_L2:;
     __pyx_5 = (__pyx_v_i > 0);
     if (!__pyx_5) break;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1213 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1213 */
     __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1214 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1214 */
     __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L1;}
     __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -7269,12 +7274,12 @@
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1215 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1215 */
     __pyx_v_i = (__pyx_v_i - 1);
   }
   __pyx_L3:;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -7304,9 +7309,9 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_x)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
-  __pyx_v_arr = Py_None; Py_INCREF(__pyx_v_arr);
+  __pyx_v_arr = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1223 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1223 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
@@ -7320,7 +7325,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1224 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1224 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -7337,7 +7342,7 @@
   }
   /*else*/ {
 
-    /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1226 */
+    /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1226 */
     __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
     __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -7353,7 +7358,7 @@
   }
   __pyx_L2:;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1227 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1227 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;}
   Py_INCREF(__pyx_v_arr);
@@ -7363,12 +7368,12 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1228 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1228 */
   Py_INCREF(__pyx_v_arr);
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
@@ -7680,7 +7685,7 @@
   0, /*bf_getcharbuffer*/
 };
 
-statichere PyTypeObject __pyx_type_6mtrand_RandomState = {
+PyTypeObject __pyx_type_6mtrand_RandomState = {
   PyObject_HEAD_INIT(0)
   0, /*ob_size*/
   "mtrand.RandomState", /*tp_name*/
@@ -7701,7 +7706,7 @@
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   &__pyx_tp_as_buffer_RandomState, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   "Container for the Mersenne Twister PRNG.\n\n    Constructor\n    -----------\n    RandomState(seed=None): initializes the PRNG with the given seed. See the\n        seed() method for details.\n\n    Distribution Methods\n    -----------------\n    RandomState exposes a number of methods for generating random numbers drawn\n    from a variety of probability distributions. In addition to the\n    distribution-specific arguments, each method takes a keyword argument\n    size=None. If size is None, then a single value is generated and returned.\n    If size is an integer, then a 1-D numpy array filled with generated values\n    is returned. If size is a tuple, then a numpy array with that shape is\n    filled and returned.\n    ", /*tp_doc*/
   __pyx_tp_traverse_6mtrand_RandomState, /*tp_traverse*/
   __pyx_tp_clear_6mtrand_RandomState, /*tp_clear*/
@@ -7733,8 +7738,10 @@
   {0, 0, 0, 0}
 };
 
-DL_EXPORT(void) initmtrand(void); /*proto*/
-DL_EXPORT(void) initmtrand(void) {
+static void __pyx_init_filenames(void); /*proto*/
+
+PyMODINIT_FUNC initmtrand(void); /*proto*/
+PyMODINIT_FUNC initmtrand(void) {
   PyObject *__pyx_1 = 0;
   PyObject *__pyx_2 = 0;
   PyObject *__pyx_3 = 0;
@@ -7753,6 +7760,7 @@
   PyObject *__pyx_16 = 0;
   PyObject *__pyx_17 = 0;
   PyObject *__pyx_18 = 0;
+  __pyx_init_filenames();
   __pyx_m = Py_InitModule4("mtrand", __pyx_methods, 0, 0, PYTHON_API_VERSION);
   if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
   __pyx_b = PyImport_AddModule("__builtin__");
@@ -7768,37 +7776,37 @@
   if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; goto __pyx_L1;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":118 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":118 */
   import_array();
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":120 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":120 */
   __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":475 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":475 */
   Py_INCREF(Py_None);
   __pyx_k2 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":485 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":485 */
   Py_INCREF(Py_None);
   __pyx_k3 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":546 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":546 */
   Py_INCREF(Py_None);
   __pyx_k4 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":553 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":553 */
   Py_INCREF(Py_None);
   __pyx_k5 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":560 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":560 */
   Py_INCREF(Py_None);
   __pyx_k6 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k7 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":606 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":606 */
   __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 606; goto __pyx_L1;}
   __pyx_k8 = __pyx_1;
   __pyx_1 = 0;
@@ -7808,17 +7816,17 @@
   Py_INCREF(Py_None);
   __pyx_k10 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":654 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":654 */
   Py_INCREF(Py_None);
   __pyx_k11 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k12 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":667 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":667 */
   Py_INCREF(Py_None);
   __pyx_k13 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":674 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":674 */
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
   __pyx_k14 = __pyx_3;
   __pyx_3 = 0;
@@ -7828,73 +7836,73 @@
   Py_INCREF(Py_None);
   __pyx_k16 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":687 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":687 */
   Py_INCREF(Py_None);
   __pyx_k17 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":703 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":703 */
   __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 703; goto __pyx_L1;}
   __pyx_k18 = __pyx_5;
   __pyx_5 = 0;
   Py_INCREF(Py_None);
   __pyx_k19 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":714 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":714 */
   Py_INCREF(Py_None);
   __pyx_k20 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":721 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":721 */
   Py_INCREF(Py_None);
   __pyx_k21 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":732 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":732 */
   __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
   __pyx_k22 = __pyx_6;
   __pyx_6 = 0;
   Py_INCREF(Py_None);
   __pyx_k23 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":747 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":747 */
   Py_INCREF(Py_None);
   __pyx_k24 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":762 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":762 */
   Py_INCREF(Py_None);
   __pyx_k25 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":783 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":783 */
   Py_INCREF(Py_None);
   __pyx_k26 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":794 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":794 */
   Py_INCREF(Py_None);
   __pyx_k27 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":810 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":810 */
   Py_INCREF(Py_None);
   __pyx_k28 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":817 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":817 */
   Py_INCREF(Py_None);
   __pyx_k29 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":828 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":828 */
   Py_INCREF(Py_None);
   __pyx_k30 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":842 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":842 */
   Py_INCREF(Py_None);
   __pyx_k31 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":853 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":853 */
   Py_INCREF(Py_None);
   __pyx_k32 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":864 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":864 */
   Py_INCREF(Py_None);
   __pyx_k33 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":875 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":875 */
   __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;}
   __pyx_k34 = __pyx_7;
   __pyx_7 = 0;
@@ -7904,7 +7912,7 @@
   Py_INCREF(Py_None);
   __pyx_k36 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":888 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":888 */
   __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; goto __pyx_L1;}
   __pyx_k37 = __pyx_9;
   __pyx_9 = 0;
@@ -7914,7 +7922,7 @@
   Py_INCREF(Py_None);
   __pyx_k39 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":901 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":901 */
   __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;}
   __pyx_k40 = __pyx_11;
   __pyx_11 = 0;
@@ -7924,7 +7932,7 @@
   Py_INCREF(Py_None);
   __pyx_k42 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":914 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":914 */
   __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 914; goto __pyx_L1;}
   __pyx_k43 = __pyx_13;
   __pyx_13 = 0;
@@ -7934,376 +7942,376 @@
   Py_INCREF(Py_None);
   __pyx_k45 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":932 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":932 */
   __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;}
   __pyx_k46 = __pyx_15;
   __pyx_15 = 0;
   Py_INCREF(Py_None);
   __pyx_k47 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":943 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":943 */
   Py_INCREF(Py_None);
   __pyx_k48 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":958 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":958 */
   Py_INCREF(Py_None);
   __pyx_k49 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":981 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":981 */
   Py_INCREF(Py_None);
   __pyx_k50 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":998 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":998 */
   Py_INCREF(Py_None);
   __pyx_k51 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1016 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1016 */
   __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;}
   __pyx_k52 = __pyx_16;
   __pyx_16 = 0;
   Py_INCREF(Py_None);
   __pyx_k53 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1027 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1027 */
   Py_INCREF(Py_None);
   __pyx_k54 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1038 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1038 */
   Py_INCREF(Py_None);
   __pyx_k55 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1052 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1052 */
   Py_INCREF(Py_None);
   __pyx_k56 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1080 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1080 */
   Py_INCREF(Py_None);
   __pyx_k57 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1094 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1094 */
   Py_INCREF(Py_None);
   __pyx_k58 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1152 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1152 */
   Py_INCREF(Py_None);
   __pyx_k59 = Py_None;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1230 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1230 */
   __pyx_17 = PyTuple_New(0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
   __pyx_18 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), __pyx_17); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1231 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1231 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1232 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1232 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1233 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1233 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1234 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1234 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1234; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1234; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1234; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1235 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1235 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1236 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1236 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1237 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1237 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1238 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1238 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1239 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1239 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1240 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1240 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1241 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1241 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1242 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1242 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1243 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1243 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1243; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1243; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1243; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1244 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1244 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1245 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1245 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1246 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1246 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1247 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1247 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1248 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1248 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1249 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1249 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1250 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1250 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1250; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1250; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1250; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1251 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1251 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1252 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1252 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1253 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1253 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1254 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1254 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1256 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1256 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1258 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1258 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1259 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1259 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1260 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1260 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1261 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1261 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1262 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1262 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1263 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1263 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1264 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1264 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1266 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1266 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1267 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1267 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1268 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1268 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1269 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1269 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1270 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1270 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1271 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1271 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1275 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1275 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1277 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1277 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/opt/svn/numpy/numpy/random/mtrand/mtrand.pyx":1278 */
+  /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1278 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
@@ -8336,10 +8344,13 @@
   "mtrand.pyx",
   "numpy.pxi",
 };
-statichere char **__pyx_f = __pyx_filenames;
 
 /* Runtime support code */
 
+static void __pyx_init_filenames(void) {
+  __pyx_f = __pyx_filenames;
+}
+
 static int __Pyx_GetStarArgs(
     PyObject **args, 
     PyObject **kwds,

Modified: trunk/numpy/random/mtrand/mtrand.pyx
===================================================================
--- trunk/numpy/random/mtrand/mtrand.pyx	2006-09-13 22:06:48 UTC (rev 3146)
+++ trunk/numpy/random/mtrand/mtrand.pyx	2006-09-13 23:55:37 UTC (rev 3147)
@@ -1020,8 +1020,8 @@
         """
         cdef ndarray olam
         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)
-        if _sp.any(_sp.less_equal(olam, 0)):
-            raise ValueError("lam <= 0")
+        if _sp.any(_sp.less(olam, 0)):
+            raise ValueError("lam < 0")
         return discd_array(self.internal_state, rk_poisson, size, olam)
 
     def zipf(self, a, size=None):



More information about the Numpy-svn mailing list