[Numpy-svn] r5525 - trunk/numpy/random/mtrand

numpy-svn@scip... numpy-svn@scip...
Fri Jul 25 11:43:38 CDT 2008


Author: alan.mcintyre
Date: 2008-07-25 11:43:32 -0500 (Fri, 25 Jul 2008)
New Revision: 5525

Modified:
   trunk/numpy/random/mtrand/mtrand.c
Log:
Regenerated mtrand.c after standardizing NumPy import in mtrand.pyx.


Modified: trunk/numpy/random/mtrand/mtrand.c
===================================================================
--- trunk/numpy/random/mtrand/mtrand.c	2008-07-25 16:09:26 UTC (rev 5524)
+++ trunk/numpy/random/mtrand/mtrand.c	2008-07-25 16:43:32 UTC (rev 5525)
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.8.2 on Tue May 20 00:56:24 2008 */
+/* Generated by Pyrex 0.9.8.4 on Fri Jul 25 12:42:18 2008 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -35,8 +35,7 @@
 #include "initarray.h"
 
 
-typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
-typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
+typedef struct {PyObject **p; int i; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
 
 static PyObject *__pyx_m;
 static PyObject *__pyx_b;
@@ -44,10 +43,6 @@
 static char *__pyx_filename;
 static char **__pyx_f;
 
-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[],     Py_ssize_t nargs, PyObject **args2, PyObject **kwds2, char rqd_kwds[]); /*proto*/
-
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
-
 static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
 
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
@@ -59,12 +54,14 @@
 
 static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
+static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[],     Py_ssize_t nargs, PyObject **args2, PyObject **kwds2, char rqd_kwds[]); /*proto*/
+
 static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
 
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
+
 static int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v); /*proto*/
 
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
-
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
 
 static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
@@ -75,6 +72,9 @@
 
 /* Declarations from mtrand */
 
+
+/* Declarations from implementation of mtrand */
+
 typedef double (*__pyx_t_6mtrand_rk_cont0)(rk_state *);
 
 typedef double (*__pyx_t_6mtrand_rk_cont1)(rk_state *,double);
@@ -102,65 +102,6 @@
 static PyTypeObject *__pyx_ptype_6mtrand_flatiter = 0;
 static PyTypeObject *__pyx_ptype_6mtrand_broadcast = 0;
 static PyTypeObject *__pyx_ptype_6mtrand_RandomState = 0;
-static PyObject *__pyx_k2;
-static PyObject *__pyx_k3;
-static PyObject *__pyx_k4;
-static PyObject *__pyx_k5;
-static PyObject *__pyx_k6;
-static PyObject *__pyx_k7;
-static PyObject *__pyx_k8;
-static PyObject *__pyx_k9;
-static PyObject *__pyx_k10;
-static PyObject *__pyx_k11;
-static PyObject *__pyx_k12;
-static PyObject *__pyx_k13;
-static PyObject *__pyx_k14;
-static PyObject *__pyx_k15;
-static PyObject *__pyx_k16;
-static PyObject *__pyx_k17;
-static PyObject *__pyx_k18;
-static PyObject *__pyx_k19;
-static PyObject *__pyx_k20;
-static PyObject *__pyx_k21;
-static PyObject *__pyx_k22;
-static PyObject *__pyx_k23;
-static PyObject *__pyx_k24;
-static PyObject *__pyx_k25;
-static PyObject *__pyx_k26;
-static PyObject *__pyx_k27;
-static PyObject *__pyx_k28;
-static PyObject *__pyx_k29;
-static PyObject *__pyx_k30;
-static PyObject *__pyx_k31;
-static PyObject *__pyx_k32;
-static PyObject *__pyx_k33;
-static PyObject *__pyx_k34;
-static PyObject *__pyx_k35;
-static PyObject *__pyx_k36;
-static PyObject *__pyx_k37;
-static PyObject *__pyx_k38;
-static PyObject *__pyx_k39;
-static PyObject *__pyx_k40;
-static PyObject *__pyx_k41;
-static PyObject *__pyx_k42;
-static PyObject *__pyx_k43;
-static PyObject *__pyx_k44;
-static PyObject *__pyx_k45;
-static PyObject *__pyx_k46;
-static PyObject *__pyx_k47;
-static PyObject *__pyx_k48;
-static PyObject *__pyx_k49;
-static PyObject *__pyx_k50;
-static PyObject *__pyx_k51;
-static PyObject *__pyx_k52;
-static PyObject *__pyx_k53;
-static PyObject *__pyx_k54;
-static PyObject *__pyx_k55;
-static PyObject *__pyx_k56;
-static PyObject *__pyx_k57;
-static PyObject *__pyx_k58;
-static PyObject *__pyx_k59;
-static PyObject *__pyx_k60;
 static PyObject *__pyx_f_6mtrand_cont0_array(rk_state *,__pyx_t_6mtrand_rk_cont0,PyObject *); /*proto*/
 static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state *,__pyx_t_6mtrand_rk_cont1,PyObject *,double); /*proto*/
 static PyObject *__pyx_f_6mtrand_cont1_array(rk_state *,__pyx_t_6mtrand_rk_cont1,PyObject *,PyArrayObject *); /*proto*/
@@ -177,63 +118,427 @@
 static PyObject *__pyx_f_6mtrand_discd_array(rk_state *,__pyx_t_6mtrand_rk_discd,PyObject *,PyArrayObject *); /*proto*/
 static double __pyx_f_6mtrand_kahan_sum(double *,long); /*proto*/
 
+static char __pyx_k1[] = "np";
+static char __pyx_k2[] = "empty";
+static char __pyx_k3[] = "float64";
+static char __pyx_k4[] = "size is not compatible with inputs";
+static char __pyx_k5[] = "seed";
+static char __pyx_k6[] = "integer";
+static char __pyx_k7[] = "uint";
+static char __pyx_k8[] = "asarray";
+static char __pyx_k9[] = "uint32";
+static char __pyx_k10[] = "MT19937";
+static char __pyx_k11[] = "algorithm must be 'MT19937'";
+static char __pyx_k12[] = "state must be 624 longs";
+static char __pyx_k13[] = "get_state";
+static char __pyx_k14[] = "set_state";
+static char __pyx_k15[] = "random";
+static char __pyx_k16[] = "__RandomState_ctor";
+static char __pyx_k17[] = "low >= high";
+static char __pyx_k18[] = "subtract";
+static char __pyx_k19[] = "random_sample";
+static char __pyx_k20[] = "size";
+static char __pyx_k21[] = "standard_normal";
+static char __pyx_k22[] = "randint";
+static char __pyx_k23[] = "scale <= 0";
+static char __pyx_k24[] = "any";
+static char __pyx_k25[] = "less_equal";
+static char __pyx_k26[] = "a <= 0";
+static char __pyx_k27[] = "b <= 0";
+static char __pyx_k28[] = "shape <= 0";
+static char __pyx_k29[] = "dfnum <= 0";
+static char __pyx_k30[] = "dfden <= 0";
+static char __pyx_k31[] = "dfnum <= 1";
+static char __pyx_k32[] = "nonc < 0";
+static char __pyx_k33[] = "less";
+static char __pyx_k34[] = "df <= 0";
+static char __pyx_k35[] = "nonc <= 0";
+static char __pyx_k36[] = "df <= 1";
+static char __pyx_k37[] = "kappa < 0";
+static char __pyx_k38[] = "sigma <= 0";
+static char __pyx_k39[] = "sigma <= 0.0";
+static char __pyx_k40[] = "scale <= 0.0";
+static char __pyx_k41[] = "mean <= 0";
+static char __pyx_k42[] = "mean <= 0.0";
+static char __pyx_k43[] = "left > mode";
+static char __pyx_k44[] = "mode > right";
+static char __pyx_k45[] = "left == right";
+static char __pyx_k46[] = "greater";
+static char __pyx_k47[] = "equal";
+static char __pyx_k48[] = "n <= 0";
+static char __pyx_k49[] = "p < 0";
+static char __pyx_k50[] = "p > 1";
+static char __pyx_k51[] = "lam < 0";
+static char __pyx_k52[] = "a <= 1.0";
+static char __pyx_k53[] = "p < 0.0";
+static char __pyx_k54[] = "p > 1.0";
+static char __pyx_k55[] = "ngood < 1";
+static char __pyx_k56[] = "nbad < 1";
+static char __pyx_k57[] = "nsample < 1";
+static char __pyx_k58[] = "ngood + nbad < nsample";
+static char __pyx_k59[] = "add";
+static char __pyx_k60[] = "array";
+static char __pyx_k61[] = "shape";
+static char __pyx_k62[] = "mean must be 1 dimensional";
+static char __pyx_k63[] = "cov must be 2 dimensional and square";
+static char __pyx_k64[] = "mean and cov must have same length";
+static char __pyx_k65[] = "append";
+static char __pyx_k66[] = "multiply";
+static char __pyx_k67[] = "reduce";
+static char __pyx_k68[] = "numpy.dual";
+static char __pyx_k69[] = "svd";
+static char __pyx_k70[] = "dot";
+static char __pyx_k71[] = "sqrt";
+static char __pyx_k72[] = "sum(pvals[:-1]) > 1.0";
+static char __pyx_k73[] = "zeros";
+static char __pyx_k74[] = "copy";
+static char __pyx_k75[] = "arange";
+static char __pyx_k76[] = "shuffle";
+static char __pyx_k77[] = "numpy";
+static char __pyx_k78[] = "_rand";
+static char __pyx_k79[] = "bytes";
+static char __pyx_k80[] = "uniform";
+static char __pyx_k81[] = "rand";
+static char __pyx_k82[] = "randn";
+static char __pyx_k83[] = "random_integers";
+static char __pyx_k84[] = "normal";
+static char __pyx_k85[] = "beta";
+static char __pyx_k86[] = "exponential";
+static char __pyx_k87[] = "standard_exponential";
+static char __pyx_k88[] = "standard_gamma";
+static char __pyx_k89[] = "gamma";
+static char __pyx_k90[] = "f";
+static char __pyx_k91[] = "noncentral_f";
+static char __pyx_k92[] = "chisquare";
+static char __pyx_k93[] = "noncentral_chisquare";
+static char __pyx_k94[] = "standard_cauchy";
+static char __pyx_k95[] = "standard_t";
+static char __pyx_k96[] = "vonmises";
+static char __pyx_k97[] = "pareto";
+static char __pyx_k98[] = "weibull";
+static char __pyx_k99[] = "power";
+static char __pyx_k100[] = "laplace";
+static char __pyx_k101[] = "gumbel";
+static char __pyx_k102[] = "logistic";
+static char __pyx_k103[] = "lognormal";
+static char __pyx_k104[] = "rayleigh";
+static char __pyx_k105[] = "wald";
+static char __pyx_k106[] = "triangular";
+static char __pyx_k107[] = "binomial";
+static char __pyx_k108[] = "negative_binomial";
+static char __pyx_k109[] = "poisson";
+static char __pyx_k110[] = "zipf";
+static char __pyx_k111[] = "geometric";
+static char __pyx_k112[] = "hypergeometric";
+static char __pyx_k113[] = "logseries";
+static char __pyx_k114[] = "multivariate_normal";
+static char __pyx_k115[] = "multinomial";
+static char __pyx_k116[] = "dirichlet";
+static char __pyx_k117[] = "permutation";
 
-/* Implementation of mtrand */
-
-
-static PyObject *__pyx_n_numpy;
-static PyObject *__pyx_n__sp;
+static PyObject *__pyx_n_MT19937;
+static PyObject *__pyx_n___RandomState_ctor;
 static PyObject *__pyx_n__rand;
-static PyObject *__pyx_n_seed;
-static PyObject *__pyx_n_get_state;
-static PyObject *__pyx_n_set_state;
-static PyObject *__pyx_n_random_sample;
-static PyObject *__pyx_n_randint;
+static PyObject *__pyx_n_add;
+static PyObject *__pyx_n_any;
+static PyObject *__pyx_n_append;
+static PyObject *__pyx_n_arange;
+static PyObject *__pyx_n_array;
+static PyObject *__pyx_n_asarray;
+static PyObject *__pyx_n_beta;
+static PyObject *__pyx_n_binomial;
 static PyObject *__pyx_n_bytes;
-static PyObject *__pyx_n_uniform;
+static PyObject *__pyx_n_chisquare;
+static PyObject *__pyx_n_copy;
+static PyObject *__pyx_n_dirichlet;
+static PyObject *__pyx_n_dot;
+static PyObject *__pyx_n_empty;
+static PyObject *__pyx_n_equal;
+static PyObject *__pyx_n_exponential;
+static PyObject *__pyx_n_f;
+static PyObject *__pyx_n_float64;
+static PyObject *__pyx_n_gamma;
+static PyObject *__pyx_n_geometric;
+static PyObject *__pyx_n_get_state;
+static PyObject *__pyx_n_greater;
+static PyObject *__pyx_n_gumbel;
+static PyObject *__pyx_n_hypergeometric;
+static PyObject *__pyx_n_integer;
+static PyObject *__pyx_n_laplace;
+static PyObject *__pyx_n_less;
+static PyObject *__pyx_n_less_equal;
+static PyObject *__pyx_n_logistic;
+static PyObject *__pyx_n_lognormal;
+static PyObject *__pyx_n_logseries;
+static PyObject *__pyx_n_multinomial;
+static PyObject *__pyx_n_multiply;
+static PyObject *__pyx_n_multivariate_normal;
+static PyObject *__pyx_n_negative_binomial;
+static PyObject *__pyx_n_noncentral_chisquare;
+static PyObject *__pyx_n_noncentral_f;
+static PyObject *__pyx_n_normal;
+static PyObject *__pyx_n_np;
+static PyObject *__pyx_n_numpy;
+static PyObject *__pyx_n_pareto;
+static PyObject *__pyx_n_permutation;
+static PyObject *__pyx_n_poisson;
+static PyObject *__pyx_n_power;
 static PyObject *__pyx_n_rand;
+static PyObject *__pyx_n_randint;
 static PyObject *__pyx_n_randn;
+static PyObject *__pyx_n_random;
 static PyObject *__pyx_n_random_integers;
-static PyObject *__pyx_n_standard_normal;
-static PyObject *__pyx_n_normal;
-static PyObject *__pyx_n_beta;
-static PyObject *__pyx_n_exponential;
+static PyObject *__pyx_n_random_sample;
+static PyObject *__pyx_n_rayleigh;
+static PyObject *__pyx_n_reduce;
+static PyObject *__pyx_n_seed;
+static PyObject *__pyx_n_set_state;
+static PyObject *__pyx_n_shape;
+static PyObject *__pyx_n_shuffle;
+static PyObject *__pyx_n_size;
+static PyObject *__pyx_n_sqrt;
+static PyObject *__pyx_n_standard_cauchy;
 static PyObject *__pyx_n_standard_exponential;
 static PyObject *__pyx_n_standard_gamma;
-static PyObject *__pyx_n_gamma;
-static PyObject *__pyx_n_f;
-static PyObject *__pyx_n_noncentral_f;
-static PyObject *__pyx_n_chisquare;
-static PyObject *__pyx_n_noncentral_chisquare;
-static PyObject *__pyx_n_standard_cauchy;
+static PyObject *__pyx_n_standard_normal;
 static PyObject *__pyx_n_standard_t;
+static PyObject *__pyx_n_subtract;
+static PyObject *__pyx_n_svd;
+static PyObject *__pyx_n_triangular;
+static PyObject *__pyx_n_uint;
+static PyObject *__pyx_n_uint32;
+static PyObject *__pyx_n_uniform;
 static PyObject *__pyx_n_vonmises;
-static PyObject *__pyx_n_pareto;
-static PyObject *__pyx_n_weibull;
-static PyObject *__pyx_n_power;
-static PyObject *__pyx_n_laplace;
-static PyObject *__pyx_n_gumbel;
-static PyObject *__pyx_n_logistic;
-static PyObject *__pyx_n_lognormal;
-static PyObject *__pyx_n_rayleigh;
 static PyObject *__pyx_n_wald;
-static PyObject *__pyx_n_triangular;
-static PyObject *__pyx_n_binomial;
-static PyObject *__pyx_n_negative_binomial;
-static PyObject *__pyx_n_poisson;
+static PyObject *__pyx_n_weibull;
+static PyObject *__pyx_n_zeros;
 static PyObject *__pyx_n_zipf;
-static PyObject *__pyx_n_geometric;
-static PyObject *__pyx_n_hypergeometric;
-static PyObject *__pyx_n_logseries;
-static PyObject *__pyx_n_multivariate_normal;
-static PyObject *__pyx_n_multinomial;
-static PyObject *__pyx_n_dirichlet;
-static PyObject *__pyx_n_shuffle;
-static PyObject *__pyx_n_permutation;
 
-static PyObject *__pyx_n_empty;
-static PyObject *__pyx_n_float64;
+static PyObject *__pyx_k4p;
+static PyObject *__pyx_k11p;
+static PyObject *__pyx_k12p;
+static PyObject *__pyx_k17p;
+static PyObject *__pyx_k23p;
+static PyObject *__pyx_k26p;
+static PyObject *__pyx_k27p;
+static PyObject *__pyx_k28p;
+static PyObject *__pyx_k29p;
+static PyObject *__pyx_k30p;
+static PyObject *__pyx_k31p;
+static PyObject *__pyx_k32p;
+static PyObject *__pyx_k34p;
+static PyObject *__pyx_k35p;
+static PyObject *__pyx_k36p;
+static PyObject *__pyx_k37p;
+static PyObject *__pyx_k38p;
+static PyObject *__pyx_k39p;
+static PyObject *__pyx_k40p;
+static PyObject *__pyx_k41p;
+static PyObject *__pyx_k42p;
+static PyObject *__pyx_k43p;
+static PyObject *__pyx_k44p;
+static PyObject *__pyx_k45p;
+static PyObject *__pyx_k48p;
+static PyObject *__pyx_k49p;
+static PyObject *__pyx_k50p;
+static PyObject *__pyx_k51p;
+static PyObject *__pyx_k52p;
+static PyObject *__pyx_k53p;
+static PyObject *__pyx_k54p;
+static PyObject *__pyx_k55p;
+static PyObject *__pyx_k56p;
+static PyObject *__pyx_k57p;
+static PyObject *__pyx_k58p;
+static PyObject *__pyx_k62p;
+static PyObject *__pyx_k63p;
+static PyObject *__pyx_k64p;
+static PyObject *__pyx_k68p;
+static PyObject *__pyx_k72p;
 
+static __Pyx_StringTabEntry __pyx_string_tab[] = {
+  {&__pyx_n_MT19937, 1, __pyx_k10, sizeof(__pyx_k10)},
+  {&__pyx_n___RandomState_ctor, 1, __pyx_k16, sizeof(__pyx_k16)},
+  {&__pyx_n__rand, 1, __pyx_k78, sizeof(__pyx_k78)},
+  {&__pyx_n_add, 1, __pyx_k59, sizeof(__pyx_k59)},
+  {&__pyx_n_any, 1, __pyx_k24, sizeof(__pyx_k24)},
+  {&__pyx_n_append, 1, __pyx_k65, sizeof(__pyx_k65)},
+  {&__pyx_n_arange, 1, __pyx_k75, sizeof(__pyx_k75)},
+  {&__pyx_n_array, 1, __pyx_k60, sizeof(__pyx_k60)},
+  {&__pyx_n_asarray, 1, __pyx_k8, sizeof(__pyx_k8)},
+  {&__pyx_n_beta, 1, __pyx_k85, sizeof(__pyx_k85)},
+  {&__pyx_n_binomial, 1, __pyx_k107, sizeof(__pyx_k107)},
+  {&__pyx_n_bytes, 1, __pyx_k79, sizeof(__pyx_k79)},
+  {&__pyx_n_chisquare, 1, __pyx_k92, sizeof(__pyx_k92)},
+  {&__pyx_n_copy, 1, __pyx_k74, sizeof(__pyx_k74)},
+  {&__pyx_n_dirichlet, 1, __pyx_k116, sizeof(__pyx_k116)},
+  {&__pyx_n_dot, 1, __pyx_k70, sizeof(__pyx_k70)},
+  {&__pyx_n_empty, 1, __pyx_k2, sizeof(__pyx_k2)},
+  {&__pyx_n_equal, 1, __pyx_k47, sizeof(__pyx_k47)},
+  {&__pyx_n_exponential, 1, __pyx_k86, sizeof(__pyx_k86)},
+  {&__pyx_n_f, 1, __pyx_k90, sizeof(__pyx_k90)},
+  {&__pyx_n_float64, 1, __pyx_k3, sizeof(__pyx_k3)},
+  {&__pyx_n_gamma, 1, __pyx_k89, sizeof(__pyx_k89)},
+  {&__pyx_n_geometric, 1, __pyx_k111, sizeof(__pyx_k111)},
+  {&__pyx_n_get_state, 1, __pyx_k13, sizeof(__pyx_k13)},
+  {&__pyx_n_greater, 1, __pyx_k46, sizeof(__pyx_k46)},
+  {&__pyx_n_gumbel, 1, __pyx_k101, sizeof(__pyx_k101)},
+  {&__pyx_n_hypergeometric, 1, __pyx_k112, sizeof(__pyx_k112)},
+  {&__pyx_n_integer, 1, __pyx_k6, sizeof(__pyx_k6)},
+  {&__pyx_n_laplace, 1, __pyx_k100, sizeof(__pyx_k100)},
+  {&__pyx_n_less, 1, __pyx_k33, sizeof(__pyx_k33)},
+  {&__pyx_n_less_equal, 1, __pyx_k25, sizeof(__pyx_k25)},
+  {&__pyx_n_logistic, 1, __pyx_k102, sizeof(__pyx_k102)},
+  {&__pyx_n_lognormal, 1, __pyx_k103, sizeof(__pyx_k103)},
+  {&__pyx_n_logseries, 1, __pyx_k113, sizeof(__pyx_k113)},
+  {&__pyx_n_multinomial, 1, __pyx_k115, sizeof(__pyx_k115)},
+  {&__pyx_n_multiply, 1, __pyx_k66, sizeof(__pyx_k66)},
+  {&__pyx_n_multivariate_normal, 1, __pyx_k114, sizeof(__pyx_k114)},
+  {&__pyx_n_negative_binomial, 1, __pyx_k108, sizeof(__pyx_k108)},
+  {&__pyx_n_noncentral_chisquare, 1, __pyx_k93, sizeof(__pyx_k93)},
+  {&__pyx_n_noncentral_f, 1, __pyx_k91, sizeof(__pyx_k91)},
+  {&__pyx_n_normal, 1, __pyx_k84, sizeof(__pyx_k84)},
+  {&__pyx_n_np, 1, __pyx_k1, sizeof(__pyx_k1)},
+  {&__pyx_n_numpy, 1, __pyx_k77, sizeof(__pyx_k77)},
+  {&__pyx_n_pareto, 1, __pyx_k97, sizeof(__pyx_k97)},
+  {&__pyx_n_permutation, 1, __pyx_k117, sizeof(__pyx_k117)},
+  {&__pyx_n_poisson, 1, __pyx_k109, sizeof(__pyx_k109)},
+  {&__pyx_n_power, 1, __pyx_k99, sizeof(__pyx_k99)},
+  {&__pyx_n_rand, 1, __pyx_k81, sizeof(__pyx_k81)},
+  {&__pyx_n_randint, 1, __pyx_k22, sizeof(__pyx_k22)},
+  {&__pyx_n_randn, 1, __pyx_k82, sizeof(__pyx_k82)},
+  {&__pyx_n_random, 1, __pyx_k15, sizeof(__pyx_k15)},
+  {&__pyx_n_random_integers, 1, __pyx_k83, sizeof(__pyx_k83)},
+  {&__pyx_n_random_sample, 1, __pyx_k19, sizeof(__pyx_k19)},
+  {&__pyx_n_rayleigh, 1, __pyx_k104, sizeof(__pyx_k104)},
+  {&__pyx_n_reduce, 1, __pyx_k67, sizeof(__pyx_k67)},
+  {&__pyx_n_seed, 1, __pyx_k5, sizeof(__pyx_k5)},
+  {&__pyx_n_set_state, 1, __pyx_k14, sizeof(__pyx_k14)},
+  {&__pyx_n_shape, 1, __pyx_k61, sizeof(__pyx_k61)},
+  {&__pyx_n_shuffle, 1, __pyx_k76, sizeof(__pyx_k76)},
+  {&__pyx_n_size, 1, __pyx_k20, sizeof(__pyx_k20)},
+  {&__pyx_n_sqrt, 1, __pyx_k71, sizeof(__pyx_k71)},
+  {&__pyx_n_standard_cauchy, 1, __pyx_k94, sizeof(__pyx_k94)},
+  {&__pyx_n_standard_exponential, 1, __pyx_k87, sizeof(__pyx_k87)},
+  {&__pyx_n_standard_gamma, 1, __pyx_k88, sizeof(__pyx_k88)},
+  {&__pyx_n_standard_normal, 1, __pyx_k21, sizeof(__pyx_k21)},
+  {&__pyx_n_standard_t, 1, __pyx_k95, sizeof(__pyx_k95)},
+  {&__pyx_n_subtract, 1, __pyx_k18, sizeof(__pyx_k18)},
+  {&__pyx_n_svd, 1, __pyx_k69, sizeof(__pyx_k69)},
+  {&__pyx_n_triangular, 1, __pyx_k106, sizeof(__pyx_k106)},
+  {&__pyx_n_uint, 1, __pyx_k7, sizeof(__pyx_k7)},
+  {&__pyx_n_uint32, 1, __pyx_k9, sizeof(__pyx_k9)},
+  {&__pyx_n_uniform, 1, __pyx_k80, sizeof(__pyx_k80)},
+  {&__pyx_n_vonmises, 1, __pyx_k96, sizeof(__pyx_k96)},
+  {&__pyx_n_wald, 1, __pyx_k105, sizeof(__pyx_k105)},
+  {&__pyx_n_weibull, 1, __pyx_k98, sizeof(__pyx_k98)},
+  {&__pyx_n_zeros, 1, __pyx_k73, sizeof(__pyx_k73)},
+  {&__pyx_n_zipf, 1, __pyx_k110, sizeof(__pyx_k110)},
+  {&__pyx_k4p, 0, __pyx_k4, sizeof(__pyx_k4)},
+  {&__pyx_k11p, 0, __pyx_k11, sizeof(__pyx_k11)},
+  {&__pyx_k12p, 0, __pyx_k12, sizeof(__pyx_k12)},
+  {&__pyx_k17p, 0, __pyx_k17, sizeof(__pyx_k17)},
+  {&__pyx_k23p, 0, __pyx_k23, sizeof(__pyx_k23)},
+  {&__pyx_k26p, 0, __pyx_k26, sizeof(__pyx_k26)},
+  {&__pyx_k27p, 0, __pyx_k27, sizeof(__pyx_k27)},
+  {&__pyx_k28p, 0, __pyx_k28, sizeof(__pyx_k28)},
+  {&__pyx_k29p, 0, __pyx_k29, sizeof(__pyx_k29)},
+  {&__pyx_k30p, 0, __pyx_k30, sizeof(__pyx_k30)},
+  {&__pyx_k31p, 0, __pyx_k31, sizeof(__pyx_k31)},
+  {&__pyx_k32p, 0, __pyx_k32, sizeof(__pyx_k32)},
+  {&__pyx_k34p, 0, __pyx_k34, sizeof(__pyx_k34)},
+  {&__pyx_k35p, 0, __pyx_k35, sizeof(__pyx_k35)},
+  {&__pyx_k36p, 0, __pyx_k36, sizeof(__pyx_k36)},
+  {&__pyx_k37p, 0, __pyx_k37, sizeof(__pyx_k37)},
+  {&__pyx_k38p, 0, __pyx_k38, sizeof(__pyx_k38)},
+  {&__pyx_k39p, 0, __pyx_k39, sizeof(__pyx_k39)},
+  {&__pyx_k40p, 0, __pyx_k40, sizeof(__pyx_k40)},
+  {&__pyx_k41p, 0, __pyx_k41, sizeof(__pyx_k41)},
+  {&__pyx_k42p, 0, __pyx_k42, sizeof(__pyx_k42)},
+  {&__pyx_k43p, 0, __pyx_k43, sizeof(__pyx_k43)},
+  {&__pyx_k44p, 0, __pyx_k44, sizeof(__pyx_k44)},
+  {&__pyx_k45p, 0, __pyx_k45, sizeof(__pyx_k45)},
+  {&__pyx_k48p, 0, __pyx_k48, sizeof(__pyx_k48)},
+  {&__pyx_k49p, 0, __pyx_k49, sizeof(__pyx_k49)},
+  {&__pyx_k50p, 0, __pyx_k50, sizeof(__pyx_k50)},
+  {&__pyx_k51p, 0, __pyx_k51, sizeof(__pyx_k51)},
+  {&__pyx_k52p, 0, __pyx_k52, sizeof(__pyx_k52)},
+  {&__pyx_k53p, 0, __pyx_k53, sizeof(__pyx_k53)},
+  {&__pyx_k54p, 0, __pyx_k54, sizeof(__pyx_k54)},
+  {&__pyx_k55p, 0, __pyx_k55, sizeof(__pyx_k55)},
+  {&__pyx_k56p, 0, __pyx_k56, sizeof(__pyx_k56)},
+  {&__pyx_k57p, 0, __pyx_k57, sizeof(__pyx_k57)},
+  {&__pyx_k58p, 0, __pyx_k58, sizeof(__pyx_k58)},
+  {&__pyx_k62p, 0, __pyx_k62, sizeof(__pyx_k62)},
+  {&__pyx_k63p, 0, __pyx_k63, sizeof(__pyx_k63)},
+  {&__pyx_k64p, 0, __pyx_k64, sizeof(__pyx_k64)},
+  {&__pyx_k68p, 0, __pyx_k68, sizeof(__pyx_k68)},
+  {&__pyx_k72p, 0, __pyx_k72, sizeof(__pyx_k72)},
+  {0, 0, 0, 0}
+};
+
+static PyObject *__pyx_d1;
+static PyObject *__pyx_d2;
+static PyObject *__pyx_d3;
+static PyObject *__pyx_d4;
+static PyObject *__pyx_d5;
+static PyObject *__pyx_d6;
+static PyObject *__pyx_d7;
+static PyObject *__pyx_d8;
+static PyObject *__pyx_d9;
+static PyObject *__pyx_d10;
+static PyObject *__pyx_d11;
+static PyObject *__pyx_d12;
+static PyObject *__pyx_d13;
+static PyObject *__pyx_d14;
+static PyObject *__pyx_d15;
+static PyObject *__pyx_d16;
+static PyObject *__pyx_d17;
+static PyObject *__pyx_d18;
+static PyObject *__pyx_d19;
+static PyObject *__pyx_d20;
+static PyObject *__pyx_d21;
+static PyObject *__pyx_d22;
+static PyObject *__pyx_d23;
+static PyObject *__pyx_d24;
+static PyObject *__pyx_d25;
+static PyObject *__pyx_d26;
+static PyObject *__pyx_d27;
+static PyObject *__pyx_d28;
+static PyObject *__pyx_d29;
+static PyObject *__pyx_d30;
+static PyObject *__pyx_d31;
+static PyObject *__pyx_d32;
+static PyObject *__pyx_d33;
+static PyObject *__pyx_d34;
+static PyObject *__pyx_d35;
+static PyObject *__pyx_d36;
+static PyObject *__pyx_d37;
+static PyObject *__pyx_d38;
+static PyObject *__pyx_d39;
+static PyObject *__pyx_d40;
+static PyObject *__pyx_d41;
+static PyObject *__pyx_d42;
+static PyObject *__pyx_d43;
+static PyObject *__pyx_d44;
+static PyObject *__pyx_d45;
+static PyObject *__pyx_d46;
+static PyObject *__pyx_d47;
+static PyObject *__pyx_d48;
+static PyObject *__pyx_d49;
+static PyObject *__pyx_d50;
+static PyObject *__pyx_d51;
+static PyObject *__pyx_d52;
+static PyObject *__pyx_d53;
+static PyObject *__pyx_d54;
+static PyObject *__pyx_d55;
+static PyObject *__pyx_d56;
+static PyObject *__pyx_d57;
+static PyObject *__pyx_d58;
+static PyObject *__pyx_d59;
+
+
+/* Implementation of mtrand */
+
 static PyObject *__pyx_f_6mtrand_cont0_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont0 __pyx_v_func,PyObject *__pyx_v_size) {
   double *__pyx_v_array_data;
   PyArrayObject *arrayObject;
@@ -247,7 +552,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":130 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":130 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;}
@@ -258,11 +563,11 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":133 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":133 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
@@ -273,23 +578,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":134 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":134 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":135 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":135 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":136 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":136 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":138 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":138 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -323,7 +628,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":147 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":147 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; goto __pyx_L1;}
@@ -334,11 +639,11 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":150 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":150 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
@@ -349,23 +654,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":151 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":151 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":152 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":152 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":153 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":153 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":155 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":155 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -386,10 +691,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k61p;
-
-static char __pyx_k61[] = "size is not compatible with inputs";
-
 static PyObject *__pyx_f_6mtrand_cont1_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont1 __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) {
   double *__pyx_v_array_data;
   double *__pyx_v_oa_data;
@@ -410,48 +711,48 @@
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":166 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":166 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":167 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":167 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":168 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":168 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":169 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":169 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":170 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":170 */
     __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)__pyx_v_itera));
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":171 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":171 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":172 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":172 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":173 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":173 */
       PyArray_ITER_NEXT(__pyx_v_itera);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":175 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":175 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
@@ -462,27 +763,27 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":176 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":176 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":177 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":177 */
     __pyx_3 = PyArray_MultiIterNew(2,((void *)arrayObject),((void *)__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
+    Py_INCREF(__pyx_3);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":179 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":179 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
-      Py_INCREF(__pyx_k61p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k61p);
+      Py_INCREF(__pyx_k4p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k4p);
       __pyx_4 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_4, 0, 0);
@@ -492,23 +793,23 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":181 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":181 */
     __pyx_5 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":182 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":182 */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":183 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":183 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":184 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":184 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
     }
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":185 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":185 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -543,7 +844,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":194 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":194 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;}
@@ -554,11 +855,11 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":197 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":197 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
@@ -569,23 +870,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":198 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":198 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":199 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":199 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":200 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":200 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":202 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":202 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -606,10 +907,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k62p;
-
-static char __pyx_k62[] = "size is not compatible with inputs";
-
 static PyObject *__pyx_f_6mtrand_cont2_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont2 __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob) {
   double *__pyx_v_array_data;
   double *__pyx_v_oa_data;
@@ -629,52 +926,52 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":215 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":215 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":216 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":216 */
     __pyx_2 = PyArray_MultiIterNew(2,((void *)__pyx_v_oa),((void *)__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 216; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":217 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":217 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":218 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":218 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":219 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":219 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":220 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":220 */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":221 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":221 */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":222 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":222 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":223 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":223 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":225 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":225 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
     __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
@@ -685,27 +982,27 @@
     __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
+    Py_INCREF(__pyx_5);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":226 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":226 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":227 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":227 */
     __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 = 227; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":228 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":228 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
-      Py_INCREF(__pyx_k62p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k62p);
+      Py_INCREF(__pyx_k4p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k4p);
       __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_5, 0, 0);
@@ -715,29 +1012,29 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":230 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":230 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":231 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":231 */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":232 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":232 */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":233 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":233 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":234 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":234 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":235 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":235 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
     }
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":236 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":236 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -772,7 +1069,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":246 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":246 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
@@ -783,11 +1080,11 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":249 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":249 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
@@ -798,23 +1095,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":250 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":250 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":251 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":251 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":252 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":252 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":254 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":254 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -835,10 +1132,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k63p;
-
-static char __pyx_k63[] = "size is not compatible with inputs";
-
 static PyObject *__pyx_f_6mtrand_cont3_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont3 __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob,PyArrayObject *__pyx_v_oc) {
   double *__pyx_v_array_data;
   double *__pyx_v_oa_data;
@@ -860,55 +1153,55 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":268 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":268 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":269 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":269 */
     __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 = 269; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":270 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":270 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":271 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":271 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":272 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":272 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":273 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":273 */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":274 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":274 */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":275 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":275 */
       __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":276 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":276 */
       (__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]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":277 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":277 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":279 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":279 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
     __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
@@ -919,27 +1212,27 @@
     __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
+    Py_INCREF(__pyx_5);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":280 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":280 */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":281 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":281 */
     __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 = 281; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":283 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":283 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; goto __pyx_L1;}
-      Py_INCREF(__pyx_k63p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k63p);
+      Py_INCREF(__pyx_k4p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k4p);
       __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_5, 0, 0);
@@ -949,29 +1242,29 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":285 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":285 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":286 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":286 */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":287 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":287 */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":288 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":288 */
       __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":289 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":289 */
       (__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]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":290 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":290 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":291 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":291 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1007,7 +1300,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":299 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":299 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 300; goto __pyx_L1;}
@@ -1018,8 +1311,8 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":302 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":302 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; goto __pyx_L1;}
@@ -1030,23 +1323,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":303 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":303 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":304 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":304 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":305 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":305 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":307 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":307 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1080,7 +1373,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":315 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":315 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 316; goto __pyx_L1;}
@@ -1091,8 +1384,8 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":318 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":318 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
@@ -1103,23 +1396,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":319 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":319 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":320 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":320 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":321 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":321 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":323 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":323 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1140,10 +1433,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k64p;
-
-static char __pyx_k64[] = "size is not compatible with inputs";
-
 static PyObject *__pyx_f_6mtrand_discnp_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discnp __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_op) {
   long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
@@ -1163,49 +1452,49 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":334 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":334 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":335 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":335 */
     __pyx_2 = PyArray_MultiIterNew(2,((void *)__pyx_v_on),((void *)__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":336 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":336 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":337 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":337 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":338 */
+    /* "/home/alan/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) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":339 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":339 */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":340 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":340 */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":341 */
+      /* "/home/alan/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]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":342 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":342 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":344 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":344 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; goto __pyx_L1;}
@@ -1216,27 +1505,27 @@
     __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
+    Py_INCREF(__pyx_5);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":345 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":345 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":346 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":346 */
     __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 = 346; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":347 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":347 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 348; goto __pyx_L1;}
-      Py_INCREF(__pyx_k64p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k64p);
+      Py_INCREF(__pyx_k4p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k4p);
       __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 348; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_5, 0, 0);
@@ -1246,29 +1535,29 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":349 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":349 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":350 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":350 */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":351 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":351 */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":352 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":352 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":353 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":353 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":354 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":354 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
     }
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":356 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":356 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1303,7 +1592,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":365 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":365 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 366; goto __pyx_L1;}
@@ -1314,8 +1603,8 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":368 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":368 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
@@ -1326,23 +1615,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":369 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":369 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":370 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":370 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":371 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":371 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":373 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":373 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1363,10 +1652,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k65p;
-
-static char __pyx_k65[] = "size is not compatible with inputs";
-
 static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discnmN __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_om,PyArrayObject *__pyx_v_oN) {
   long *__pyx_v_array_data;
   long *__pyx_v_on_data;
@@ -1388,52 +1673,52 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":386 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":386 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":387 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":387 */
     __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 = 387; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":388 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":388 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":389 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":389 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":390 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":390 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":391 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":391 */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":392 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":392 */
       __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":393 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":393 */
       __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":394 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":394 */
       (__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]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":395 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":395 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":397 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":397 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
@@ -1444,27 +1729,27 @@
     __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
+    Py_INCREF(__pyx_5);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":398 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":398 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":399 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":399 */
     __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 = 399; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":401 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":401 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; goto __pyx_L1;}
-      Py_INCREF(__pyx_k65p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k65p);
+      Py_INCREF(__pyx_k4p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k4p);
       __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_5, 0, 0);
@@ -1474,29 +1759,29 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":403 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":403 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":404 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":404 */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":405 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":405 */
       __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":406 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":406 */
       __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":407 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":407 */
       (__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]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":408 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":408 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":410 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":410 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1532,7 +1817,7 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":418 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":418 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 419; goto __pyx_L1;}
@@ -1543,8 +1828,8 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":421 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":421 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
@@ -1555,23 +1840,23 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":422 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":422 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":423 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":423 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":424 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":424 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":426 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":426 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1592,10 +1877,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k66p;
-
-static char __pyx_k66[] = "size is not compatible with inputs";
-
 static PyObject *__pyx_f_6mtrand_discd_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discd __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) {
   long *__pyx_v_array_data;
   double *__pyx_v_oa_data;
@@ -1616,45 +1897,45 @@
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":437 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":437 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":438 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":438 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 438; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":439 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":439 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":440 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":440 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":441 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":441 */
     __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)__pyx_v_itera));
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":442 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":442 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":443 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":443 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":444 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":444 */
       PyArray_ITER_NEXT(__pyx_v_itera);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":446 */
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":446 */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
@@ -1665,27 +1946,27 @@
     __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    Py_INCREF(__pyx_4);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":447 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":447 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":448 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":448 */
     __pyx_3 = PyArray_MultiIterNew(2,((void *)arrayObject),((void *)__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
+    Py_INCREF(__pyx_3);
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":449 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":449 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 450; goto __pyx_L1;}
-      Py_INCREF(__pyx_k66p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k66p);
+      Py_INCREF(__pyx_k4p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k4p);
       __pyx_4 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 450; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_4, 0, 0);
@@ -1695,23 +1976,23 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":451 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":451 */
     __pyx_5 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":452 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":452 */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":453 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":453 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":454 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":454 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
     }
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":455 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":455 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1741,29 +2022,29 @@
   long __pyx_v_i;
   double __pyx_r;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":460 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":460 */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":461 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":461 */
   __pyx_v_c = 0.0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":462 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":462 */
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":463 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":463 */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":464 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":464 */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":465 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":465 */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":466 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":466 */
     __pyx_v_sum = __pyx_v_t;
   }
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":467 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":467 */
   __pyx_r = __pyx_v_sum;
   goto __pyx_L0;
 
@@ -1780,15 +2061,15 @@
   PyObject *__pyx_2 = 0;
   PyObject *__pyx_3 = 0;
   static char *__pyx_argnames[] = {"seed",0};
-  __pyx_v_seed = __pyx_k2;
+  __pyx_v_seed = __pyx_d1;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_seed)) return -1;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_seed);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":490 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":490 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state *)PyMem_Malloc((sizeof(rk_state))));
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":492 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":492 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;}
   Py_INCREF(__pyx_v_seed);
@@ -1819,10 +2100,10 @@
   __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != NULL);
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":496 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":496 */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":497 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":497 */
     ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = NULL;
     goto __pyx_L2;
   }
@@ -1831,8 +2112,6 @@
   Py_DECREF(__pyx_v_self);
 }
 
-static PyObject *__pyx_n_integer;
-
 static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_seed[] = "Seed the generator.\n\n        seed(seed=None)\n\n        seed can be an integer, an array (or other sequence) of integers of any\n        length, or None. If seed is None, then RandomState will try to read data\n        from /dev/urandom (or the Windows analogue) if available or seed from\n        the clock otherwise.\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -1846,14 +2125,14 @@
   PyObject *__pyx_3 = 0;
   unsigned long __pyx_4;
   static char *__pyx_argnames[] = {"seed",0};
-  __pyx_v_seed = __pyx_k3;
+  __pyx_v_seed = __pyx_d2;
   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 = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_iseed = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":511 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":511 */
   __pyx_1 = __pyx_v_seed == Py_None;
   if (__pyx_1) {
     __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
@@ -1871,14 +2150,14 @@
     rk_seed(__pyx_4,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_integer); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = PyObject_IsInstance(__pyx_v_seed,__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":516 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":516 */
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 516; goto __pyx_L1;}
     Py_INCREF(__pyx_v_seed);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_seed);
@@ -1888,21 +2167,21 @@
     __pyx_v_iseed = __pyx_3;
     __pyx_3 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":517 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":517 */
     __pyx_4 = PyInt_AsUnsignedLongMask(__pyx_v_iseed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; goto __pyx_L1;}
     rk_seed(__pyx_4,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":519 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":519 */
     __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+    Py_INCREF(__pyx_2);
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":520 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":520 */
     init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long *)arrayObject_obj->data),(arrayObject_obj->dimensions[0]));
   }
   __pyx_L2:;
@@ -1922,12 +2201,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_uint;
-static PyObject *__pyx_n_asarray;
-static PyObject *__pyx_n_uint32;
-static PyObject *__pyx_n_MT19937;
-
-
 static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_get_state[] = "Return a tuple representing the internal state of the generator.\n\n        get_state() -> (\'MT19937\', int key[624], int pos, int has_gauss, float cached_gaussian)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -1942,12 +2215,12 @@
   Py_INCREF(__pyx_v_self);
   arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":529 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":529 */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = PyInt_FromLong(624); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_uint); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
@@ -1958,19 +2231,19 @@
   __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
+  Py_INCREF(__pyx_1);
   Py_DECREF(((PyObject *)arrayObject_state));
   arrayObject_state = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":530 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":530 */
   memcpy(arrayObject_state->data,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,(624 * (sizeof(long))));
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":531 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":531 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_asarray); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_uint32); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
@@ -1981,12 +2254,12 @@
   __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)arrayObject_state));
   arrayObject_state = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":532 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":532 */
   __pyx_1 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->has_gauss); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; goto __pyx_L1;}
   __pyx_4 = PyFloat_FromDouble(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->gauss); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; goto __pyx_L1;}
@@ -2020,12 +2293,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k69p;
-static PyObject *__pyx_k70p;
-
-static char __pyx_k69[] = "algorithm must be 'MT19937'";
-static char __pyx_k70[] = "state must be 624 longs";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_set_state[] = "Set the state from a tuple.\n\n        state = (\'MT19937\', int key[624], int pos, int has_gauss, float cached_gaussian)\n\n        For backwards compatibility, the following form is also accepted\n        although it is missing some information about the cached Gaussian value.\n\n        state = (\'MT19937\', int key[624], int pos)\n\n        set_state(state)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -2054,19 +2321,19 @@
   __pyx_v_has_gauss = Py_None; Py_INCREF(Py_None);
   __pyx_v_cached_gaussian = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":549 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":549 */
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_state, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;}
   Py_DECREF(__pyx_v_algorithm_name);
   __pyx_v_algorithm_name = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":550 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":550 */
   if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; goto __pyx_L1;}
   __pyx_2 = __pyx_2 != 0;
   if (__pyx_2) {
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; goto __pyx_L1;}
-    Py_INCREF(__pyx_k69p);
-    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k69p);
+    Py_INCREF(__pyx_k11p);
+    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k11p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -2076,7 +2343,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":552 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":552 */
   __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;}
   __pyx_3 = PyObject_GetIter(__pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2091,18 +2358,18 @@
   if (__Pyx_EndUnpack(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":553 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":553 */
   __pyx_4 = PyObject_Length(__pyx_v_state); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 553; goto __pyx_L1;}
   __pyx_2 = (__pyx_4 == 3);
   if (__pyx_2) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":554 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":554 */
     __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 554; goto __pyx_L1;}
     Py_DECREF(__pyx_v_has_gauss);
     __pyx_v_has_gauss = __pyx_1;
     __pyx_1 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":555 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":555 */
     __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 555; goto __pyx_L1;}
     Py_DECREF(__pyx_v_cached_gaussian);
     __pyx_v_cached_gaussian = __pyx_3;
@@ -2126,10 +2393,10 @@
   }
   __pyx_L3:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":558 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":558 */
   /*try:*/ {
     __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_ULONG,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 559; goto __pyx_L4;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
+    Py_INCREF(__pyx_1);
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_1);
     Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2139,13 +2406,13 @@
   Py_XDECREF(__pyx_3); __pyx_3 = 0;
   Py_XDECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":560 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":560 */
   __pyx_2 = PyErr_ExceptionMatches(PyExc_TypeError);
   if (__pyx_2) {
     __Pyx_AddTraceback("mtrand.set_state");
     if (__Pyx_GetException(&__pyx_3, &__pyx_1, &__pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; goto __pyx_L1;}
     __pyx_6 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_6)));
+    Py_INCREF(__pyx_6);
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_6);
     Py_DECREF(__pyx_6); __pyx_6 = 0;
@@ -2157,12 +2424,12 @@
   goto __pyx_L1;
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":563 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":563 */
   __pyx_2 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_2) {
     __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;}
-    Py_INCREF(__pyx_k70p);
-    PyTuple_SET_ITEM(__pyx_6, 0, __pyx_k70p);
+    Py_INCREF(__pyx_k12p);
+    PyTuple_SET_ITEM(__pyx_6, 0, __pyx_k12p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;}
     Py_DECREF(__pyx_6); __pyx_6 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -2172,17 +2439,17 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":565 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":565 */
   memcpy(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,arrayObject_obj->data,(624 * (sizeof(long))));
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":566 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":566 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":567 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":567 */
   __pyx_2 = PyInt_AsLong(__pyx_v_has_gauss); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 567; goto __pyx_L1;}
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->has_gauss = __pyx_2;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":568 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":568 */
   __pyx_7 = PyFloat_AsDouble(__pyx_v_cached_gaussian); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 568; goto __pyx_L1;}
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->gauss = __pyx_7;
 
@@ -2267,9 +2534,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_random;
-static PyObject *__pyx_n___RandomState_ctor;
-
 static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
   PyObject *__pyx_r;
@@ -2280,7 +2544,7 @@
   static char *__pyx_argnames[] = {0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;}
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n___RandomState_ctor); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;}
@@ -2321,7 +2585,7 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   static char *__pyx_argnames[] = {"size",0};
-  __pyx_v_size = __pyx_k4;
+  __pyx_v_size = __pyx_d3;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
@@ -2349,7 +2613,7 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   static char *__pyx_argnames[] = {"size",0};
-  __pyx_v_size = __pyx_k5;
+  __pyx_v_size = __pyx_d4;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
@@ -2370,10 +2634,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k71p;
-
-static char __pyx_k71[] = "low >= high";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_randint[] = "Return random integers x such that low <= x < high.\n\n        randint(low, high=None, size=None) -> random values\n\n        If high is None, then 0 <= x < low.\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -2394,8 +2654,8 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"low","high","size",0};
-  __pyx_v_high = __pyx_k6;
-  __pyx_v_size = __pyx_k7;
+  __pyx_v_high = __pyx_d5;
+  __pyx_v_size = __pyx_d6;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OO", __pyx_argnames, &__pyx_v_low, &__pyx_v_high, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_low);
@@ -2403,39 +2663,39 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":608 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":608 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":609 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":609 */
     __pyx_v_lo = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":610 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":610 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":612 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":612 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 612; goto __pyx_L1;}
     __pyx_v_lo = __pyx_2;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":613 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":613 */
     __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 613; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":615 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":615 */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":616 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":616 */
   __pyx_1 = (__pyx_v_diff < 0);
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; goto __pyx_L1;}
-    Py_INCREF(__pyx_k71p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k71p);
+    Py_INCREF(__pyx_k17p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k17p);
     __pyx_4 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
@@ -2445,7 +2705,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":619 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":619 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
     __pyx_3 = PyInt_FromLong((((long)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 = 620; goto __pyx_L1;}
@@ -2456,8 +2716,8 @@
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":622 */
-    __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;}
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":622 */
+    __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;}
@@ -2468,23 +2728,23 @@
     __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
+    Py_INCREF(__pyx_5);
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":623 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":623 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":624 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":624 */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":625 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":625 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
       (__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)));
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":627 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":627 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -2521,19 +2781,19 @@
   Py_INCREF(__pyx_v_self);
   __pyx_v_bytestring = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":635 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":635 */
   __pyx_1 = PyString_FromStringAndSize(NULL,__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
   Py_DECREF(__pyx_v_bytestring);
   __pyx_v_bytestring = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":636 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":636 */
   __pyx_v_bytes = PyString_AS_STRING(__pyx_v_bytestring);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":637 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":637 */
   rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":638 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":638 */
   Py_INCREF(__pyx_v_bytestring);
   __pyx_r = __pyx_v_bytestring;
   goto __pyx_L0;
@@ -2550,8 +2810,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_subtract;
-
 static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_uniform[] = "Uniform distribution over [low, high).\n\n        uniform(low=0.0, high=1.0, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -2570,9 +2828,9 @@
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
   static char *__pyx_argnames[] = {"low","high","size",0};
-  __pyx_v_low = __pyx_k8;
-  __pyx_v_high = __pyx_k9;
-  __pyx_v_size = __pyx_k10;
+  __pyx_v_low = __pyx_d7;
+  __pyx_v_high = __pyx_d8;
+  __pyx_v_size = __pyx_d9;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OOO", __pyx_argnames, &__pyx_v_low, &__pyx_v_high, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_low);
@@ -2583,13 +2841,13 @@
   __pyx_v_odiff = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_temp = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":649 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":649 */
   __pyx_v_flow = PyFloat_AsDouble(__pyx_v_low);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":650 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":650 */
   __pyx_v_fhigh = PyFloat_AsDouble(__pyx_v_high);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":651 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":651 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_flow,(__pyx_v_fhigh - __pyx_v_flow)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; goto __pyx_L1;}
@@ -2600,25 +2858,25 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":653 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":653 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":654 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":654 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 654; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_olow));
   __pyx_v_olow = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":655 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":655 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 655; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_ohigh));
   __pyx_v_ohigh = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":656 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":656 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_subtract); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
@@ -2633,17 +2891,17 @@
   __pyx_v_temp = __pyx_4;
   __pyx_4 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":657 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":657 */
   Py_INCREF(__pyx_v_temp);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":659 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":659 */
   __pyx_3 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_odiff));
   __pyx_v_odiff = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":660 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":660 */
   __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2669,9 +2927,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_size;
-
-
 static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_rand[] = "Return an array of the given dimensions which is initialized to\n        random numbers from a uniform distribution in the range [0,1).\n\n        rand(d0, d1, ..., dn) -> random values\n\n        Note:  This is a convenience function. If you want an\n                    interface that takes a tuple as the first argument\n                    use numpy.random.random_sample(shape_tuple).\n\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -2807,24 +3062,24 @@
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
   static char *__pyx_argnames[] = {"low","high","size",0};
-  __pyx_v_high = __pyx_k11;
-  __pyx_v_size = __pyx_k12;
+  __pyx_v_high = __pyx_d10;
+  __pyx_v_size = __pyx_d11;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OO", __pyx_argnames, &__pyx_v_low, &__pyx_v_high, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_low);
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":700 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":700 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":701 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":701 */
     Py_INCREF(__pyx_v_low);
     Py_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":702 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":702 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; goto __pyx_L1;}
     Py_DECREF(__pyx_v_low);
     __pyx_v_low = __pyx_2;
@@ -2833,7 +3088,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":703 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":703 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 703; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 703; goto __pyx_L1;}
   __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 703; goto __pyx_L1;}
@@ -2875,7 +3130,7 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   static char *__pyx_argnames[] = {"size",0};
-  __pyx_v_size = __pyx_k13;
+  __pyx_v_size = __pyx_d12;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
@@ -2896,15 +3151,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_any;
-static PyObject *__pyx_n_less_equal;
-
-static PyObject *__pyx_k73p;
-static PyObject *__pyx_k74p;
-
-static char __pyx_k73[] = "scale <= 0";
-static char __pyx_k74[] = "scale <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_normal[] = "Normal distribution (mean=loc, stdev=scale).\n\n        normal(loc=0.0, scale=1.0, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -2922,9 +3168,9 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"loc","scale","size",0};
-  __pyx_v_loc = __pyx_k14;
-  __pyx_v_scale = __pyx_k15;
-  __pyx_v_size = __pyx_k16;
+  __pyx_v_loc = __pyx_d13;
+  __pyx_v_scale = __pyx_d14;
+  __pyx_v_size = __pyx_d15;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OOO", __pyx_argnames, &__pyx_v_loc, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_loc);
@@ -2933,22 +3179,22 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":721 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":721 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":722 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":722 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":723 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":723 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":724 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":724 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 725; goto __pyx_L1;}
-      Py_INCREF(__pyx_k73p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k73p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 725; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -2958,7 +3204,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":726 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":726 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 726; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -2967,28 +3213,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":728 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":728 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":730 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":730 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":731 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":731 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":732 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":732 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
@@ -3010,8 +3256,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;}
-    Py_INCREF(__pyx_k74p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k74p);
+    Py_INCREF(__pyx_k23p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k23p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -3021,7 +3267,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":734 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":734 */
   __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 = 734; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -3046,16 +3292,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k75p;
-static PyObject *__pyx_k76p;
-static PyObject *__pyx_k77p;
-static PyObject *__pyx_k78p;
-
-static char __pyx_k75[] = "a <= 0";
-static char __pyx_k76[] = "b <= 0";
-static char __pyx_k77[] = "a <= 0";
-static char __pyx_k78[] = "b <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_beta[] = "Beta distribution over [0, 1].\n\n        beta(a, b, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -3073,7 +3309,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"a","b","size",0};
-  __pyx_v_size = __pyx_k17;
+  __pyx_v_size = __pyx_d16;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_b, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
@@ -3082,22 +3318,22 @@
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ob = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":744 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":744 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":745 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":745 */
   __pyx_v_fb = PyFloat_AsDouble(__pyx_v_b);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":746 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":746 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":747 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":747 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; goto __pyx_L1;}
-      Py_INCREF(__pyx_k75p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k75p);
+      Py_INCREF(__pyx_k26p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3107,12 +3343,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":749 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":749 */
     __pyx_1 = (__pyx_v_fb <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; goto __pyx_L1;}
-      Py_INCREF(__pyx_k76p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k76p);
+      Py_INCREF(__pyx_k27p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k27p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3122,7 +3358,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":751 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":751 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_fa,__pyx_v_fb); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 751; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3131,28 +3367,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":753 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":753 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":755 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":755 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 755; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":756 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":756 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 756; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_ob));
   __pyx_v_ob = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":757 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":757 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
@@ -3174,8 +3410,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
-    Py_INCREF(__pyx_k77p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k77p);
+    Py_INCREF(__pyx_k26p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k26p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -3185,11 +3421,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":759 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":759 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
@@ -3211,8 +3447,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
-    Py_INCREF(__pyx_k78p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k78p);
+    Py_INCREF(__pyx_k27p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k27p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -3222,7 +3458,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":761 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":761 */
   __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 = 761; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3247,12 +3483,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k79p;
-static PyObject *__pyx_k80p;
-
-static char __pyx_k79[] = "scale <= 0";
-static char __pyx_k80[] = "scale <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_exponential[] = "Exponential distribution.\n\n        exponential(scale=1.0, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -3267,27 +3497,27 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"scale","size",0};
-  __pyx_v_scale = __pyx_k18;
-  __pyx_v_size = __pyx_k19;
+  __pyx_v_scale = __pyx_d17;
+  __pyx_v_size = __pyx_d18;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OO", __pyx_argnames, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":771 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":771 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":772 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":772 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":773 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":773 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 774; goto __pyx_L1;}
-      Py_INCREF(__pyx_k79p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k79p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 774; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3297,7 +3527,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":775 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":775 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3306,21 +3536,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":777 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":777 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":779 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":779 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":780 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":780 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
@@ -3342,8 +3572,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 781; goto __pyx_L1;}
-    Py_INCREF(__pyx_k80p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k80p);
+    Py_INCREF(__pyx_k23p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 781; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3353,7 +3583,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":782 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":782 */
   __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 = 782; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -3383,7 +3613,7 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   static char *__pyx_argnames[] = {"size",0};
-  __pyx_v_size = __pyx_k20;
+  __pyx_v_size = __pyx_d19;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
@@ -3404,12 +3634,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k81p;
-static PyObject *__pyx_k82p;
-
-static char __pyx_k81[] = "shape <= 0";
-static char __pyx_k82[] = "shape <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_standard_gamma[] = "Standard Gamma distribution.\n\n        standard_gamma(shape, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -3424,26 +3648,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"shape","size",0};
-  __pyx_v_size = __pyx_k21;
+  __pyx_v_size = __pyx_d20;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_shape, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_shape);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":799 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":799 */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":800 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":800 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":801 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":801 */
     __pyx_1 = (__pyx_v_fshape <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; goto __pyx_L1;}
-      Py_INCREF(__pyx_k81p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k81p);
+      Py_INCREF(__pyx_k28p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k28p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3453,7 +3677,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":803 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":803 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_fshape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3462,21 +3686,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":805 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":805 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":806 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":806 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oshape));
   __pyx_v_oshape = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":807 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":807 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
@@ -3498,8 +3722,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;}
-    Py_INCREF(__pyx_k82p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k82p);
+    Py_INCREF(__pyx_k28p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k28p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3509,7 +3733,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":809 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":809 */
   __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 = 809; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -3532,16 +3756,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k83p;
-static PyObject *__pyx_k84p;
-static PyObject *__pyx_k85p;
-static PyObject *__pyx_k86p;
-
-static char __pyx_k83[] = "shape <= 0";
-static char __pyx_k84[] = "scale <= 0";
-static char __pyx_k85[] = "shape <= 0";
-static char __pyx_k86[] = "scale <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_gamma[] = "Gamma distribution.\n\n        gamma(shape, scale=1.0, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -3559,8 +3773,8 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"shape","scale","size",0};
-  __pyx_v_scale = __pyx_k22;
-  __pyx_v_size = __pyx_k23;
+  __pyx_v_scale = __pyx_d21;
+  __pyx_v_size = __pyx_d22;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OO", __pyx_argnames, &__pyx_v_shape, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_shape);
@@ -3569,22 +3783,22 @@
   __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":819 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":819 */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":820 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":820 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":821 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":821 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":822 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":822 */
     __pyx_1 = (__pyx_v_fshape <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 823; goto __pyx_L1;}
-      Py_INCREF(__pyx_k83p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k83p);
+      Py_INCREF(__pyx_k28p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k28p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 823; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3594,12 +3808,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":824 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":824 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
-      Py_INCREF(__pyx_k84p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k84p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3609,7 +3823,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":826 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":826 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_fshape,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3618,28 +3832,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":828 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":828 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":829 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":829 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 829; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oshape));
   __pyx_v_oshape = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":830 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":830 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":831 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":831 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; goto __pyx_L1;}
@@ -3661,8 +3875,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;}
-    Py_INCREF(__pyx_k85p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k85p);
+    Py_INCREF(__pyx_k28p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k28p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -3672,11 +3886,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":833 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":833 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; goto __pyx_L1;}
@@ -3698,8 +3912,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;}
-    Py_INCREF(__pyx_k86p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k86p);
+    Py_INCREF(__pyx_k23p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k23p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -3709,7 +3923,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":835 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":835 */
   __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 = 835; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3734,16 +3948,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k87p;
-static PyObject *__pyx_k88p;
-static PyObject *__pyx_k89p;
-static PyObject *__pyx_k90p;
-
-static char __pyx_k87[] = "shape <= 0";
-static char __pyx_k88[] = "scale <= 0";
-static char __pyx_k89[] = "dfnum <= 0";
-static char __pyx_k90[] = "dfden <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_f[] = "F distribution.\n\n        f(dfnum, dfden, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -3761,7 +3965,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"dfnum","dfden","size",0};
-  __pyx_v_size = __pyx_k24;
+  __pyx_v_size = __pyx_d23;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_dfnum, &__pyx_v_dfden, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_dfnum);
@@ -3770,22 +3974,22 @@
   __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":845 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":845 */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":846 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":846 */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":847 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":847 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":848 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":848 */
     __pyx_1 = (__pyx_v_fdfnum <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; goto __pyx_L1;}
-      Py_INCREF(__pyx_k87p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k87p);
+      Py_INCREF(__pyx_k28p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k28p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3795,12 +3999,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":850 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":850 */
     __pyx_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
-      Py_INCREF(__pyx_k88p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k88p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -3810,7 +4014,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":852 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":852 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3819,28 +4023,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":854 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":854 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":856 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":856 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":857 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":857 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 857; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_odfden));
   __pyx_v_odfden = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":858 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":858 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 858; goto __pyx_L1;}
@@ -3862,8 +4066,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 859; goto __pyx_L1;}
-    Py_INCREF(__pyx_k89p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k89p);
+    Py_INCREF(__pyx_k29p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k29p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 859; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -3873,11 +4077,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":860 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":860 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
@@ -3899,8 +4103,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
-    Py_INCREF(__pyx_k90p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k90p);
+    Py_INCREF(__pyx_k30p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k30p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -3910,7 +4114,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":862 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":862 */
   __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 = 862; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3935,22 +4139,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_less;
-
-static PyObject *__pyx_k91p;
-static PyObject *__pyx_k92p;
-static PyObject *__pyx_k93p;
-static PyObject *__pyx_k94p;
-static PyObject *__pyx_k95p;
-static PyObject *__pyx_k96p;
-
-static char __pyx_k91[] = "dfnum <= 1";
-static char __pyx_k92[] = "dfden <= 0";
-static char __pyx_k93[] = "nonc < 0";
-static char __pyx_k94[] = "dfnum <= 1";
-static char __pyx_k95[] = "dfden <= 0";
-static char __pyx_k96[] = "nonc < 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_noncentral_f[] = "Noncentral F distribution.\n\n        noncentral_f(dfnum, dfden, nonc, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -3971,7 +4159,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"dfnum","dfden","nonc","size",0};
-  __pyx_v_size = __pyx_k25;
+  __pyx_v_size = __pyx_d24;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOO|O", __pyx_argnames, &__pyx_v_dfnum, &__pyx_v_dfden, &__pyx_v_nonc, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_dfnum);
@@ -3982,25 +4170,25 @@
   __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":872 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":872 */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":873 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":873 */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":874 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":874 */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":875 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":875 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":876 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":876 */
     __pyx_1 = (__pyx_v_fdfnum <= 1);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;}
-      Py_INCREF(__pyx_k91p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k91p);
+      Py_INCREF(__pyx_k31p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k31p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4010,12 +4198,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":878 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":878 */
     __pyx_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;}
-      Py_INCREF(__pyx_k92p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k92p);
+      Py_INCREF(__pyx_k30p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k30p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4025,12 +4213,12 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":880 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":880 */
     __pyx_1 = (__pyx_v_fnonc < 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;}
-      Py_INCREF(__pyx_k93p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k93p);
+      Py_INCREF(__pyx_k32p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k32p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4040,7 +4228,7 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":882 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":882 */
     __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4049,35 +4237,35 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":885 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":885 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":887 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":887 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 887; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":888 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":888 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_odfden));
   __pyx_v_odfden = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":889 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":889 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_ononc));
   __pyx_v_ononc = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":891 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":891 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; goto __pyx_L1;}
@@ -4099,8 +4287,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 892; goto __pyx_L1;}
-    Py_INCREF(__pyx_k94p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k94p);
+    Py_INCREF(__pyx_k31p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k31p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 892; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4110,11 +4298,11 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":893 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":893 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
@@ -4136,8 +4324,8 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;}
-    Py_INCREF(__pyx_k95p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k95p);
+    Py_INCREF(__pyx_k30p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k30p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -4147,11 +4335,11 @@
   }
   __pyx_L7:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":895 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":895 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_less); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
@@ -4173,8 +4361,8 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;}
-    Py_INCREF(__pyx_k96p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k96p);
+    Py_INCREF(__pyx_k32p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k32p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -4184,7 +4372,7 @@
   }
   __pyx_L8:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":897 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":897 */
   __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -4211,12 +4399,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k97p;
-static PyObject *__pyx_k98p;
-
-static char __pyx_k97[] = "df <= 0";
-static char __pyx_k98[] = "df <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_chisquare[] = "Chi^2 distribution.\n\n        chisquare(df, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -4231,26 +4413,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"df","size",0};
-  __pyx_v_size = __pyx_k26;
+  __pyx_v_size = __pyx_d25;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_df, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_df);
   Py_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":908 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":908 */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":909 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":909 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":910 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":910 */
     __pyx_1 = (__pyx_v_fdf <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
-      Py_INCREF(__pyx_k97p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k97p);
+      Py_INCREF(__pyx_k34p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k34p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4260,7 +4442,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":912 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":912 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4269,21 +4451,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":914 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":914 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":916 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":916 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":917 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":917 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
@@ -4305,8 +4487,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;}
-    Py_INCREF(__pyx_k98p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k98p);
+    Py_INCREF(__pyx_k34p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k34p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4316,7 +4498,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":919 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":919 */
   __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 = 919; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4339,16 +4521,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k99p;
-static PyObject *__pyx_k100p;
-static PyObject *__pyx_k101p;
-static PyObject *__pyx_k102p;
-
-static char __pyx_k99[] = "df <= 0";
-static char __pyx_k100[] = "nonc <= 0";
-static char __pyx_k101[] = "df <= 1";
-static char __pyx_k102[] = "nonc < 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_noncentral_chisquare[] = "Noncentral Chi^2 distribution.\n\n        noncentral_chisquare(df, nonc, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -4366,7 +4538,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"df","nonc","size",0};
-  __pyx_v_size = __pyx_k27;
+  __pyx_v_size = __pyx_d26;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_df, &__pyx_v_nonc, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_df);
@@ -4375,22 +4547,22 @@
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":928 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":928 */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":929 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":929 */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":930 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":930 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":931 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":931 */
     __pyx_1 = (__pyx_v_fdf <= 1);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;}
-      Py_INCREF(__pyx_k99p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k99p);
+      Py_INCREF(__pyx_k34p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k34p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4400,12 +4572,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":933 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":933 */
     __pyx_1 = (__pyx_v_fnonc <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;}
-      Py_INCREF(__pyx_k100p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k100p);
+      Py_INCREF(__pyx_k35p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k35p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4415,7 +4587,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":935 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":935 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_fdf,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4424,28 +4596,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":938 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":938 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":940 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":940 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":941 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":941 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_ononc));
   __pyx_v_ononc = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":942 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":942 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
@@ -4467,8 +4639,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;}
-    Py_INCREF(__pyx_k101p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k101p);
+    Py_INCREF(__pyx_k36p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k36p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -4478,11 +4650,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":944 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":944 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
@@ -4504,8 +4676,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;}
-    Py_INCREF(__pyx_k102p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k102p);
+    Py_INCREF(__pyx_k32p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k32p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -4515,7 +4687,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":946 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":946 */
   __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 = 946; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -4547,7 +4719,7 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   static char *__pyx_argnames[] = {"size",0};
-  __pyx_v_size = __pyx_k28;
+  __pyx_v_size = __pyx_d27;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
@@ -4568,12 +4740,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k103p;
-static PyObject *__pyx_k104p;
-
-static char __pyx_k103[] = "df <= 0";
-static char __pyx_k104[] = "df <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_standard_t[] = "Standard Student\'s t distribution with df degrees of freedom.\n\n        standard_t(df, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -4588,26 +4754,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"df","size",0};
-  __pyx_v_size = __pyx_k29;
+  __pyx_v_size = __pyx_d28;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_df, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_df);
   Py_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":964 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":964 */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":965 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":965 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":966 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":966 */
     __pyx_1 = (__pyx_v_fdf <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; goto __pyx_L1;}
-      Py_INCREF(__pyx_k103p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k103p);
+      Py_INCREF(__pyx_k34p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k34p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4617,7 +4783,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":968 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":968 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4626,21 +4792,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":970 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":970 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":972 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":972 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":973 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":973 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
@@ -4662,8 +4828,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
-    Py_INCREF(__pyx_k104p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k104p);
+    Py_INCREF(__pyx_k34p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k34p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4673,7 +4839,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":975 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":975 */
   __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 = 975; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4696,12 +4862,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k105p;
-static PyObject *__pyx_k106p;
-
-static char __pyx_k105[] = "kappa < 0";
-static char __pyx_k106[] = "kappa < 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_vonmises[] = "von Mises circular distribution with mode mu and dispersion parameter\n        kappa on [-pi, pi].\n\n        vonmises(mu, kappa, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -4719,7 +4879,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"mu","kappa","size",0};
-  __pyx_v_size = __pyx_k30;
+  __pyx_v_size = __pyx_d29;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_mu, &__pyx_v_kappa, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_mu);
@@ -4728,22 +4888,22 @@
   __pyx_v_omu = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_okappa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":986 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":986 */
   __pyx_v_fmu = PyFloat_AsDouble(__pyx_v_mu);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":987 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":987 */
   __pyx_v_fkappa = PyFloat_AsDouble(__pyx_v_kappa);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":988 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":988 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":989 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":989 */
     __pyx_1 = (__pyx_v_fkappa < 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; goto __pyx_L1;}
-      Py_INCREF(__pyx_k105p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k105p);
+      Py_INCREF(__pyx_k37p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k37p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4753,7 +4913,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":991 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":991 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_fmu,__pyx_v_fkappa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4762,28 +4922,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":993 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":993 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":995 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":995 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_omu));
   __pyx_v_omu = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":996 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":996 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_okappa));
   __pyx_v_okappa = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":997 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":997 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
@@ -4805,8 +4965,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; goto __pyx_L1;}
-    Py_INCREF(__pyx_k106p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k106p);
+    Py_INCREF(__pyx_k37p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k37p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -4816,7 +4976,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":999 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":999 */
   __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 = 999; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4841,12 +5001,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k107p;
-static PyObject *__pyx_k108p;
-
-static char __pyx_k107[] = "a <= 0";
-static char __pyx_k108[] = "a <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_pareto[] = "Pareto distribution.\n\n        pareto(a, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -4861,26 +5015,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"a","size",0};
-  __pyx_v_size = __pyx_k31;
+  __pyx_v_size = __pyx_d30;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1009 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1009 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1010 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1010 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1011 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1011 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
-      Py_INCREF(__pyx_k107p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k107p);
+      Py_INCREF(__pyx_k26p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -4890,7 +5044,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4899,21 +5053,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1015 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1015 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1017 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1017 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1017; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1018 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1018 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1018; goto __pyx_L1;}
@@ -4935,8 +5089,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; goto __pyx_L1;}
-    Py_INCREF(__pyx_k108p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k108p);
+    Py_INCREF(__pyx_k26p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4946,7 +5100,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1020 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1020 */
   __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 = 1020; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4969,12 +5123,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k109p;
-static PyObject *__pyx_k110p;
-
-static char __pyx_k109[] = "a <= 0";
-static char __pyx_k110[] = "a <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_weibull[] = "Weibull distribution.\n\n        weibull(a, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -4989,26 +5137,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"a","size",0};
-  __pyx_v_size = __pyx_k32;
+  __pyx_v_size = __pyx_d31;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1030 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1030 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1031 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1031 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1032 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1032 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; goto __pyx_L1;}
-      Py_INCREF(__pyx_k109p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k109p);
+      Py_INCREF(__pyx_k26p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5018,7 +5166,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5027,21 +5175,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1038 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1038 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1038; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1039 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1039 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; goto __pyx_L1;}
@@ -5063,8 +5211,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; goto __pyx_L1;}
-    Py_INCREF(__pyx_k110p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k110p);
+    Py_INCREF(__pyx_k26p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5074,7 +5222,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1041 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1041 */
   __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 = 1041; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5097,12 +5245,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k111p;
-static PyObject *__pyx_k112p;
-
-static char __pyx_k111[] = "a <= 0";
-static char __pyx_k112[] = "a <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_power[] = "Power distribution.\n\n        power(a, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5117,26 +5259,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"a","size",0};
-  __pyx_v_size = __pyx_k33;
+  __pyx_v_size = __pyx_d32;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1051 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1051 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1052 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1052 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1053 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1053 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1054; goto __pyx_L1;}
-      Py_INCREF(__pyx_k111p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k111p);
+      Py_INCREF(__pyx_k26p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1054; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5146,7 +5288,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1055 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1055 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1055; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5155,21 +5297,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1057 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1057 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1059 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1059 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1060 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1060 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
@@ -5191,8 +5333,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; goto __pyx_L1;}
-    Py_INCREF(__pyx_k112p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k112p);
+    Py_INCREF(__pyx_k26p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k26p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1061; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5202,7 +5344,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1062 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1062 */
   __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 = 1062; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5225,12 +5367,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k113p;
-static PyObject *__pyx_k114p;
-
-static char __pyx_k113[] = "scale <= 0";
-static char __pyx_k114[] = "scale <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_laplace[] = "Laplace distribution.\n\n        laplace(loc=0.0, scale=1.0, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5248,9 +5384,9 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"loc","scale","size",0};
-  __pyx_v_loc = __pyx_k34;
-  __pyx_v_scale = __pyx_k35;
-  __pyx_v_size = __pyx_k36;
+  __pyx_v_loc = __pyx_d33;
+  __pyx_v_scale = __pyx_d34;
+  __pyx_v_size = __pyx_d35;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OOO", __pyx_argnames, &__pyx_v_loc, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_loc);
@@ -5259,22 +5395,22 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1072 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1072 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1073 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1073 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1074 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1074 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1075 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1075 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
-      Py_INCREF(__pyx_k113p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k113p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5284,7 +5420,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5293,28 +5429,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1079 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1079 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1080 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1080 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1081 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1081 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_2);
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1082 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1082 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
@@ -5336,8 +5472,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1083; goto __pyx_L1;}
-    Py_INCREF(__pyx_k114p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k114p);
+    Py_INCREF(__pyx_k23p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k23p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1083; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -5347,7 +5483,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1084 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1084 */
   __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 = 1084; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5372,12 +5508,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k115p;
-static PyObject *__pyx_k116p;
-
-static char __pyx_k115[] = "scale <= 0";
-static char __pyx_k116[] = "scale <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_gumbel[] = "Gumbel distribution.\n\n        gumbel(loc=0.0, scale=1.0, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5395,9 +5525,9 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"loc","scale","size",0};
-  __pyx_v_loc = __pyx_k37;
-  __pyx_v_scale = __pyx_k38;
-  __pyx_v_size = __pyx_k39;
+  __pyx_v_loc = __pyx_d36;
+  __pyx_v_scale = __pyx_d37;
+  __pyx_v_size = __pyx_d38;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OOO", __pyx_argnames, &__pyx_v_loc, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_loc);
@@ -5406,22 +5536,22 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1094 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1094 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1095 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1095 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1096 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1096 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1097 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1097 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; goto __pyx_L1;}
-      Py_INCREF(__pyx_k115p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k115p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5431,7 +5561,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1099 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1099 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1099; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5440,28 +5570,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1101 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1101 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1102 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1102 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1102; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1102; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1103 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1103 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_2);
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1104 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1104 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
@@ -5483,8 +5613,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1105; goto __pyx_L1;}
-    Py_INCREF(__pyx_k116p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k116p);
+    Py_INCREF(__pyx_k23p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k23p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1105; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -5494,7 +5624,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1106 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1106 */
   __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 = 1106; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5519,12 +5649,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k117p;
-static PyObject *__pyx_k118p;
-
-static char __pyx_k117[] = "scale <= 0";
-static char __pyx_k118[] = "scale <= 0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_logistic[] = "Logistic distribution.\n\n        logistic(loc=0.0, scale=1.0, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5542,9 +5666,9 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"loc","scale","size",0};
-  __pyx_v_loc = __pyx_k40;
-  __pyx_v_scale = __pyx_k41;
-  __pyx_v_size = __pyx_k42;
+  __pyx_v_loc = __pyx_d39;
+  __pyx_v_scale = __pyx_d40;
+  __pyx_v_size = __pyx_d41;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OOO", __pyx_argnames, &__pyx_v_loc, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_loc);
@@ -5553,22 +5677,22 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1116 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1116 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1117 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1117 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1118 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1118 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1119 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1119 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
-      Py_INCREF(__pyx_k117p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k117p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5578,7 +5702,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1121 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1121 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5587,28 +5711,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1123 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1123 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1124 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1124 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1125 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1125 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_2);
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
@@ -5630,8 +5754,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;}
-    Py_INCREF(__pyx_k118p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k118p);
+    Py_INCREF(__pyx_k23p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k23p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -5641,7 +5765,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1128 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1128 */
   __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 = 1128; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5666,12 +5790,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k119p;
-static PyObject *__pyx_k120p;
-
-static char __pyx_k119[] = "sigma <= 0";
-static char __pyx_k120[] = "sigma <= 0.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_lognormal[] = "Log-normal distribution.\n\n        Note that the mean parameter is not the mean of this distribution, but\n        the underlying normal distribution.\n\n            lognormal(mean, sigma) <=> exp(normal(mean, sigma))\n\n        lognormal(mean=0.0, sigma=1.0, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5689,9 +5807,9 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"mean","sigma","size",0};
-  __pyx_v_mean = __pyx_k43;
-  __pyx_v_sigma = __pyx_k44;
-  __pyx_v_size = __pyx_k45;
+  __pyx_v_mean = __pyx_d42;
+  __pyx_v_sigma = __pyx_d43;
+  __pyx_v_size = __pyx_d44;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OOO", __pyx_argnames, &__pyx_v_mean, &__pyx_v_sigma, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_mean);
@@ -5700,22 +5818,22 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_osigma = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1143 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1143 */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1144 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1144 */
   __pyx_v_fsigma = PyFloat_AsDouble(__pyx_v_sigma);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1146 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1146 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1147 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1147 */
     __pyx_1 = (__pyx_v_fsigma <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; goto __pyx_L1;}
-      Py_INCREF(__pyx_k119p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k119p);
+      Py_INCREF(__pyx_k38p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k38p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5725,7 +5843,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1149 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1149 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_fmean,__pyx_v_fsigma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5734,28 +5852,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1151 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1151 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1153 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1153 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
   __pyx_v_omean = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1154 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1154 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_osigma));
   __pyx_v_osigma = ((PyArrayObject *)__pyx_2);
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1155 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1155 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
@@ -5777,8 +5895,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; goto __pyx_L1;}
-    Py_INCREF(__pyx_k120p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k120p);
+    Py_INCREF(__pyx_k39p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k39p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -5788,7 +5906,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1157 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1157 */
   __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 = 1157; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5813,12 +5931,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k121p;
-static PyObject *__pyx_k122p;
-
-static char __pyx_k121[] = "scale <= 0";
-static char __pyx_k122[] = "scale <= 0.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_rayleigh[] = "Rayleigh distribution.\n\n        rayleigh(scale=1.0, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5833,27 +5945,27 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"scale","size",0};
-  __pyx_v_scale = __pyx_k46;
-  __pyx_v_size = __pyx_k47;
+  __pyx_v_scale = __pyx_d45;
+  __pyx_v_size = __pyx_d46;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OO", __pyx_argnames, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_scale);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1167 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1167 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1169 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1169 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1170 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1170 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1171; goto __pyx_L1;}
-      Py_INCREF(__pyx_k121p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k121p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1171; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -5863,7 +5975,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1172 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1172 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1172; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5872,21 +5984,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1174 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1174 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1176 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1176 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1177 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1177 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
@@ -5908,8 +6020,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
-    Py_INCREF(__pyx_k122p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k122p);
+    Py_INCREF(__pyx_k40p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k40p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5919,7 +6031,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1179 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1179 */
   __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 = 1179; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5942,16 +6054,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k123p;
-static PyObject *__pyx_k124p;
-static PyObject *__pyx_k125p;
-static PyObject *__pyx_k126p;
-
-static char __pyx_k123[] = "mean <= 0";
-static char __pyx_k124[] = "scale <= 0";
-static char __pyx_k125[] = "mean <= 0.0";
-static char __pyx_k126[] = "scale <= 0.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_wald[] = "Wald (inverse Gaussian) distribution.\n\n        wald(mean, scale, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -5969,7 +6071,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"mean","scale","size",0};
-  __pyx_v_size = __pyx_k48;
+  __pyx_v_size = __pyx_d47;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_mean, &__pyx_v_scale, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_mean);
@@ -5978,22 +6080,22 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1189 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1189 */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1190 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1190 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1191 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1191 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
     __pyx_1 = (__pyx_v_fmean <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1193; goto __pyx_L1;}
-      Py_INCREF(__pyx_k123p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k123p);
+      Py_INCREF(__pyx_k41p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k41p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1193; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6003,12 +6105,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1194 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1194 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1195; goto __pyx_L1;}
-      Py_INCREF(__pyx_k124p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k124p);
+      Py_INCREF(__pyx_k23p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k23p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1195; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6018,7 +6120,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1196 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1196 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_fmean,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1196; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6027,28 +6129,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1198 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1198 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1199 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1199 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1199; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1199; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
   __pyx_v_omean = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1200 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1200 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1200; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1200; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_2);
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1201 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1201 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1201; goto __pyx_L1;}
@@ -6070,8 +6172,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1202; goto __pyx_L1;}
-    Py_INCREF(__pyx_k125p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k125p);
+    Py_INCREF(__pyx_k42p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k42p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1202; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -6079,10 +6181,10 @@
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1202; goto __pyx_L1;}
     goto __pyx_L5;
   }
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1203; goto __pyx_L1;}
@@ -6104,8 +6206,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; goto __pyx_L1;}
-    Py_INCREF(__pyx_k126p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k126p);
+    Py_INCREF(__pyx_k40p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k40p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -6115,7 +6217,7 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1205 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1205 */
   __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 = 1205; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -6140,23 +6242,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_greater;
-static PyObject *__pyx_n_equal;
-
-static PyObject *__pyx_k127p;
-static PyObject *__pyx_k128p;
-static PyObject *__pyx_k129p;
-static PyObject *__pyx_k130p;
-static PyObject *__pyx_k131p;
-static PyObject *__pyx_k132p;
-
-static char __pyx_k127[] = "left > mode";
-static char __pyx_k128[] = "mode > right";
-static char __pyx_k129[] = "left == right";
-static char __pyx_k130[] = "left > mode";
-static char __pyx_k131[] = "mode > right";
-static char __pyx_k132[] = "left == right";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_triangular[] = "Triangular distribution starting at left, peaking at mode, and\n        ending at right (left <= mode <= right).\n\n        triangular(left, mode, right, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -6177,7 +6262,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"left","mode","right","size",0};
-  __pyx_v_size = __pyx_k49;
+  __pyx_v_size = __pyx_d48;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOO|O", __pyx_argnames, &__pyx_v_left, &__pyx_v_mode, &__pyx_v_right, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_left);
@@ -6188,25 +6273,25 @@
   __pyx_v_omode = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oright = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1218 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1218 */
   __pyx_v_fleft = PyFloat_AsDouble(__pyx_v_left);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1219 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1219 */
   __pyx_v_fright = PyFloat_AsDouble(__pyx_v_right);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1220 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1220 */
   __pyx_v_fmode = PyFloat_AsDouble(__pyx_v_mode);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1221 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1221 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1222 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1222 */
     __pyx_1 = (__pyx_v_fleft > __pyx_v_fmode);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
-      Py_INCREF(__pyx_k127p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k127p);
+      Py_INCREF(__pyx_k43p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k43p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6216,12 +6301,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1224 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1224 */
     __pyx_1 = (__pyx_v_fmode > __pyx_v_fright);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;}
-      Py_INCREF(__pyx_k128p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k128p);
+      Py_INCREF(__pyx_k44p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k44p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6231,12 +6316,12 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1226 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1226 */
     __pyx_1 = (__pyx_v_fleft == __pyx_v_fright);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;}
-      Py_INCREF(__pyx_k129p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k129p);
+      Py_INCREF(__pyx_k45p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k45p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6246,7 +6331,7 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1228 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1228 */
     __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_fleft,__pyx_v_fmode,__pyx_v_fright); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1228; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6255,35 +6340,35 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1231 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1231 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1232 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1232 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oleft));
   __pyx_v_oleft = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1233 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1233 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_omode));
   __pyx_v_omode = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1234 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1234 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1234; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oright));
   __pyx_v_oright = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1236 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1236 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; goto __pyx_L1;}
@@ -6304,8 +6389,8 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; goto __pyx_L1;}
-    Py_INCREF(__pyx_k130p);
-    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k130p);
+    Py_INCREF(__pyx_k43p);
+    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k43p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; goto __pyx_L1;}
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6315,11 +6400,11 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1238 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1238 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; goto __pyx_L1;}
@@ -6340,8 +6425,8 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; goto __pyx_L1;}
-    Py_INCREF(__pyx_k131p);
-    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k131p);
+    Py_INCREF(__pyx_k44p);
+    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k44p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; goto __pyx_L1;}
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -6351,11 +6436,11 @@
   }
   __pyx_L7:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1240 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1240 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; goto __pyx_L1;}
@@ -6376,8 +6461,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; goto __pyx_L1;}
-    Py_INCREF(__pyx_k132p);
-    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k132p);
+    Py_INCREF(__pyx_k45p);
+    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k45p);
     __pyx_4 = PyObject_CallObject(PyExc_ValueError, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; goto __pyx_L1;}
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
@@ -6387,7 +6472,7 @@
   }
   __pyx_L8:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1242 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1242 */
   __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -6414,20 +6499,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k133p;
-static PyObject *__pyx_k134p;
-static PyObject *__pyx_k135p;
-static PyObject *__pyx_k136p;
-static PyObject *__pyx_k137p;
-static PyObject *__pyx_k138p;
-
-static char __pyx_k133[] = "n <= 0";
-static char __pyx_k134[] = "p < 0";
-static char __pyx_k135[] = "p > 1";
-static char __pyx_k136[] = "n <= 0";
-static char __pyx_k137[] = "p < 0";
-static char __pyx_k138[] = "p > 1";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_binomial[] = "Binomial distribution of n trials and p probability of success.\n\n        binomial(n, p, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -6445,7 +6516,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"n","p","size",0};
-  __pyx_v_size = __pyx_k50;
+  __pyx_v_size = __pyx_d49;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_n, &__pyx_v_p, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_n);
@@ -6454,22 +6525,22 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1256 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1256 */
   __pyx_v_ln = PyInt_AsLong(__pyx_v_n);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1258 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1258 */
     __pyx_1 = (__pyx_v_ln <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
-      Py_INCREF(__pyx_k133p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k133p);
+      Py_INCREF(__pyx_k48p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k48p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6479,12 +6550,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1260 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1260 */
     __pyx_1 = (__pyx_v_fp < 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
-      Py_INCREF(__pyx_k134p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k134p);
+      Py_INCREF(__pyx_k49p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k49p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6495,8 +6566,8 @@
     __pyx_1 = (__pyx_v_fp > 1);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
-      Py_INCREF(__pyx_k135p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k135p);
+      Py_INCREF(__pyx_k50p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k50p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6506,7 +6577,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1264 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1264 */
     __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6515,28 +6586,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1266 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1266 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1268 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1268 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_on));
   __pyx_v_on = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1269 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1269 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1270 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1270 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
@@ -6558,8 +6629,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
-    Py_INCREF(__pyx_k136p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k136p);
+    Py_INCREF(__pyx_k48p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k48p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -6569,11 +6640,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
@@ -6595,8 +6666,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;}
-    Py_INCREF(__pyx_k137p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k137p);
+    Py_INCREF(__pyx_k49p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k49p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -6606,11 +6677,11 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
@@ -6632,8 +6703,8 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
-    Py_INCREF(__pyx_k138p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k138p);
+    Py_INCREF(__pyx_k50p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k50p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6643,7 +6714,7 @@
   }
   __pyx_L7:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1276 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1276 */
   __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -6668,20 +6739,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k139p;
-static PyObject *__pyx_k140p;
-static PyObject *__pyx_k141p;
-static PyObject *__pyx_k142p;
-static PyObject *__pyx_k143p;
-static PyObject *__pyx_k144p;
-
-static char __pyx_k139[] = "n <= 0";
-static char __pyx_k140[] = "p < 0";
-static char __pyx_k141[] = "p > 1";
-static char __pyx_k142[] = "n <= 0";
-static char __pyx_k143[] = "p < 0";
-static char __pyx_k144[] = "p > 1";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_negative_binomial[] = "Negative Binomial distribution.\n\n        negative_binomial(n, p, size=None) -> random values\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -6699,7 +6756,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"n","p","size",0};
-  __pyx_v_size = __pyx_k51;
+  __pyx_v_size = __pyx_d50;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_n, &__pyx_v_p, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_n);
@@ -6708,22 +6765,22 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1288 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1288 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1289 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1289 */
   __pyx_v_ln = PyInt_AsLong(__pyx_v_n);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1290 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1290 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1291 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1291 */
     __pyx_1 = (__pyx_v_ln <= 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
-      Py_INCREF(__pyx_k139p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k139p);
+      Py_INCREF(__pyx_k48p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k48p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6733,12 +6790,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1293 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1293 */
     __pyx_1 = (__pyx_v_fp < 0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;}
-      Py_INCREF(__pyx_k140p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k140p);
+      Py_INCREF(__pyx_k49p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k49p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6749,8 +6806,8 @@
     __pyx_1 = (__pyx_v_fp > 1);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;}
-      Py_INCREF(__pyx_k141p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k141p);
+      Py_INCREF(__pyx_k50p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k50p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6760,7 +6817,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1297 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1297 */
     __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1297; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6769,28 +6826,28 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1300 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1300 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1302 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1302 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1302; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_on));
   __pyx_v_on = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1303 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1303 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1304 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1304 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1304; goto __pyx_L1;}
@@ -6812,8 +6869,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; goto __pyx_L1;}
-    Py_INCREF(__pyx_k142p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k142p);
+    Py_INCREF(__pyx_k48p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k48p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -6823,11 +6880,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1306 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1306 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
@@ -6849,8 +6906,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1307; goto __pyx_L1;}
-    Py_INCREF(__pyx_k143p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k143p);
+    Py_INCREF(__pyx_k49p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k49p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1307; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -6860,11 +6917,11 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1308 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1308 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;}
@@ -6886,8 +6943,8 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; goto __pyx_L1;}
-    Py_INCREF(__pyx_k144p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k144p);
+    Py_INCREF(__pyx_k50p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k50p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6897,7 +6954,7 @@
   }
   __pyx_L7:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1310 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1310 */
   __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -6922,12 +6979,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k145p;
-static PyObject *__pyx_k146p;
-
-static char __pyx_k145[] = "lam < 0";
-static char __pyx_k146[] = "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        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -6942,30 +6993,30 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"lam","size",0};
-  __pyx_v_lam = __pyx_k52;
-  __pyx_v_size = __pyx_k53;
+  __pyx_v_lam = __pyx_d51;
+  __pyx_v_size = __pyx_d52;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|OO", __pyx_argnames, &__pyx_v_lam, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_lam);
   Py_INCREF(__pyx_v_size);
   __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1320 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1320 */
   __pyx_v_flam = PyFloat_AsDouble(__pyx_v_lam);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1321 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1321 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1322 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1322 */
     __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1322; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_lam, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1322; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1323; goto __pyx_L1;}
-      Py_INCREF(__pyx_k145p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k145p);
+      Py_INCREF(__pyx_k51p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k51p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1323; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -6975,7 +7026,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1324 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1324 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_flam); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1324; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6984,21 +7035,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1326 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1326 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1328 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1328 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_olam));
   __pyx_v_olam = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1329 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1329 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;}
@@ -7020,8 +7071,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1330; goto __pyx_L1;}
-    Py_INCREF(__pyx_k146p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k146p);
+    Py_INCREF(__pyx_k51p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k51p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1330; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -7031,7 +7082,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1331 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1331 */
   __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 = 1331; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -7054,12 +7105,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k147p;
-static PyObject *__pyx_k148p;
-
-static char __pyx_k147[] = "a <= 1.0";
-static char __pyx_k148[] = "a <= 1.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_zipf[] = "Zipf distribution.\n\n        zipf(a, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -7074,26 +7119,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"a","size",0};
-  __pyx_v_size = __pyx_k54;
+  __pyx_v_size = __pyx_d53;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_a, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_a);
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1341 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1341 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1342 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1342 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1343 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1343 */
     __pyx_1 = (__pyx_v_fa <= 1.0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1344; goto __pyx_L1;}
-      Py_INCREF(__pyx_k147p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k147p);
+      Py_INCREF(__pyx_k52p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k52p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1344; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7103,7 +7148,7 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1345 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1345 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1345; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7112,21 +7157,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1347 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1347 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1349 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1349 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1350 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1350 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;}
@@ -7148,8 +7193,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;}
-    Py_INCREF(__pyx_k148p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k148p);
+    Py_INCREF(__pyx_k52p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k52p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -7159,7 +7204,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1352 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1352 */
   __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 = 1352; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -7182,16 +7227,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k149p;
-static PyObject *__pyx_k150p;
-static PyObject *__pyx_k151p;
-static PyObject *__pyx_k152p;
-
-static char __pyx_k149[] = "p < 0.0";
-static char __pyx_k150[] = "p > 1.0";
-static char __pyx_k151[] = "p < 0.0";
-static char __pyx_k152[] = "p > 1.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_geometric[] = "Geometric distribution with p being the probability of \"success\" on\n        an individual trial.\n\n        geometric(p, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -7206,26 +7241,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"p","size",0};
-  __pyx_v_size = __pyx_k55;
+  __pyx_v_size = __pyx_d54;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_p, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_p);
   Py_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1363 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1363 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1364 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1364 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1365 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1365 */
     __pyx_1 = (__pyx_v_fp < 0.0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1366; goto __pyx_L1;}
-      Py_INCREF(__pyx_k149p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k149p);
+      Py_INCREF(__pyx_k53p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k53p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1366; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7235,12 +7270,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1367 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1367 */
     __pyx_1 = (__pyx_v_fp > 1.0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1368; goto __pyx_L1;}
-      Py_INCREF(__pyx_k150p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k150p);
+      Py_INCREF(__pyx_k54p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k54p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1368; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7250,7 +7285,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1369 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1369 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1369; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7259,21 +7294,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1371 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1371 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1374 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1374 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1374; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1375 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1375 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;}
@@ -7295,8 +7330,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1376; goto __pyx_L1;}
-    Py_INCREF(__pyx_k151p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k151p);
+    Py_INCREF(__pyx_k53p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k53p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1376; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -7306,11 +7341,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1377 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1377 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_4 = PyFloat_FromDouble(1.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;}
@@ -7332,8 +7367,8 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1378; goto __pyx_L1;}
-    Py_INCREF(__pyx_k152p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k152p);
+    Py_INCREF(__pyx_k54p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k54p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1378; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -7343,7 +7378,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1379 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1379 */
   __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1379; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -7366,26 +7401,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_add;
-
-static PyObject *__pyx_k153p;
-static PyObject *__pyx_k154p;
-static PyObject *__pyx_k155p;
-static PyObject *__pyx_k156p;
-static PyObject *__pyx_k157p;
-static PyObject *__pyx_k158p;
-static PyObject *__pyx_k159p;
-static PyObject *__pyx_k160p;
-
-static char __pyx_k153[] = "ngood < 1";
-static char __pyx_k154[] = "nbad < 1";
-static char __pyx_k155[] = "nsample < 1";
-static char __pyx_k156[] = "ngood + nbad < nsample";
-static char __pyx_k157[] = "ngood < 1";
-static char __pyx_k158[] = "nbad < 1";
-static char __pyx_k159[] = "nsample < 1";
-static char __pyx_k160[] = "ngood + nbad < nsample";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_hypergeometric[] = "Hypergeometric distribution.\n\n        Consider an urn with ngood \"good\" balls and nbad \"bad\" balls. If one\n        were to draw nsample balls from the urn without replacement, then\n        the hypergeometric distribution describes the distribution of \"good\"\n        balls in the sample.\n\n        hypergeometric(ngood, nbad, nsample, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -7407,7 +7422,7 @@
   PyObject *__pyx_5 = 0;
   PyObject *__pyx_6 = 0;
   static char *__pyx_argnames[] = {"ngood","nbad","nsample","size",0};
-  __pyx_v_size = __pyx_k56;
+  __pyx_v_size = __pyx_d55;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOO|O", __pyx_argnames, &__pyx_v_ngood, &__pyx_v_nbad, &__pyx_v_nsample, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_ngood);
@@ -7418,28 +7433,28 @@
   __pyx_v_onbad = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_onsample = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1394 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1394 */
   __pyx_v_lngood = PyInt_AsLong(__pyx_v_ngood);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1395 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1395 */
   __pyx_v_lnbad = PyInt_AsLong(__pyx_v_nbad);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1396 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1396 */
   __pyx_v_lnsample = PyInt_AsLong(__pyx_v_nsample);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1397 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1397 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1398 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1398 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_ngood, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;}
-      Py_INCREF(__pyx_k153p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k153p);
+      Py_INCREF(__pyx_k55p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k55p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7449,15 +7464,15 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1400 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1400 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_nbad, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;}
-      Py_INCREF(__pyx_k154p);
-      PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k154p);
+      Py_INCREF(__pyx_k56p);
+      PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k56p);
       __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;}
       Py_DECREF(__pyx_3); __pyx_3 = 0;
       __Pyx_Raise(__pyx_2, 0, 0);
@@ -7467,15 +7482,15 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1402 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1402 */
     __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_nsample, __pyx_3, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;}
-      Py_INCREF(__pyx_k155p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k155p);
+      Py_INCREF(__pyx_k57p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k57p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7485,15 +7500,15 @@
     }
     __pyx_L5:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1404 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1404 */
     __pyx_2 = PyNumber_Add(__pyx_v_ngood, __pyx_v_nbad); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_2, __pyx_v_nsample, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;}
-      Py_INCREF(__pyx_k156p);
-      PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k156p);
+      Py_INCREF(__pyx_k58p);
+      PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k58p);
       __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;}
       Py_DECREF(__pyx_3); __pyx_3 = 0;
       __Pyx_Raise(__pyx_2, 0, 0);
@@ -7503,7 +7518,7 @@
     }
     __pyx_L6:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1406 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1406 */
     __pyx_3 = __pyx_f_6mtrand_discnmN_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_lngood,__pyx_v_lnbad,__pyx_v_lnsample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;}
     __pyx_r = __pyx_3;
     __pyx_3 = 0;
@@ -7512,35 +7527,35 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1410 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1410 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1412 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1412 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1412; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_ongood));
   __pyx_v_ongood = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1413 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1413 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1413; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_onbad));
   __pyx_v_onbad = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1414 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1414 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1414; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_onsample));
   __pyx_v_onsample = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1415 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1415 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1415; goto __pyx_L1;}
@@ -7562,8 +7577,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1416; goto __pyx_L1;}
-    Py_INCREF(__pyx_k157p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k157p);
+    Py_INCREF(__pyx_k55p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k55p);
     __pyx_2 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1416; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -7573,11 +7588,11 @@
   }
   __pyx_L7:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1417 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1417 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; goto __pyx_L1;}
@@ -7599,8 +7614,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1418; goto __pyx_L1;}
-    Py_INCREF(__pyx_k158p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k158p);
+    Py_INCREF(__pyx_k56p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k56p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1418; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -7610,11 +7625,11 @@
   }
   __pyx_L8:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1419 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1419 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_less); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1419; goto __pyx_L1;}
@@ -7636,8 +7651,8 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;}
-    Py_INCREF(__pyx_k159p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k159p);
+    Py_INCREF(__pyx_k57p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k57p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -7647,14 +7662,14 @@
   }
   __pyx_L9:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1421 */
-  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1421 */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_add); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; goto __pyx_L1;}
@@ -7683,8 +7698,8 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;}
-    Py_INCREF(__pyx_k160p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k160p);
+    Py_INCREF(__pyx_k58p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k58p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -7694,7 +7709,7 @@
   }
   __pyx_L10:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1423 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1423 */
   __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 = 1423; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -7722,16 +7737,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_k161p;
-static PyObject *__pyx_k162p;
-static PyObject *__pyx_k163p;
-static PyObject *__pyx_k164p;
-
-static char __pyx_k161[] = "p < 0.0";
-static char __pyx_k162[] = "p > 1.0";
-static char __pyx_k163[] = "p < 0.0";
-static char __pyx_k164[] = "p > 1.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_logseries[] = "Logarithmic series distribution.\n\n        logseries(p, size=None)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -7746,26 +7751,26 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"p","size",0};
-  __pyx_v_size = __pyx_k57;
+  __pyx_v_size = __pyx_d56;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_p, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_p);
   Py_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1434 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1434 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1435 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1435 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1436 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1436 */
     __pyx_1 = (__pyx_v_fp < 0.0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1437; goto __pyx_L1;}
-      Py_INCREF(__pyx_k161p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k161p);
+      Py_INCREF(__pyx_k53p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k53p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1437; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7775,12 +7780,12 @@
     }
     __pyx_L3:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1438 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1438 */
     __pyx_1 = (__pyx_v_fp > 1.0);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1439; goto __pyx_L1;}
-      Py_INCREF(__pyx_k162p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k162p);
+      Py_INCREF(__pyx_k54p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k54p);
       __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1439; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
@@ -7790,7 +7795,7 @@
     }
     __pyx_L4:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1440 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1440 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1440; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7799,21 +7804,21 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1442 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1442 */
   PyErr_Clear();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1444 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1444 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1444; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
+  Py_INCREF(__pyx_3);
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1445 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1445 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyFloat_FromDouble(0.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1445; goto __pyx_L1;}
@@ -7835,8 +7840,8 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1446; goto __pyx_L1;}
-    Py_INCREF(__pyx_k163p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k163p);
+    Py_INCREF(__pyx_k53p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k53p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1446; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -7846,11 +7851,11 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1447 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1447 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_4 = PyFloat_FromDouble(1.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1447; goto __pyx_L1;}
@@ -7872,8 +7877,8 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1448; goto __pyx_L1;}
-    Py_INCREF(__pyx_k164p);
-    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k164p);
+    Py_INCREF(__pyx_k54p);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k54p);
     __pyx_5 = PyObject_CallObject(PyExc_ValueError, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1448; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -7883,7 +7888,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1449 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1449 */
   __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1449; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -7906,25 +7911,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_array;
-static PyObject *__pyx_n_shape;
-static PyObject *__pyx_n_append;
-static PyObject *__pyx_n_multiply;
-static PyObject *__pyx_n_reduce;
-static PyObject *__pyx_n_svd;
-static PyObject *__pyx_n_dot;
-static PyObject *__pyx_n_sqrt;
-
-static PyObject *__pyx_k165p;
-static PyObject *__pyx_k166p;
-static PyObject *__pyx_k167p;
-static PyObject *__pyx_k168p;
-
-static char __pyx_k165[] = "mean must be 1 dimensional";
-static char __pyx_k166[] = "cov must be 2 dimensional and square";
-static char __pyx_k167[] = "mean and cov must have same length";
-static char __pyx_k168[] = "numpy.dual";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_multivariate_normal[] = "Return an array containing multivariate normally distributed random numbers\n        with specified mean and covariance.\n\n        multivariate_normal(mean, cov) -> random values\n        multivariate_normal(mean, cov, [m, n, ...]) -> random values\n\n        mean must be a 1 dimensional array. cov must be a square two dimensional\n        array with the same number of rows and columns as mean has elements.\n\n        The first form returns a single 1-D array containing a multivariate\n        normal.\n\n        The second form returns an array of shape (m, n, ..., cov.shape[0]).\n        In this case, output[i,j,...,:] is a 1-D array containing a multivariate\n        normal.\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -7946,7 +7932,7 @@
   Py_ssize_t __pyx_5;
   PyObject *__pyx_6 = 0;
   static char *__pyx_argnames[] = {"mean","cov","size",0};
-  __pyx_v_size = __pyx_k58;
+  __pyx_v_size = __pyx_d57;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_mean, &__pyx_v_cov, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_mean);
@@ -7960,8 +7946,8 @@
   __pyx_v_s = Py_None; Py_INCREF(Py_None);
   __pyx_v_v = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1470 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1470 */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; goto __pyx_L1;}
@@ -7974,8 +7960,8 @@
   __pyx_v_mean = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1471 */
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1471 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;}
@@ -7988,7 +7974,7 @@
   __pyx_v_cov = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1472 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1472 */
   __pyx_4 = __pyx_v_size == Py_None;
   if (__pyx_4) {
     __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
@@ -8004,15 +7990,15 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1476 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1476 */
   __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;}
   __pyx_5 = PyObject_Length(__pyx_3); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_4 = (__pyx_5 != 1);
   if (__pyx_4) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;}
-    Py_INCREF(__pyx_k165p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k165p);
+    Py_INCREF(__pyx_k62p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k62p);
     __pyx_1 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_1, 0, 0);
@@ -8022,7 +8008,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1478 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1478 */
   __pyx_3 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1478; goto __pyx_L1;}
   __pyx_5 = PyObject_Length(__pyx_3); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1478; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -8041,8 +8027,8 @@
   }
   if (__pyx_4) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1479; goto __pyx_L1;}
-    Py_INCREF(__pyx_k166p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k166p);
+    Py_INCREF(__pyx_k63p);
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k63p);
     __pyx_1 = PyObject_CallObject(PyExc_ValueError, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1479; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_1, 0, 0);
@@ -8052,7 +8038,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1480 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1480 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1480; goto __pyx_L1;}
   __pyx_3 = __Pyx_GetItemInt(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1480; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -8065,8 +8051,8 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_4) {
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1481; goto __pyx_L1;}
-    Py_INCREF(__pyx_k167p);
-    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k167p);
+    Py_INCREF(__pyx_k64p);
+    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k64p);
     __pyx_3 = PyObject_CallObject(PyExc_ValueError, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1481; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -8076,7 +8062,7 @@
   }
   __pyx_L5:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1483 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1483 */
   __pyx_4 = PyObject_IsInstance(__pyx_v_shape,((PyObject *)(&PyInt_Type))); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
   if (__pyx_4) {
     __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1484; goto __pyx_L1;}
@@ -8089,7 +8075,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1485 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1485 */
   __pyx_1 = PySequence_GetSlice(__pyx_v_shape, 0, PY_SSIZE_T_MAX); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
@@ -8100,7 +8086,7 @@
   __pyx_v_final_shape = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1486 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1486 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
   __pyx_2 = __Pyx_GetItemInt(__pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
@@ -8113,9 +8099,9 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1490 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1490 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_reduce); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
@@ -8136,8 +8122,8 @@
   __pyx_v_x = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1491 */
-  __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1491; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1491 */
+  __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1491; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_6, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1491; goto __pyx_L1;}
   Py_DECREF(__pyx_6); __pyx_6 = 0;
   __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_reduce); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1491; goto __pyx_L1;}
@@ -8161,11 +8147,11 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1491; goto __pyx_L1;}
   Py_DECREF(__pyx_6); __pyx_6 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1500 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1500 */
   __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1500; goto __pyx_L1;}
   Py_INCREF(__pyx_n_svd);
   PyList_SET_ITEM(__pyx_2, 0, __pyx_n_svd);
-  __pyx_1 = __Pyx_Import(__pyx_k168p, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1500; goto __pyx_L1;}
+  __pyx_1 = __Pyx_Import(__pyx_k68p, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1500; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_svd); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1500; goto __pyx_L1;}
   Py_DECREF(__pyx_v_svd);
@@ -8173,7 +8159,7 @@
   __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1502 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1502 */
   __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1502; goto __pyx_L1;}
   Py_INCREF(__pyx_v_cov);
   PyTuple_SET_ITEM(__pyx_6, 0, __pyx_v_cov);
@@ -8196,11 +8182,11 @@
   if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1502; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1503 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1503 */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
   __pyx_6 = PyObject_GetAttr(__pyx_3, __pyx_n_dot); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_sqrt); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1503; goto __pyx_L1;}
@@ -8223,8 +8209,8 @@
   __pyx_v_x = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1506 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1506; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1506 */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1506; goto __pyx_L1;}
   __pyx_6 = PyObject_GetAttr(__pyx_1, __pyx_n_add); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1506; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1506; goto __pyx_L1;}
@@ -8239,7 +8225,7 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1507 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1507 */
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1507; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_final_shape);
@@ -8248,7 +8234,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1507; goto __pyx_L1;}
   Py_DECREF(__pyx_6); __pyx_6 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1508 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1508 */
   Py_INCREF(__pyx_v_x);
   __pyx_r = __pyx_v_x;
   goto __pyx_L0;
@@ -8277,12 +8263,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_zeros;
-
-static PyObject *__pyx_k170p;
-
-static char __pyx_k170[] = "sum(pvals[:-1]) > 1.0";
-
 static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_multinomial[] = "Multinomial distribution.\n\n        multinomial(n, pvals, size=None) -> random values\n\n        pvals is a sequence of probabilities that should sum to 1 (however, the\n        last element is always assumed to account for the remaining probability\n        as long as sum(pvals[:-1]) <= 1).\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -8308,7 +8288,7 @@
   PyObject *__pyx_5 = 0;
   long __pyx_6;
   static char *__pyx_argnames[] = {"n","pvals","size",0};
-  __pyx_v_size = __pyx_k59;
+  __pyx_v_size = __pyx_d58;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "lO|O", __pyx_argnames, &__pyx_v_n, &__pyx_v_pvals, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_pvals);
@@ -8318,26 +8298,26 @@
   __pyx_v_shape = Py_None; Py_INCREF(Py_None);
   __pyx_v_multin = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1526 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1526 */
   __pyx_1 = PyObject_Length(__pyx_v_pvals); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1526; goto __pyx_L1;}
   __pyx_v_d = __pyx_1;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1527 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1527 */
   __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1527; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)arrayObject_parr));
   arrayObject_parr = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1528 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1528 */
   __pyx_v_pix = ((double *)arrayObject_parr->data);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1530 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1530 */
   __pyx_3 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > (1.0 + 1e-12));
   if (__pyx_3) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1531; goto __pyx_L1;}
-    Py_INCREF(__pyx_k170p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k170p);
+    Py_INCREF(__pyx_k72p);
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k72p);
     __pyx_4 = PyObject_CallObject(PyExc_ValueError, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1531; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
@@ -8347,7 +8327,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1533 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1533 */
   __pyx_3 = __pyx_v_size == Py_None;
   if (__pyx_3) {
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1534; goto __pyx_L1;}
@@ -8391,8 +8371,8 @@
   }
   __pyx_L3:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1540 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1540; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1540 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1540; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1540; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1540; goto __pyx_L1;}
@@ -8407,39 +8387,39 @@
   __pyx_v_multin = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1541 */
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_multin)));
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1541 */
+  Py_INCREF(__pyx_v_multin);
   Py_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1542 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1542 */
   __pyx_v_mnix = ((long *)arrayObject_mnarr->data);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1543 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1543 */
   __pyx_v_i = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1544 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1544 */
   while (1) {
     __pyx_3 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
     if (!__pyx_3) break;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1545 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1545 */
     __pyx_v_Sum = 1.0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1546 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1546 */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1547 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1547 */
     __pyx_6 = (__pyx_v_d - 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_6; ++__pyx_v_j) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1548 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1548 */
       (__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));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1549 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1549 */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1550 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1550 */
       __pyx_3 = (__pyx_v_dn <= 0);
       if (__pyx_3) {
         goto __pyx_L7;
@@ -8447,12 +8427,12 @@
       }
       __pyx_L8:;
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1552 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1552 */
       __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j]));
     }
     __pyx_L7:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1553 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1553 */
     __pyx_3 = (__pyx_v_dn > 0);
     if (__pyx_3) {
       (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn;
@@ -8460,11 +8440,11 @@
     }
     __pyx_L9:;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1556 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1556 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1558 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1558 */
   Py_INCREF(__pyx_v_multin);
   __pyx_r = __pyx_v_multin;
   goto __pyx_L0;
@@ -8512,7 +8492,7 @@
   PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"alpha","size",0};
-  __pyx_v_size = __pyx_k60;
+  __pyx_v_size = __pyx_d59;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_alpha, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_alpha);
@@ -8522,21 +8502,21 @@
   __pyx_v_shape = Py_None; Py_INCREF(Py_None);
   __pyx_v_diric = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1621 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1621 */
   __pyx_1 = PyObject_Length(__pyx_v_alpha); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1621; goto __pyx_L1;}
   __pyx_v_k = __pyx_1;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1622 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1622 */
   __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_alpha,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1622; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
+  Py_INCREF(__pyx_2);
   Py_DECREF(((PyObject *)__pyx_v_alpha_arr));
   __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1623 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1623 */
   __pyx_v_alpha_data = ((double *)__pyx_v_alpha_arr->data);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1625 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1625 */
   __pyx_3 = __pyx_v_size == Py_None;
   if (__pyx_3) {
     __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1626; goto __pyx_L1;}
@@ -8580,11 +8560,11 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1632 */
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1632 */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
-  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_float64); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1632; goto __pyx_L1;}
@@ -8599,51 +8579,51 @@
   __pyx_v_diric = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1633 */
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_diric)));
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1633 */
+  Py_INCREF(__pyx_v_diric);
   Py_DECREF(((PyObject *)__pyx_v_val_arr));
   __pyx_v_val_arr = ((PyArrayObject *)__pyx_v_diric);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1634 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1634 */
   __pyx_v_val_data = ((double *)__pyx_v_val_arr->data);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1636 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1636 */
   __pyx_v_i = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1637 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1637 */
   __pyx_v_totsize = PyArray_SIZE(__pyx_v_val_arr);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1638 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1638 */
   while (1) {
     __pyx_3 = (__pyx_v_i < __pyx_v_totsize);
     if (!__pyx_3) break;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1639 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1639 */
     __pyx_v_acc = 0.0;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1640 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1640 */
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) {
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1641 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1641 */
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = rk_standard_gamma(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,(__pyx_v_alpha_data[__pyx_v_j]));
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1642 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1642 */
       __pyx_v_acc = (__pyx_v_acc + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]));
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1643 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1643 */
     __pyx_v_invacc = (1 / __pyx_v_acc);
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1644 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1644 */
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) {
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = ((__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) * __pyx_v_invacc);
     }
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1646 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1646 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_k);
   }
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1648 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1648 */
   Py_INCREF(__pyx_v_diric);
   __pyx_r = __pyx_v_diric;
   goto __pyx_L0;
@@ -8667,9 +8647,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_copy;
-
-
 static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_shuffle[] = "Modify a sequence in-place by shuffling its contents.\n\n        shuffle(x)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -8688,11 +8665,11 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1659 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1659 */
   __pyx_1 = PyObject_Length(__pyx_v_x); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
   __pyx_v_i = (__pyx_1 - 1);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1660 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1660 */
   /*try:*/ {
     __pyx_2 = __Pyx_GetItemInt(__pyx_v_x, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1661; goto __pyx_L2;}
     __pyx_1 = PyObject_Length(__pyx_2); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1661; goto __pyx_L2;}
@@ -8703,7 +8680,7 @@
   __pyx_L2:;
   Py_XDECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1662 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1662 */
   /*except:*/ {
     __Pyx_AddTraceback("mtrand.shuffle");
     if (__Pyx_GetException(&__pyx_2, &__pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;}
@@ -8715,17 +8692,17 @@
   }
   __pyx_L3:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1665 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1665 */
   __pyx_5 = (__pyx_v_j == 0);
   if (__pyx_5) {
     while (1) {
       __pyx_5 = (__pyx_v_i > 0);
       if (!__pyx_5) break;
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1668 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1668 */
       __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1669 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1669 */
       __pyx_2 = __Pyx_GetItemInt(__pyx_v_x, __pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
       __pyx_3 = __Pyx_GetItemInt(__pyx_v_x, __pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
       if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_i, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
@@ -8733,30 +8710,30 @@
       if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
       Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-      /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1670 */
+      /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1670 */
       __pyx_v_i = (__pyx_v_i - 1);
     }
     goto __pyx_L4;
   }
   /*else*/ {
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1673 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1673 */
     __pyx_4 = __Pyx_GetItemInt(__pyx_v_x, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1673; goto __pyx_L1;}
     __pyx_5 = PyObject_HasAttr(__pyx_4,__pyx_n_copy); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1673; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __pyx_v_copy = __pyx_5;
 
-    /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1674 */
+    /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1674 */
     __pyx_5 = __pyx_v_copy;
     if (__pyx_5) {
       while (1) {
         __pyx_5 = (__pyx_v_i > 0);
         if (!__pyx_5) break;
 
-        /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1676 */
+        /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1676 */
         __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1677 */
+        /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1677 */
         __pyx_2 = __Pyx_GetItemInt(__pyx_v_x, __pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;}
         __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -8772,7 +8749,7 @@
         if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-        /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1678 */
+        /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1678 */
         __pyx_v_i = (__pyx_v_i - 1);
       }
       goto __pyx_L7;
@@ -8782,10 +8759,10 @@
         __pyx_5 = (__pyx_v_i > 0);
         if (!__pyx_5) break;
 
-        /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1681 */
+        /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1681 */
         __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1682 */
+        /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1682 */
         __pyx_3 = __Pyx_GetItemInt(__pyx_v_x, __pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;}
         __pyx_4 = PySequence_GetSlice(__pyx_3, 0, PY_SSIZE_T_MAX); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -8797,7 +8774,7 @@
         if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-        /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1683 */
+        /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1683 */
         __pyx_v_i = (__pyx_v_i - 1);
       }
     }
@@ -8819,8 +8796,6 @@
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_arange;
-
 static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_permutation[] = "Given an integer, return a shuffled sequence of integers >= 0 and\n        < x; given a sequence, return a shuffled array copy.\n\n        permutation(x)\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -8837,8 +8812,8 @@
   Py_INCREF(__pyx_v_x);
   __pyx_v_arr = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1691 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1691 */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_integer); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
@@ -8849,7 +8824,7 @@
   __pyx_3 = PyObject_IsInstance(__pyx_v_x,__pyx_1); if (__pyx_3 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_3) {
-    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
     __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_arange); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
@@ -8864,7 +8839,7 @@
     goto __pyx_L2;
   }
   /*else*/ {
-    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_np); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
     __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
@@ -8879,7 +8854,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1695 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1695 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;}
   __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;}
   Py_INCREF(__pyx_v_arr);
@@ -8889,7 +8864,7 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1696 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1696 */
   Py_INCREF(__pyx_v_arr);
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
@@ -8909,197 +8884,6 @@
   return __pyx_r;
 }
 
-static __Pyx_InternTabEntry __pyx_intern_tab[] = {
-  {&__pyx_n_MT19937, "MT19937"},
-  {&__pyx_n___RandomState_ctor, "__RandomState_ctor"},
-  {&__pyx_n__rand, "_rand"},
-  {&__pyx_n__sp, "_sp"},
-  {&__pyx_n_add, "add"},
-  {&__pyx_n_any, "any"},
-  {&__pyx_n_append, "append"},
-  {&__pyx_n_arange, "arange"},
-  {&__pyx_n_array, "array"},
-  {&__pyx_n_asarray, "asarray"},
-  {&__pyx_n_beta, "beta"},
-  {&__pyx_n_binomial, "binomial"},
-  {&__pyx_n_bytes, "bytes"},
-  {&__pyx_n_chisquare, "chisquare"},
-  {&__pyx_n_copy, "copy"},
-  {&__pyx_n_dirichlet, "dirichlet"},
-  {&__pyx_n_dot, "dot"},
-  {&__pyx_n_empty, "empty"},
-  {&__pyx_n_equal, "equal"},
-  {&__pyx_n_exponential, "exponential"},
-  {&__pyx_n_f, "f"},
-  {&__pyx_n_float64, "float64"},
-  {&__pyx_n_gamma, "gamma"},
-  {&__pyx_n_geometric, "geometric"},
-  {&__pyx_n_get_state, "get_state"},
-  {&__pyx_n_greater, "greater"},
-  {&__pyx_n_gumbel, "gumbel"},
-  {&__pyx_n_hypergeometric, "hypergeometric"},
-  {&__pyx_n_integer, "integer"},
-  {&__pyx_n_laplace, "laplace"},
-  {&__pyx_n_less, "less"},
-  {&__pyx_n_less_equal, "less_equal"},
-  {&__pyx_n_logistic, "logistic"},
-  {&__pyx_n_lognormal, "lognormal"},
-  {&__pyx_n_logseries, "logseries"},
-  {&__pyx_n_multinomial, "multinomial"},
-  {&__pyx_n_multiply, "multiply"},
-  {&__pyx_n_multivariate_normal, "multivariate_normal"},
-  {&__pyx_n_negative_binomial, "negative_binomial"},
-  {&__pyx_n_noncentral_chisquare, "noncentral_chisquare"},
-  {&__pyx_n_noncentral_f, "noncentral_f"},
-  {&__pyx_n_normal, "normal"},
-  {&__pyx_n_numpy, "numpy"},
-  {&__pyx_n_pareto, "pareto"},
-  {&__pyx_n_permutation, "permutation"},
-  {&__pyx_n_poisson, "poisson"},
-  {&__pyx_n_power, "power"},
-  {&__pyx_n_rand, "rand"},
-  {&__pyx_n_randint, "randint"},
-  {&__pyx_n_randn, "randn"},
-  {&__pyx_n_random, "random"},
-  {&__pyx_n_random_integers, "random_integers"},
-  {&__pyx_n_random_sample, "random_sample"},
-  {&__pyx_n_rayleigh, "rayleigh"},
-  {&__pyx_n_reduce, "reduce"},
-  {&__pyx_n_seed, "seed"},
-  {&__pyx_n_set_state, "set_state"},
-  {&__pyx_n_shape, "shape"},
-  {&__pyx_n_shuffle, "shuffle"},
-  {&__pyx_n_size, "size"},
-  {&__pyx_n_sqrt, "sqrt"},
-  {&__pyx_n_standard_cauchy, "standard_cauchy"},
-  {&__pyx_n_standard_exponential, "standard_exponential"},
-  {&__pyx_n_standard_gamma, "standard_gamma"},
-  {&__pyx_n_standard_normal, "standard_normal"},
-  {&__pyx_n_standard_t, "standard_t"},
-  {&__pyx_n_subtract, "subtract"},
-  {&__pyx_n_svd, "svd"},
-  {&__pyx_n_triangular, "triangular"},
-  {&__pyx_n_uint, "uint"},
-  {&__pyx_n_uint32, "uint32"},
-  {&__pyx_n_uniform, "uniform"},
-  {&__pyx_n_vonmises, "vonmises"},
-  {&__pyx_n_wald, "wald"},
-  {&__pyx_n_weibull, "weibull"},
-  {&__pyx_n_zeros, "zeros"},
-  {&__pyx_n_zipf, "zipf"},
-  {0, 0}
-};
-
-static __Pyx_StringTabEntry __pyx_string_tab[] = {
-  {&__pyx_k61p, __pyx_k61, sizeof(__pyx_k61)},
-  {&__pyx_k62p, __pyx_k62, sizeof(__pyx_k62)},
-  {&__pyx_k63p, __pyx_k63, sizeof(__pyx_k63)},
-  {&__pyx_k64p, __pyx_k64, sizeof(__pyx_k64)},
-  {&__pyx_k65p, __pyx_k65, sizeof(__pyx_k65)},
-  {&__pyx_k66p, __pyx_k66, sizeof(__pyx_k66)},
-  {&__pyx_k69p, __pyx_k69, sizeof(__pyx_k69)},
-  {&__pyx_k70p, __pyx_k70, sizeof(__pyx_k70)},
-  {&__pyx_k71p, __pyx_k71, sizeof(__pyx_k71)},
-  {&__pyx_k73p, __pyx_k73, sizeof(__pyx_k73)},
-  {&__pyx_k74p, __pyx_k74, sizeof(__pyx_k74)},
-  {&__pyx_k75p, __pyx_k75, sizeof(__pyx_k75)},
-  {&__pyx_k76p, __pyx_k76, sizeof(__pyx_k76)},
-  {&__pyx_k77p, __pyx_k77, sizeof(__pyx_k77)},
-  {&__pyx_k78p, __pyx_k78, sizeof(__pyx_k78)},
-  {&__pyx_k79p, __pyx_k79, sizeof(__pyx_k79)},
-  {&__pyx_k80p, __pyx_k80, sizeof(__pyx_k80)},
-  {&__pyx_k81p, __pyx_k81, sizeof(__pyx_k81)},
-  {&__pyx_k82p, __pyx_k82, sizeof(__pyx_k82)},
-  {&__pyx_k83p, __pyx_k83, sizeof(__pyx_k83)},
-  {&__pyx_k84p, __pyx_k84, sizeof(__pyx_k84)},
-  {&__pyx_k85p, __pyx_k85, sizeof(__pyx_k85)},
-  {&__pyx_k86p, __pyx_k86, sizeof(__pyx_k86)},
-  {&__pyx_k87p, __pyx_k87, sizeof(__pyx_k87)},
-  {&__pyx_k88p, __pyx_k88, sizeof(__pyx_k88)},
-  {&__pyx_k89p, __pyx_k89, sizeof(__pyx_k89)},
-  {&__pyx_k90p, __pyx_k90, sizeof(__pyx_k90)},
-  {&__pyx_k91p, __pyx_k91, sizeof(__pyx_k91)},
-  {&__pyx_k92p, __pyx_k92, sizeof(__pyx_k92)},
-  {&__pyx_k93p, __pyx_k93, sizeof(__pyx_k93)},
-  {&__pyx_k94p, __pyx_k94, sizeof(__pyx_k94)},
-  {&__pyx_k95p, __pyx_k95, sizeof(__pyx_k95)},
-  {&__pyx_k96p, __pyx_k96, sizeof(__pyx_k96)},
-  {&__pyx_k97p, __pyx_k97, sizeof(__pyx_k97)},
-  {&__pyx_k98p, __pyx_k98, sizeof(__pyx_k98)},
-  {&__pyx_k99p, __pyx_k99, sizeof(__pyx_k99)},
-  {&__pyx_k100p, __pyx_k100, sizeof(__pyx_k100)},
-  {&__pyx_k101p, __pyx_k101, sizeof(__pyx_k101)},
-  {&__pyx_k102p, __pyx_k102, sizeof(__pyx_k102)},
-  {&__pyx_k103p, __pyx_k103, sizeof(__pyx_k103)},
-  {&__pyx_k104p, __pyx_k104, sizeof(__pyx_k104)},
-  {&__pyx_k105p, __pyx_k105, sizeof(__pyx_k105)},
-  {&__pyx_k106p, __pyx_k106, sizeof(__pyx_k106)},
-  {&__pyx_k107p, __pyx_k107, sizeof(__pyx_k107)},
-  {&__pyx_k108p, __pyx_k108, sizeof(__pyx_k108)},
-  {&__pyx_k109p, __pyx_k109, sizeof(__pyx_k109)},
-  {&__pyx_k110p, __pyx_k110, sizeof(__pyx_k110)},
-  {&__pyx_k111p, __pyx_k111, sizeof(__pyx_k111)},
-  {&__pyx_k112p, __pyx_k112, sizeof(__pyx_k112)},
-  {&__pyx_k113p, __pyx_k113, sizeof(__pyx_k113)},
-  {&__pyx_k114p, __pyx_k114, sizeof(__pyx_k114)},
-  {&__pyx_k115p, __pyx_k115, sizeof(__pyx_k115)},
-  {&__pyx_k116p, __pyx_k116, sizeof(__pyx_k116)},
-  {&__pyx_k117p, __pyx_k117, sizeof(__pyx_k117)},
-  {&__pyx_k118p, __pyx_k118, sizeof(__pyx_k118)},
-  {&__pyx_k119p, __pyx_k119, sizeof(__pyx_k119)},
-  {&__pyx_k120p, __pyx_k120, sizeof(__pyx_k120)},
-  {&__pyx_k121p, __pyx_k121, sizeof(__pyx_k121)},
-  {&__pyx_k122p, __pyx_k122, sizeof(__pyx_k122)},
-  {&__pyx_k123p, __pyx_k123, sizeof(__pyx_k123)},
-  {&__pyx_k124p, __pyx_k124, sizeof(__pyx_k124)},
-  {&__pyx_k125p, __pyx_k125, sizeof(__pyx_k125)},
-  {&__pyx_k126p, __pyx_k126, sizeof(__pyx_k126)},
-  {&__pyx_k127p, __pyx_k127, sizeof(__pyx_k127)},
-  {&__pyx_k128p, __pyx_k128, sizeof(__pyx_k128)},
-  {&__pyx_k129p, __pyx_k129, sizeof(__pyx_k129)},
-  {&__pyx_k130p, __pyx_k130, sizeof(__pyx_k130)},
-  {&__pyx_k131p, __pyx_k131, sizeof(__pyx_k131)},
-  {&__pyx_k132p, __pyx_k132, sizeof(__pyx_k132)},
-  {&__pyx_k133p, __pyx_k133, sizeof(__pyx_k133)},
-  {&__pyx_k134p, __pyx_k134, sizeof(__pyx_k134)},
-  {&__pyx_k135p, __pyx_k135, sizeof(__pyx_k135)},
-  {&__pyx_k136p, __pyx_k136, sizeof(__pyx_k136)},
-  {&__pyx_k137p, __pyx_k137, sizeof(__pyx_k137)},
-  {&__pyx_k138p, __pyx_k138, sizeof(__pyx_k138)},
-  {&__pyx_k139p, __pyx_k139, sizeof(__pyx_k139)},
-  {&__pyx_k140p, __pyx_k140, sizeof(__pyx_k140)},
-  {&__pyx_k141p, __pyx_k141, sizeof(__pyx_k141)},
-  {&__pyx_k142p, __pyx_k142, sizeof(__pyx_k142)},
-  {&__pyx_k143p, __pyx_k143, sizeof(__pyx_k143)},
-  {&__pyx_k144p, __pyx_k144, sizeof(__pyx_k144)},
-  {&__pyx_k145p, __pyx_k145, sizeof(__pyx_k145)},
-  {&__pyx_k146p, __pyx_k146, sizeof(__pyx_k146)},
-  {&__pyx_k147p, __pyx_k147, sizeof(__pyx_k147)},
-  {&__pyx_k148p, __pyx_k148, sizeof(__pyx_k148)},
-  {&__pyx_k149p, __pyx_k149, sizeof(__pyx_k149)},
-  {&__pyx_k150p, __pyx_k150, sizeof(__pyx_k150)},
-  {&__pyx_k151p, __pyx_k151, sizeof(__pyx_k151)},
-  {&__pyx_k152p, __pyx_k152, sizeof(__pyx_k152)},
-  {&__pyx_k153p, __pyx_k153, sizeof(__pyx_k153)},
-  {&__pyx_k154p, __pyx_k154, sizeof(__pyx_k154)},
-  {&__pyx_k155p, __pyx_k155, sizeof(__pyx_k155)},
-  {&__pyx_k156p, __pyx_k156, sizeof(__pyx_k156)},
-  {&__pyx_k157p, __pyx_k157, sizeof(__pyx_k157)},
-  {&__pyx_k158p, __pyx_k158, sizeof(__pyx_k158)},
-  {&__pyx_k159p, __pyx_k159, sizeof(__pyx_k159)},
-  {&__pyx_k160p, __pyx_k160, sizeof(__pyx_k160)},
-  {&__pyx_k161p, __pyx_k161, sizeof(__pyx_k161)},
-  {&__pyx_k162p, __pyx_k162, sizeof(__pyx_k162)},
-  {&__pyx_k163p, __pyx_k163, sizeof(__pyx_k163)},
-  {&__pyx_k164p, __pyx_k164, sizeof(__pyx_k164)},
-  {&__pyx_k165p, __pyx_k165, sizeof(__pyx_k165)},
-  {&__pyx_k166p, __pyx_k166, sizeof(__pyx_k166)},
-  {&__pyx_k167p, __pyx_k167, sizeof(__pyx_k167)},
-  {&__pyx_k168p, __pyx_k168, sizeof(__pyx_k168)},
-  {&__pyx_k170p, __pyx_k170, sizeof(__pyx_k170)},
-  {0, 0, 0}
-};
-
 static PyObject *__pyx_tp_new_6mtrand_RandomState(PyTypeObject *t, PyObject *a, PyObject *k) {
   PyObject *o = (*t->tp_alloc)(t, 0);
   if (!o) return 0;
@@ -9325,7 +9109,6 @@
   __pyx_b = PyImport_AddModule("__builtin__");
   if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
-  if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
   __pyx_ptype_6mtrand_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr)); if (!__pyx_ptype_6mtrand_dtype) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 74; goto __pyx_L1;}
   __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (!__pyx_ptype_6mtrand_ndarray) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 79; goto __pyx_L1;}
@@ -9335,551 +9118,551 @@
   if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; goto __pyx_L1;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":120 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":120 */
   import_array();
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":122 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":122 */
   __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
-  if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":489 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":489 */
   Py_INCREF(Py_None);
-  __pyx_k2 = Py_None;
+  __pyx_d1 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":499 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":499 */
   Py_INCREF(Py_None);
-  __pyx_k3 = Py_None;
+  __pyx_d2 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":581 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":581 */
   Py_INCREF(Py_None);
-  __pyx_k4 = Py_None;
+  __pyx_d3 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":588 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":588 */
   Py_INCREF(Py_None);
-  __pyx_k5 = Py_None;
+  __pyx_d4 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":595 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":595 */
   Py_INCREF(Py_None);
-  __pyx_k6 = Py_None;
+  __pyx_d5 = Py_None;
   Py_INCREF(Py_None);
-  __pyx_k7 = Py_None;
+  __pyx_d6 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":640 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":640 */
   __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 640; goto __pyx_L1;}
-  __pyx_k8 = __pyx_1;
+  __pyx_d7 = __pyx_1;
   __pyx_1 = 0;
   __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 640; goto __pyx_L1;}
-  __pyx_k9 = __pyx_2;
+  __pyx_d8 = __pyx_2;
   __pyx_2 = 0;
   Py_INCREF(Py_None);
-  __pyx_k10 = Py_None;
+  __pyx_d9 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":693 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":693 */
   Py_INCREF(Py_None);
-  __pyx_k11 = Py_None;
+  __pyx_d10 = Py_None;
   Py_INCREF(Py_None);
-  __pyx_k12 = Py_None;
+  __pyx_d11 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":706 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":706 */
   Py_INCREF(Py_None);
-  __pyx_k13 = Py_None;
+  __pyx_d12 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":713 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":713 */
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; goto __pyx_L1;}
-  __pyx_k14 = __pyx_3;
+  __pyx_d13 = __pyx_3;
   __pyx_3 = 0;
   __pyx_4 = PyFloat_FromDouble(1.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; goto __pyx_L1;}
-  __pyx_k15 = __pyx_4;
+  __pyx_d14 = __pyx_4;
   __pyx_4 = 0;
   Py_INCREF(Py_None);
-  __pyx_k16 = Py_None;
+  __pyx_d15 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":736 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":736 */
   Py_INCREF(Py_None);
-  __pyx_k17 = Py_None;
+  __pyx_d16 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":763 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":763 */
   __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;}
-  __pyx_k18 = __pyx_5;
+  __pyx_d17 = __pyx_5;
   __pyx_5 = 0;
   Py_INCREF(Py_None);
-  __pyx_k19 = Py_None;
+  __pyx_d18 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":784 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":784 */
   Py_INCREF(Py_None);
-  __pyx_k20 = Py_None;
+  __pyx_d19 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":791 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":791 */
   Py_INCREF(Py_None);
-  __pyx_k21 = Py_None;
+  __pyx_d20 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":811 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":811 */
   __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; goto __pyx_L1;}
-  __pyx_k22 = __pyx_6;
+  __pyx_d21 = __pyx_6;
   __pyx_6 = 0;
   Py_INCREF(Py_None);
-  __pyx_k23 = Py_None;
+  __pyx_d22 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":837 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":837 */
   Py_INCREF(Py_None);
-  __pyx_k24 = Py_None;
+  __pyx_d23 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":864 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":864 */
   Py_INCREF(Py_None);
-  __pyx_k25 = Py_None;
+  __pyx_d24 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":900 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":900 */
   Py_INCREF(Py_None);
-  __pyx_k26 = Py_None;
+  __pyx_d25 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":921 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":921 */
   Py_INCREF(Py_None);
-  __pyx_k27 = Py_None;
+  __pyx_d26 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":949 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":949 */
   Py_INCREF(Py_None);
-  __pyx_k28 = Py_None;
+  __pyx_d27 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":956 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":956 */
   Py_INCREF(Py_None);
-  __pyx_k29 = Py_None;
+  __pyx_d28 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":977 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":977 */
   Py_INCREF(Py_None);
-  __pyx_k30 = Py_None;
+  __pyx_d29 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1001 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1001 */
   Py_INCREF(Py_None);
-  __pyx_k31 = Py_None;
+  __pyx_d30 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1022 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1022 */
   Py_INCREF(Py_None);
-  __pyx_k32 = Py_None;
+  __pyx_d31 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1043 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1043 */
   Py_INCREF(Py_None);
-  __pyx_k33 = Py_None;
+  __pyx_d32 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1064 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1064 */
   __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; goto __pyx_L1;}
-  __pyx_k34 = __pyx_7;
+  __pyx_d33 = __pyx_7;
   __pyx_7 = 0;
   __pyx_8 = PyFloat_FromDouble(1.0); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; goto __pyx_L1;}
-  __pyx_k35 = __pyx_8;
+  __pyx_d34 = __pyx_8;
   __pyx_8 = 0;
   Py_INCREF(Py_None);
-  __pyx_k36 = Py_None;
+  __pyx_d35 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1086 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1086 */
   __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;}
-  __pyx_k37 = __pyx_9;
+  __pyx_d36 = __pyx_9;
   __pyx_9 = 0;
   __pyx_10 = PyFloat_FromDouble(1.0); if (!__pyx_10) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;}
-  __pyx_k38 = __pyx_10;
+  __pyx_d37 = __pyx_10;
   __pyx_10 = 0;
   Py_INCREF(Py_None);
-  __pyx_k39 = Py_None;
+  __pyx_d38 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1108 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1108 */
   __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1108; goto __pyx_L1;}
-  __pyx_k40 = __pyx_11;
+  __pyx_d39 = __pyx_11;
   __pyx_11 = 0;
   __pyx_12 = PyFloat_FromDouble(1.0); if (!__pyx_12) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1108; goto __pyx_L1;}
-  __pyx_k41 = __pyx_12;
+  __pyx_d40 = __pyx_12;
   __pyx_12 = 0;
   Py_INCREF(Py_None);
-  __pyx_k42 = Py_None;
+  __pyx_d41 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1130 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1130 */
   __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; goto __pyx_L1;}
-  __pyx_k43 = __pyx_13;
+  __pyx_d42 = __pyx_13;
   __pyx_13 = 0;
   __pyx_14 = PyFloat_FromDouble(1.0); if (!__pyx_14) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; goto __pyx_L1;}
-  __pyx_k44 = __pyx_14;
+  __pyx_d43 = __pyx_14;
   __pyx_14 = 0;
   Py_INCREF(Py_None);
-  __pyx_k45 = Py_None;
+  __pyx_d44 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1159 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1159 */
   __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; goto __pyx_L1;}
-  __pyx_k46 = __pyx_15;
+  __pyx_d45 = __pyx_15;
   __pyx_15 = 0;
   Py_INCREF(Py_None);
-  __pyx_k47 = Py_None;
+  __pyx_d46 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1181 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1181 */
   Py_INCREF(Py_None);
-  __pyx_k48 = Py_None;
+  __pyx_d47 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1209 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1209 */
   Py_INCREF(Py_None);
-  __pyx_k49 = Py_None;
+  __pyx_d48 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1246 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1246 */
   Py_INCREF(Py_None);
-  __pyx_k50 = Py_None;
+  __pyx_d49 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1278 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1278 */
   Py_INCREF(Py_None);
-  __pyx_k51 = Py_None;
+  __pyx_d50 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1313 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1313 */
   __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;}
-  __pyx_k52 = __pyx_16;
+  __pyx_d51 = __pyx_16;
   __pyx_16 = 0;
   Py_INCREF(Py_None);
-  __pyx_k53 = Py_None;
+  __pyx_d52 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1333 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1333 */
   Py_INCREF(Py_None);
-  __pyx_k54 = Py_None;
+  __pyx_d53 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1354 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1354 */
   Py_INCREF(Py_None);
-  __pyx_k55 = Py_None;
+  __pyx_d54 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1381 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1381 */
   Py_INCREF(Py_None);
-  __pyx_k56 = Py_None;
+  __pyx_d55 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1426 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1426 */
   Py_INCREF(Py_None);
-  __pyx_k57 = Py_None;
+  __pyx_d56 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1452 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1452 */
   Py_INCREF(Py_None);
-  __pyx_k58 = Py_None;
+  __pyx_d57 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1510 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1510 */
   Py_INCREF(Py_None);
-  __pyx_k59 = Py_None;
+  __pyx_d58 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1560 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1560 */
   Py_INCREF(Py_None);
-  __pyx_k60 = Py_None;
+  __pyx_d59 = Py_None;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1698 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1698 */
   __pyx_17 = PyObject_CallObject(((PyObject *)__pyx_ptype_6mtrand_RandomState), 0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_17) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1699 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1699 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; 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 = 1699; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1700 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1700 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; 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 = 1700; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1701 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1701 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; 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 = 1701; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1702 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1702 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; 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 = 1702; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1703 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1703 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; 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 = 1703; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1704 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1704 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; 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 = 1704; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1705 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1705 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; 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 = 1705; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1706 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1706 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; 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 = 1706; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1707 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1707 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; 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 = 1707; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1708 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1708 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; 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 = 1708; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1709 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1709 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; 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 = 1709; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1710 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1710 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1710; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1710; 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 = 1710; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1711 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1711 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; 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 = 1711; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1712 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1712 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; 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 = 1712; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1713 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1713 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; 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 = 1713; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1714 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1714 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; 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 = 1714; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1715 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1715 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; 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 = 1715; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1716 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1716 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; 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 = 1716; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1717 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1717 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; 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 = 1717; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1718 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1718 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1718; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1718; 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 = 1718; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1719 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1719 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; 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 = 1719; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1720 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1720 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; 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 = 1720; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1721 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1721 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; 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 = 1721; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1722 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1722 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1722; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1722; 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 = 1722; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1723 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1723 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; 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 = 1723; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1724 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1724 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; 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 = 1724; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1725 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1725 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1725; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1725; 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 = 1725; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1726 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1726 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1726; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1726; 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 = 1726; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1727 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1727 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1727; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1727; 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 = 1727; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1728 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1728 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1728; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1728; 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 = 1728; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1729 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1729 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1729; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1729; 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 = 1729; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1730 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1730 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1730; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1730; 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 = 1730; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1731 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1731 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1731; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1731; 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 = 1731; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1732 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1732 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1732; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1732; 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 = 1732; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1734 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1734 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; 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 = 1734; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1735 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1735 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; 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 = 1735; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1736 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1736 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1736; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1736; 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 = 1736; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1737 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1737 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; 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 = 1737; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1738 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1738 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; 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 = 1738; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1739 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1739 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1739; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1739; 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 = 1739; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1740 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1740 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1740; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1740; 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 = 1740; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1742 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1742 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1742; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1742; 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 = 1742; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1743 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1743 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1743; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1743; 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 = 1743; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1744 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1744 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1744; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_dirichlet); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1744; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_dirichlet, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1744; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1746 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1746 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1746; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1746; 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 = 1746; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/stefan/src/numpy/numpy/random/mtrand/mtrand.pyx":1747 */
+  /* "/home/alan/numpy/numpy/random/mtrand/mtrand.pyx":1747 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1747; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1747; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
@@ -9919,136 +9702,6 @@
   __pyx_f = __pyx_filenames;
 }
 
-static int __Pyx_GetStarArgs(
-    PyObject **args, 
-    PyObject **kwds,
-    char *kwd_list[], 
-    Py_ssize_t nargs,
-    PyObject **args2, 
-    PyObject **kwds2,
-    char rqd_kwds[])
-{
-    PyObject *x = 0, *args1 = 0, *kwds1 = 0;
-    int i;
-    char **p;
-    
-    if (args2)
-        *args2 = 0;
-    if (kwds2)
-        *kwds2 = 0;
-    
-    if (args2) {
-        args1 = PyTuple_GetSlice(*args, 0, nargs);
-        if (!args1)
-            goto bad;
-        *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args));
-        if (!*args2)
-            goto bad;
-    }
-    else if (PyTuple_GET_SIZE(*args) > nargs) {
-        int m = nargs;
-        int n = PyTuple_GET_SIZE(*args);
-        PyErr_Format(PyExc_TypeError,
-            "function takes at most %d positional arguments (%d given)",
-                m, n);
-        goto bad;
-    }
-    else {
-        args1 = *args;
-        Py_INCREF(args1);
-    }
-    
-    if (rqd_kwds && !*kwds)
-            for (i = 0, p = kwd_list; *p; i++, p++)
-                if (rqd_kwds[i])
-                    goto missing_kwarg;
-    
-    if (kwds2) {
-        if (*kwds) {
-            kwds1 = PyDict_New();
-            if (!kwds1)
-                goto bad;
-            *kwds2 = PyDict_Copy(*kwds);
-            if (!*kwds2)
-                goto bad;
-            for (i = 0, p = kwd_list; *p; i++, p++) {
-                x = PyDict_GetItemString(*kwds, *p);
-                if (x) {
-                    if (PyDict_SetItemString(kwds1, *p, x) < 0)
-                        goto bad;
-                    if (PyDict_DelItemString(*kwds2, *p) < 0)
-                        goto bad;
-                }
-                else if (rqd_kwds && rqd_kwds[i])
-                    goto missing_kwarg;
-            }
-        }
-        else {
-            *kwds2 = PyDict_New();
-            if (!*kwds2)
-                goto bad;
-        }
-    }
-    else {
-        kwds1 = *kwds;
-        Py_XINCREF(kwds1);
-        if (rqd_kwds && *kwds)
-            for (i = 0, p = kwd_list; *p; i++, p++)
-                if (rqd_kwds[i] && !PyDict_GetItemString(*kwds, *p))
-                        goto missing_kwarg;
-    }
-    
-    *args = args1;
-    *kwds = kwds1;
-    return 0;
-missing_kwarg:
-    PyErr_Format(PyExc_TypeError,
-        "required keyword argument '%s' is missing", *p);
-bad:
-    Py_XDECREF(args1);
-    Py_XDECREF(kwds1);
-    if (args2) {
-        Py_XDECREF(*args2);
-    }
-    if (kwds2) {
-        Py_XDECREF(*kwds2);
-    }
-    return -1;
-}
-
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
-    PyObject *__import__ = 0;
-    PyObject *empty_list = 0;
-    PyObject *module = 0;
-    PyObject *global_dict = 0;
-    PyObject *empty_dict = 0;
-    PyObject *list;
-    __import__ = PyObject_GetAttrString(__pyx_b, "__import__");
-    if (!__import__)
-        goto bad;
-    if (from_list)
-        list = from_list;
-    else {
-        empty_list = PyList_New(0);
-        if (!empty_list)
-            goto bad;
-        list = empty_list;
-    }
-    global_dict = PyModule_GetDict(__pyx_m);
-    if (!global_dict)
-        goto bad;
-    empty_dict = PyDict_New();
-    if (!empty_dict)
-        goto bad;
-    module = PyObject_CallFunction(__import__, "OOOO",
-        name, global_dict, empty_dict, list);
-bad:
-    Py_XDECREF(empty_list);
-    Py_XDECREF(__import__);
-    Py_XDECREF(empty_dict);
-    return module;
-}
-
 static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
     PyObject *result;
     result = PyObject_GetAttr(dict, name);
@@ -10184,6 +9837,103 @@
     return -1;
 }
 
+static int __Pyx_GetStarArgs(
+    PyObject **args, 
+    PyObject **kwds,
+    char *kwd_list[], 
+    Py_ssize_t nargs,
+    PyObject **args2, 
+    PyObject **kwds2,
+    char rqd_kwds[])
+{
+    PyObject *x = 0, *args1 = 0, *kwds1 = 0;
+    int i;
+    char **p;
+    
+    if (args2)
+        *args2 = 0;
+    if (kwds2)
+        *kwds2 = 0;
+    
+    if (args2) {
+        args1 = PyTuple_GetSlice(*args, 0, nargs);
+        if (!args1)
+            goto bad;
+        *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args));
+        if (!*args2)
+            goto bad;
+    }
+    else if (PyTuple_GET_SIZE(*args) > nargs) {
+        int m = nargs;
+        int n = PyTuple_GET_SIZE(*args);
+        PyErr_Format(PyExc_TypeError,
+            "function takes at most %d positional arguments (%d given)",
+                m, n);
+        goto bad;
+    }
+    else {
+        args1 = *args;
+        Py_INCREF(args1);
+    }
+    
+    if (rqd_kwds && !*kwds)
+            for (i = 0, p = kwd_list; *p; i++, p++)
+                if (rqd_kwds[i])
+                    goto missing_kwarg;
+    
+    if (kwds2) {
+        if (*kwds) {
+            kwds1 = PyDict_New();
+            if (!kwds1)
+                goto bad;
+            *kwds2 = PyDict_Copy(*kwds);
+            if (!*kwds2)
+                goto bad;
+            for (i = 0, p = kwd_list; *p; i++, p++) {
+                x = PyDict_GetItemString(*kwds, *p);
+                if (x) {
+                    if (PyDict_SetItemString(kwds1, *p, x) < 0)
+                        goto bad;
+                    if (PyDict_DelItemString(*kwds2, *p) < 0)
+                        goto bad;
+                }
+                else if (rqd_kwds && rqd_kwds[i])
+                    goto missing_kwarg;
+            }
+        }
+        else {
+            *kwds2 = PyDict_New();
+            if (!*kwds2)
+                goto bad;
+        }
+    }
+    else {
+        kwds1 = *kwds;
+        Py_XINCREF(kwds1);
+        if (rqd_kwds && *kwds)
+            for (i = 0, p = kwd_list; *p; i++, p++)
+                if (rqd_kwds[i] && !PyDict_GetItemString(*kwds, *p))
+                        goto missing_kwarg;
+    }
+    
+    *args = args1;
+    *kwds = kwds1;
+    return 0;
+missing_kwarg:
+    PyErr_Format(PyExc_TypeError,
+        "required keyword argument '%s' is missing", *p);
+bad:
+    Py_XDECREF(args1);
+    Py_XDECREF(kwds1);
+    if (args2) {
+        Py_XDECREF(*args2);
+    }
+    if (kwds2) {
+        Py_XDECREF(*kwds2);
+    }
+    return -1;
+}
+
 static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
     if (!type) {
         PyErr_Format(PyExc_SystemError, "Missing type object");
@@ -10196,6 +9946,39 @@
     return 0;
 }
 
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
+    PyObject *__import__ = 0;
+    PyObject *empty_list = 0;
+    PyObject *module = 0;
+    PyObject *global_dict = 0;
+    PyObject *empty_dict = 0;
+    PyObject *list;
+    __import__ = PyObject_GetAttrString(__pyx_b, "__import__");
+    if (!__import__)
+        goto bad;
+    if (from_list)
+        list = from_list;
+    else {
+        empty_list = PyList_New(0);
+        if (!empty_list)
+            goto bad;
+        list = empty_list;
+    }
+    global_dict = PyModule_GetDict(__pyx_m);
+    if (!global_dict)
+        goto bad;
+    empty_dict = PyDict_New();
+    if (!empty_dict)
+        goto bad;
+    module = PyObject_CallFunction(__import__, "OOOO",
+        name, global_dict, empty_dict, list);
+bad:
+    Py_XDECREF(empty_list);
+    Py_XDECREF(__import__);
+    Py_XDECREF(empty_dict);
+    return module;
+}
+
 static int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v) {
     PyTypeObject *t = o->ob_type;
     int r;
@@ -10211,21 +9994,13 @@
     return r;
 }
 
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t) {
-    while (t->p) {
-        *t->p = PyString_InternFromString(t->s);
-        if (!*t->p)
-            return -1;
-        ++t;
-    }
-    return 0;
-}
-
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
     while (t->p) {
         *t->p = PyString_FromStringAndSize(t->s, t->n - 1);
         if (!*t->p)
             return -1;
+        if (t->i)
+            PyString_InternInPlace(t->p);
         ++t;
     }
     return 0;



More information about the Numpy-svn mailing list