Changes to message marshalling/unmarshalling.