Rearranged code trying to figure out undefined symbol issue that only occurs on Linux.
Rearranged code trying to figure out undefined symbol issue that only occurs on Linux.

numpy/numpy-refactor,numpy/numpy-refactor,numpy/numpy-refactor,numpy/numpy-refactor,numpy/numpy-refactor