Not awfully stoked about this, as it's quite hacky, but it seems to be necessary at this point.  Fixes issue where tm and reg marks are passed unencoded, but matched encoded.  Causes mass failure and general four-horsemen-of-the-apocolypse-ness.