Update to make use of new RemoteServiceFactory mechanics.