Fix T4 generation.
Merge branch 't4-fixes'