Use more standard syntax for functor signature