Clean up marshaling code