[WIP] Minor cleanups for the remote object proxy