Started work on T4 generation of combinator wrappers