Fix serialization of the passthrough types.