More refactoring of functor_ck