CompositeTypeWeaverBuilder changes