Fixed some functor declarations.