Remove hacks, tart-marshal 0.2.1 contains fixes