More marshalling simplification