Merge in new code generator branch.