Refactor marshaller.