Add several more functor types.