Refactor argonaut marshaller/unmarshaller using NatTrans.
Minor refactoring.