Pulled combinator wrappers out into separate partial classes

Preparing to use T4 to generate the combinator wrappers