diff --git a/src/main/resources/com/google/api/codegen/nodejs/main.snip b/src/main/resources/com/google/api/codegen/nodejs/main.snip
index d5e92e78c4..a8eba3933c 100644
--- a/src/main/resources/com/google/api/codegen/nodejs/main.snip
+++ b/src/main/resources/com/google/api/codegen/nodejs/main.snip
@@ -192,7 +192,7 @@
     var defaults = gaxGrpc.constructSettings(
         '{@service.getFullName}',
         configData,
-        clientConfig,
+        opts.clientConfig,
         {'x-goog-api-client': googleApiClient.join(' ')});
   @end
 @end
@@ -235,11 +235,11 @@
      * @@class
      */
     function {@serviceName}(gaxGrpc, grpcClients, opts) {
-      opts = opts || {};
-      var servicePath = opts.servicePath || SERVICE_ADDRESS;
-      var port = opts.port || DEFAULT_SERVICE_PORT;
-      var sslCreds = opts.sslCreds || null;
-      var clientConfig = opts.clientConfig || {};
+      opts = extend({
+        servicePath: SERVICE_ADDRESS,
+        port: DEFAULT_SERVICE_PORT,
+        clientConfig: {}
+      }, opts);
 
       var googleApiClient = [
         'gl-node/' + process.versions.node,
@@ -283,14 +283,7 @@
           this.operationsClient = new gax.lro({
             auth: gaxGrpc.auth,
             grpc: gaxGrpc.grpc
-          }).operationsClient({
-            servicePath: servicePath,
-            port: port,
-            sslCreds: sslCreds,
-            clientConfig: clientConfig,
-            libName: opts.libName,
-            libVersion: opts.libVersion
-          });
+          }).operationsClient(opts);
           
           this.longrunningDescriptors = {
             @join method : longrunningMethods on {@", "}.add(BREAK)
@@ -312,10 +305,8 @@
       this.auth = gaxGrpc.auth;
       @join stub : stubs on BREAK.add(BREAK)
         var {@stub.name} = gaxGrpc.createStub(
-            servicePath,
-            port,
             grpcClients.{@stub.fullyQualifiedType},
-            {sslCreds: sslCreds});
+            opts);
         var {@stub.stubMethodsArrayName} = [
           @join method : {@stub.methodNames} on {@","}.add(BREAK)
               '{@method}'
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline
index 727c1f9db3..ae4d4ecb68 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline
@@ -103,11 +103,11 @@ var ALL_SCOPES = [
  * @class
  */
 function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
-  opts = opts || {};
-  var servicePath = opts.servicePath || SERVICE_ADDRESS;
-  var port = opts.port || DEFAULT_SERVICE_PORT;
-  var sslCreds = opts.sslCreds || null;
-  var clientConfig = opts.clientConfig || {};
+  opts = extend({
+    servicePath: SERVICE_ADDRESS,
+    port: DEFAULT_SERVICE_PORT,
+    clientConfig: {}
+  }, opts);
 
   var googleApiClient = [
     'gl-node/' + process.versions.node,
@@ -135,14 +135,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
   this.operationsClient = new gax.lro({
     auth: gaxGrpc.auth,
     grpc: gaxGrpc.grpc
-  }).operationsClient({
-    servicePath: servicePath,
-    port: port,
-    sslCreds: sslCreds,
-    clientConfig: clientConfig,
-    libName: opts.libName,
-    libVersion: opts.libVersion
-  });
+  }).operationsClient(opts);
 
   this.longrunningDescriptors = {
     getBigBook: new gax.LongrunningDescriptor(
@@ -158,17 +151,15 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
   var defaults = gaxGrpc.constructSettings(
       'google.example.library.v1.LibraryService',
       configData,
-      clientConfig,
+      opts.clientConfig,
       {'x-goog-api-client': googleApiClient.join(' ')});
 
   var self = this;
 
   this.auth = gaxGrpc.auth;
   var libraryServiceStub = gaxGrpc.createStub(
-      servicePath,
-      port,
       grpcClients.google.example.library.v1.LibraryService,
-      {sslCreds: sslCreds});
+      opts);
   var libraryServiceStubMethods = [
     'createShelf',
     'getShelf',
@@ -209,10 +200,8 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
   });
 
   var labelerStub = gaxGrpc.createStub(
-      servicePath,
-      port,
       grpcClients.google.tagger.v1.Labeler,
-      {sslCreds: sslCreds});
+      opts);
   var labelerStubMethods = [
     'addLabel'
   ];
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline
index 727c1f9db3..ae4d4ecb68 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline
@@ -103,11 +103,11 @@ var ALL_SCOPES = [
  * @class
  */
 function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
-  opts = opts || {};
-  var servicePath = opts.servicePath || SERVICE_ADDRESS;
-  var port = opts.port || DEFAULT_SERVICE_PORT;
-  var sslCreds = opts.sslCreds || null;
-  var clientConfig = opts.clientConfig || {};
+  opts = extend({
+    servicePath: SERVICE_ADDRESS,
+    port: DEFAULT_SERVICE_PORT,
+    clientConfig: {}
+  }, opts);
 
   var googleApiClient = [
     'gl-node/' + process.versions.node,
@@ -135,14 +135,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
   this.operationsClient = new gax.lro({
     auth: gaxGrpc.auth,
     grpc: gaxGrpc.grpc
-  }).operationsClient({
-    servicePath: servicePath,
-    port: port,
-    sslCreds: sslCreds,
-    clientConfig: clientConfig,
-    libName: opts.libName,
-    libVersion: opts.libVersion
-  });
+  }).operationsClient(opts);
 
   this.longrunningDescriptors = {
     getBigBook: new gax.LongrunningDescriptor(
@@ -158,17 +151,15 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
   var defaults = gaxGrpc.constructSettings(
       'google.example.library.v1.LibraryService',
       configData,
-      clientConfig,
+      opts.clientConfig,
       {'x-goog-api-client': googleApiClient.join(' ')});
 
   var self = this;
 
   this.auth = gaxGrpc.auth;
   var libraryServiceStub = gaxGrpc.createStub(
-      servicePath,
-      port,
       grpcClients.google.example.library.v1.LibraryService,
-      {sslCreds: sslCreds});
+      opts);
   var libraryServiceStubMethods = [
     'createShelf',
     'getShelf',
@@ -209,10 +200,8 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) {
   });
 
   var labelerStub = gaxGrpc.createStub(
-      servicePath,
-      port,
       grpcClients.google.tagger.v1.Labeler,
-      {sslCreds: sslCreds});
+      opts);
   var labelerStubMethods = [
     'addLabel'
   ];
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline
index 97cad0708d..693bfa43b8 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline
@@ -59,11 +59,11 @@ var ALL_SCOPES = [
  * @class
  */
 function NoTemplatesAPIServiceClient(gaxGrpc, grpcClients, opts) {
-  opts = opts || {};
-  var servicePath = opts.servicePath || SERVICE_ADDRESS;
-  var port = opts.port || DEFAULT_SERVICE_PORT;
-  var sslCreds = opts.sslCreds || null;
-  var clientConfig = opts.clientConfig || {};
+  opts = extend({
+    servicePath: SERVICE_ADDRESS,
+    port: DEFAULT_SERVICE_PORT,
+    clientConfig: {}
+  }, opts);
 
   var googleApiClient = [
     'gl-node/' + process.versions.node,
@@ -80,17 +80,15 @@ function NoTemplatesAPIServiceClient(gaxGrpc, grpcClients, opts) {
   var defaults = gaxGrpc.constructSettings(
       'google.cloud.example.v1.NoTemplatesAPIService',
       configData,
-      clientConfig,
+      opts.clientConfig,
       {'x-goog-api-client': googleApiClient.join(' ')});
 
   var self = this;
 
   this.auth = gaxGrpc.auth;
   var noTemplatesApiServiceStub = gaxGrpc.createStub(
-      servicePath,
-      port,
       grpcClients.google.cloud.example.v1.NoTemplatesAPIService,
-      {sslCreds: sslCreds});
+      opts);
   var noTemplatesApiServiceStubMethods = [
     'increment'
   ];