Got red of the other marshallers and slimmed it down to only use thrift.  Upgraded thrift.