Even more Data.Marshal removal