Merge in new code generator branch.

No match.