Remove more hand-written marshallers.