Refactored make_functor_arrfunc a bit