small internal refactoring in package core.remote (ContractId, Client, Server)