Fixed marshaling embedded fields.