Make numba treatment a little more elegant