Fix superfluous fields when converting composed types to wrapper types.

Fix superfluous fields when converting composed types to wrapper types. #6915