Also change places where xml_marshaller were used directly to always use the wrapper from utils (except in tests for simplicity)