Merge in changes to the generated files that allows for a type to extend
a basic type.