Remove most of the marshal deep copies.