OT - Re: PATCH: more tmarshal