Move XXXMarshaler Out and Move getXXX into XXXMarshaler