NEXUS-5472: Strengthen marshaller.

To not read up garbage. UTs on the way.