Simplify functor sig types

See https://github.com/ocamllabs/compiler-hacking/wiki/Things-to-work-on#wiki-improve-functor-syntax-3