Prepared for switch to cython from numba