Use arity tags better - hopefully easier build.
further simplify operator arity
more cleanup
Finish removing un-numbered mpl::apply