= core: minor cleanup of the remoting instrumentation