Fixed containment bug of instantiated subtypes.
Generated source code.