Move marshal hack up the chain to fix specs