Removed repeated code in client ctor overload.