Get rid of "const *&" functor parameters