Refactor marshaller interface hierarchy