Simplified marshaller and made it actually work.