More refactoring of new functor_ck