Remove a sub-method that was only called from one place; add optional in...

...itialization timeout for RpcProxy.