diff --git a/cli/targets/static.js b/cli/targets/static.js
index 2c47dcf01..fae7a75f1 100644
--- a/cli/targets/static.js
+++ b/cli/targets/static.js
@@ -288,7 +288,7 @@ function buildType(ref, type) {
         type.comment ? "@classdesc " + type.comment : null,
         "@exports " + fullName,
         "@constructor",
-        "@param {Object} [" + (config.beautify ? "properties" : "p") + "] Properties to set"
+        "@param {Object.<string,*>=} [" + (config.beautify ? "properties" : "p") + "] Properties to set"
     ]);
     buildFunction(type, type.name, Class.generate(type));
 
@@ -380,7 +380,7 @@ function buildType(ref, type) {
         push("");
         pushComment([
             "Creates a new " + type.name + " instance using the specified properties.",
-            "@param {Object} [properties] Properties to set",
+            "@param {Object.<string,*>=} [properties] Properties to set",
             "@returns {" + fullName + "} " + type.name + " instance"
         ]);
         push(name(type.name) + ".create = function create(properties) {");
diff --git a/src/util/minimal.js b/src/util/minimal.js
index 53b288314..23d3f2def 100644
--- a/src/util/minimal.js
+++ b/src/util/minimal.js
@@ -328,7 +328,7 @@ util.lazyResolve = function lazyResolve(root, lazyTypes) {
 };
 
 /**
- * Default conversion options used for toJSON implementations. Converts longs, enums and bytes to strings.
+ * Default conversion options used for {@link Message#toJSON} implementations. Longs, enums and bytes are converted to strings by default.
  * @type {ConversionOptions}
  */
 util.toJSONOptions = {
diff --git a/tests/data/comments.js b/tests/data/comments.js
index 036df907e..c2b932f76 100644
--- a/tests/data/comments.js
+++ b/tests/data/comments.js
@@ -22,7 +22,7 @@ $root.Test1 = (function() {
      * comment.
      * @exports Test1
      * @constructor
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      */
     function Test1(properties) {
         if (properties)
@@ -50,7 +50,7 @@ $root.Test1 = (function() {
 
     /**
      * Creates a new Test1 instance using the specified properties.
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      * @returns {Test1} Test1 instance
      */
     Test1.create = function create(properties) {
@@ -227,7 +227,7 @@ $root.Test2 = (function() {
      * Constructs a new Test2.
      * @exports Test2
      * @constructor
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      */
     function Test2(properties) {
         if (properties)
@@ -237,7 +237,7 @@ $root.Test2 = (function() {
 
     /**
      * Creates a new Test2 instance using the specified properties.
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      * @returns {Test2} Test2 instance
      */
     Test2.create = function create(properties) {
diff --git a/tests/data/convert.js b/tests/data/convert.js
index c4fe22890..fc033dde4 100644
--- a/tests/data/convert.js
+++ b/tests/data/convert.js
@@ -18,7 +18,7 @@ $root.Message = (function() {
      * Constructs a new Message.
      * @exports Message
      * @constructor
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      */
     function Message(properties) {
         if (properties)
@@ -88,7 +88,7 @@ $root.Message = (function() {
 
     /**
      * Creates a new Message instance using the specified properties.
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      * @returns {Message} Message instance
      */
     Message.create = function create(properties) {
diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js
index 89562a5b8..280aedfa1 100644
--- a/tests/data/mapbox/vector_tile.js
+++ b/tests/data/mapbox/vector_tile.js
@@ -27,7 +27,7 @@ $root.vector_tile = (function() {
          * Constructs a new Tile.
          * @exports vector_tile.Tile
          * @constructor
-         * @param {Object} [properties] Properties to set
+         * @param {Object.<string,*>=} [properties] Properties to set
          */
         function Tile(properties) {
             if (properties)
@@ -48,7 +48,7 @@ $root.vector_tile = (function() {
 
         /**
          * Creates a new Tile instance using the specified properties.
-         * @param {Object} [properties] Properties to set
+         * @param {Object.<string,*>=} [properties] Properties to set
          * @returns {vector_tile.Tile} Tile instance
          */
         Tile.create = function create(properties) {
@@ -234,7 +234,7 @@ $root.vector_tile = (function() {
              * Constructs a new Value.
              * @exports vector_tile.Tile.Value
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Value(properties) {
                 if (properties)
@@ -286,7 +286,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a new Value instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {vector_tile.Tile.Value} Value instance
              */
             Value.create = function create(properties) {
@@ -557,7 +557,7 @@ $root.vector_tile = (function() {
              * Constructs a new Feature.
              * @exports vector_tile.Tile.Feature
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Feature(properties) {
                 if (properties)
@@ -596,7 +596,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a new Feature instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {vector_tile.Tile.Feature} Feature instance
              */
             Feature.create = function create(properties) {
@@ -871,7 +871,7 @@ $root.vector_tile = (function() {
              * Constructs a new Layer.
              * @exports vector_tile.Tile.Layer
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Layer(properties) {
                 if (properties)
@@ -923,7 +923,7 @@ $root.vector_tile = (function() {
 
             /**
              * Creates a new Layer instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {vector_tile.Tile.Layer} Layer instance
              */
             Layer.create = function create(properties) {
diff --git a/tests/data/package.js b/tests/data/package.js
index 1f6c162bf..c92657b14 100644
--- a/tests/data/package.js
+++ b/tests/data/package.js
@@ -18,7 +18,7 @@ $root.Package = (function() {
      * Constructs a new Package.
      * @exports Package
      * @constructor
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      */
     function Package(properties) {
         if (properties)
@@ -141,7 +141,7 @@ $root.Package = (function() {
 
     /**
      * Creates a new Package instance using the specified properties.
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      * @returns {Package} Package instance
      */
     Package.create = function create(properties) {
@@ -644,7 +644,7 @@ $root.Package = (function() {
          * Constructs a new Repository.
          * @exports Package.Repository
          * @constructor
-         * @param {Object} [properties] Properties to set
+         * @param {Object.<string,*>=} [properties] Properties to set
          */
         function Repository(properties) {
             if (properties)
@@ -666,7 +666,7 @@ $root.Package = (function() {
 
         /**
          * Creates a new Repository instance using the specified properties.
-         * @param {Object} [properties] Properties to set
+         * @param {Object.<string,*>=} [properties] Properties to set
          * @returns {Package.Repository} Repository instance
          */
         Repository.create = function create(properties) {
diff --git a/tests/data/rpc.d.ts b/tests/data/rpc.d.ts
index a7686be1d..991dc8787 100644
--- a/tests/data/rpc.d.ts
+++ b/tests/data/rpc.d.ts
@@ -10,9 +10,9 @@ export class MyService extends $protobuf.rpc.Service {
 type MyService_myMethod_Callback = (error: Error, response?: MyResponse) => void;
 
 export class MyRequest {
-    constructor(properties?: Object);
+    constructor(properties?: { [k: string]: any });
     public path?: string;
-    public static create(properties?: Object): MyRequest;
+    public static create(properties?: { [k: string]: any }): MyRequest;
     public static encode(message: (MyRequest|Object), writer?: $protobuf.Writer): $protobuf.Writer;
     public static encodeDelimited(message: (MyRequest|Object), writer?: $protobuf.Writer): $protobuf.Writer;
     public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): MyRequest;
@@ -26,9 +26,9 @@ export class MyRequest {
 }
 
 export class MyResponse {
-    constructor(properties?: Object);
+    constructor(properties?: { [k: string]: any });
     public status?: number;
-    public static create(properties?: Object): MyResponse;
+    public static create(properties?: { [k: string]: any }): MyResponse;
     public static encode(message: (MyResponse|Object), writer?: $protobuf.Writer): $protobuf.Writer;
     public static encodeDelimited(message: (MyResponse|Object), writer?: $protobuf.Writer): $protobuf.Writer;
     public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): MyResponse;
diff --git a/tests/data/rpc.js b/tests/data/rpc.js
index ff6ae5c2b..e629df41f 100644
--- a/tests/data/rpc.js
+++ b/tests/data/rpc.js
@@ -76,7 +76,7 @@ $root.MyRequest = (function() {
      * Constructs a new MyRequest.
      * @exports MyRequest
      * @constructor
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      */
     function MyRequest(properties) {
         if (properties)
@@ -92,7 +92,7 @@ $root.MyRequest = (function() {
 
     /**
      * Creates a new MyRequest instance using the specified properties.
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      * @returns {MyRequest} MyRequest instance
      */
     MyRequest.create = function create(properties) {
@@ -242,7 +242,7 @@ $root.MyResponse = (function() {
      * Constructs a new MyResponse.
      * @exports MyResponse
      * @constructor
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      */
     function MyResponse(properties) {
         if (properties)
@@ -258,7 +258,7 @@ $root.MyResponse = (function() {
 
     /**
      * Creates a new MyResponse instance using the specified properties.
-     * @param {Object} [properties] Properties to set
+     * @param {Object.<string,*>=} [properties] Properties to set
      * @returns {MyResponse} MyResponse instance
      */
     MyResponse.create = function create(properties) {
diff --git a/tests/data/test.d.ts b/tests/data/test.d.ts
index d0db4d57a..f7adee5d2 100644
--- a/tests/data/test.d.ts
+++ b/tests/data/test.d.ts
@@ -5,8 +5,8 @@ export namespace jspb {
     namespace test {
 
         class Empty {
-            constructor(properties?: Object);
-            public static create(properties?: Object): jspb.test.Empty;
+            constructor(properties?: { [k: string]: any });
+            public static create(properties?: { [k: string]: any }): jspb.test.Empty;
             public static encode(message: (jspb.test.Empty|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.Empty|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Empty;
@@ -25,9 +25,9 @@ export namespace jspb {
         }
 
         class EnumContainer {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public outerEnum?: number;
-            public static create(properties?: Object): jspb.test.EnumContainer;
+            public static create(properties?: { [k: string]: any }): jspb.test.EnumContainer;
             public static encode(message: (jspb.test.EnumContainer|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.EnumContainer|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.EnumContainer;
@@ -41,11 +41,11 @@ export namespace jspb {
         }
 
         class Simple1 {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public aString: string;
             public aRepeatedString?: string[];
             public aBoolean?: boolean;
-            public static create(properties?: Object): jspb.test.Simple1;
+            public static create(properties?: { [k: string]: any }): jspb.test.Simple1;
             public static encode(message: (jspb.test.Simple1|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.Simple1|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Simple1;
@@ -59,10 +59,10 @@ export namespace jspb {
         }
 
         class Simple2 {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public aString: string;
             public aRepeatedString?: string[];
-            public static create(properties?: Object): jspb.test.Simple2;
+            public static create(properties?: { [k: string]: any }): jspb.test.Simple2;
             public static encode(message: (jspb.test.Simple2|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.Simple2|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Simple2;
@@ -76,12 +76,12 @@ export namespace jspb {
         }
 
         class SpecialCases {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public normal: string;
             public default: string;
             public function: string;
             public var: string;
-            public static create(properties?: Object): jspb.test.SpecialCases;
+            public static create(properties?: { [k: string]: any }): jspb.test.SpecialCases;
             public static encode(message: (jspb.test.SpecialCases|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.SpecialCases|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.SpecialCases;
@@ -95,13 +95,13 @@ export namespace jspb {
         }
 
         class OptionalFields {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public aString?: string;
             public aBool: boolean;
             public aNestedMessage?: jspb.test.OptionalFields.Nested;
             public aRepeatedMessage?: jspb.test.OptionalFields.Nested[];
             public aRepeatedString?: string[];
-            public static create(properties?: Object): jspb.test.OptionalFields;
+            public static create(properties?: { [k: string]: any }): jspb.test.OptionalFields;
             public static encode(message: (jspb.test.OptionalFields|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.OptionalFields|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OptionalFields;
@@ -117,9 +117,9 @@ export namespace jspb {
         namespace OptionalFields {
 
             class Nested {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public anInt?: number;
-                public static create(properties?: Object): jspb.test.OptionalFields.Nested;
+                public static create(properties?: { [k: string]: any }): jspb.test.OptionalFields.Nested;
                 public static encode(message: (jspb.test.OptionalFields.Nested|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.OptionalFields.Nested|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OptionalFields.Nested;
@@ -134,11 +134,11 @@ export namespace jspb {
         }
 
         class HasExtensions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public str1?: string;
             public str2?: string;
             public str3?: string;
-            public static create(properties?: Object): jspb.test.HasExtensions;
+            public static create(properties?: { [k: string]: any }): jspb.test.HasExtensions;
             public static encode(message: (jspb.test.HasExtensions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.HasExtensions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.HasExtensions;
@@ -152,13 +152,13 @@ export namespace jspb {
         }
 
         class Complex {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public aString: string;
             public anOutOfOrderBool: boolean;
             public aNestedMessage?: jspb.test.Complex.Nested;
             public aRepeatedMessage?: jspb.test.Complex.Nested[];
             public aRepeatedString?: string[];
-            public static create(properties?: Object): jspb.test.Complex;
+            public static create(properties?: { [k: string]: any }): jspb.test.Complex;
             public static encode(message: (jspb.test.Complex|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.Complex|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Complex;
@@ -174,9 +174,9 @@ export namespace jspb {
         namespace Complex {
 
             class Nested {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public anInt: number;
-                public static create(properties?: Object): jspb.test.Complex.Nested;
+                public static create(properties?: { [k: string]: any }): jspb.test.Complex.Nested;
                 public static encode(message: (jspb.test.Complex.Nested|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.Complex.Nested|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Complex.Nested;
@@ -191,8 +191,8 @@ export namespace jspb {
         }
 
         class OuterMessage {
-            constructor(properties?: Object);
-            public static create(properties?: Object): jspb.test.OuterMessage;
+            constructor(properties?: { [k: string]: any });
+            public static create(properties?: { [k: string]: any }): jspb.test.OuterMessage;
             public static encode(message: (jspb.test.OuterMessage|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.OuterMessage|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OuterMessage;
@@ -208,9 +208,9 @@ export namespace jspb {
         namespace OuterMessage {
 
             class Complex {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public innerComplexField?: number;
-                public static create(properties?: Object): jspb.test.OuterMessage.Complex;
+                public static create(properties?: { [k: string]: any }): jspb.test.OuterMessage.Complex;
                 public static encode(message: (jspb.test.OuterMessage.Complex|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.OuterMessage.Complex|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OuterMessage.Complex;
@@ -225,9 +225,9 @@ export namespace jspb {
         }
 
         class IsExtension {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public ext1?: string;
-            public static create(properties?: Object): jspb.test.IsExtension;
+            public static create(properties?: { [k: string]: any }): jspb.test.IsExtension;
             public static encode(message: (jspb.test.IsExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.IsExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.IsExtension;
@@ -241,8 +241,8 @@ export namespace jspb {
         }
 
         class IndirectExtension {
-            constructor(properties?: Object);
-            public static create(properties?: Object): jspb.test.IndirectExtension;
+            constructor(properties?: { [k: string]: any });
+            public static create(properties?: { [k: string]: any }): jspb.test.IndirectExtension;
             public static encode(message: (jspb.test.IndirectExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.IndirectExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.IndirectExtension;
@@ -256,14 +256,14 @@ export namespace jspb {
         }
 
         class DefaultValues {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public stringField?: string;
             public boolField?: boolean;
             public intField?: (number|$protobuf.Long);
             public enumField?: number;
             public emptyField?: string;
             public bytesField?: Uint8Array;
-            public static create(properties?: Object): jspb.test.DefaultValues;
+            public static create(properties?: { [k: string]: any }): jspb.test.DefaultValues;
             public static encode(message: (jspb.test.DefaultValues|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.DefaultValues|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.DefaultValues;
@@ -285,7 +285,7 @@ export namespace jspb {
         }
 
         class FloatingPointFields {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public optionalFloatField?: number;
             public requiredFloatField: number;
             public repeatedFloatField?: number[];
@@ -294,7 +294,7 @@ export namespace jspb {
             public requiredDoubleField: number;
             public repeatedDoubleField?: number[];
             public defaultDoubleField?: number;
-            public static create(properties?: Object): jspb.test.FloatingPointFields;
+            public static create(properties?: { [k: string]: any }): jspb.test.FloatingPointFields;
             public static encode(message: (jspb.test.FloatingPointFields|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.FloatingPointFields|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.FloatingPointFields;
@@ -308,13 +308,13 @@ export namespace jspb {
         }
 
         class TestClone {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public str?: string;
             public simple1?: jspb.test.Simple1;
             public simple2?: jspb.test.Simple1[];
             public bytesField?: Uint8Array;
             public unused?: string;
-            public static create(properties?: Object): jspb.test.TestClone;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestClone;
             public static encode(message: (jspb.test.TestClone|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestClone|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestClone;
@@ -328,9 +328,9 @@ export namespace jspb {
         }
 
         class CloneExtension {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public ext?: string;
-            public static create(properties?: Object): jspb.test.CloneExtension;
+            public static create(properties?: { [k: string]: any }): jspb.test.CloneExtension;
             public static encode(message: (jspb.test.CloneExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.CloneExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.CloneExtension;
@@ -344,14 +344,14 @@ export namespace jspb {
         }
 
         class TestGroup {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public repeatedGroup?: jspb.test.TestGroup.RepeatedGroup[];
             public requiredGroup: jspb.test.TestGroup.RequiredGroup;
             public optionalGroup?: jspb.test.TestGroup.OptionalGroup;
             public id?: string;
             public requiredSimple: jspb.test.Simple2;
             public optionalSimple?: jspb.test.Simple2;
-            public static create(properties?: Object): jspb.test.TestGroup;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestGroup;
             public static encode(message: (jspb.test.TestGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup;
@@ -367,10 +367,10 @@ export namespace jspb {
         namespace TestGroup {
 
             class RepeatedGroup {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public id: string;
                 public someBool?: boolean[];
-                public static create(properties?: Object): jspb.test.TestGroup.RepeatedGroup;
+                public static create(properties?: { [k: string]: any }): jspb.test.TestGroup.RepeatedGroup;
                 public static encode(message: (jspb.test.TestGroup.RepeatedGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.TestGroup.RepeatedGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.RepeatedGroup;
@@ -384,9 +384,9 @@ export namespace jspb {
             }
 
             class RequiredGroup {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public id: string;
-                public static create(properties?: Object): jspb.test.TestGroup.RequiredGroup;
+                public static create(properties?: { [k: string]: any }): jspb.test.TestGroup.RequiredGroup;
                 public static encode(message: (jspb.test.TestGroup.RequiredGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.TestGroup.RequiredGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.RequiredGroup;
@@ -400,9 +400,9 @@ export namespace jspb {
             }
 
             class OptionalGroup {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public id: string;
-                public static create(properties?: Object): jspb.test.TestGroup.OptionalGroup;
+                public static create(properties?: { [k: string]: any }): jspb.test.TestGroup.OptionalGroup;
                 public static encode(message: (jspb.test.TestGroup.OptionalGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.TestGroup.OptionalGroup|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.OptionalGroup;
@@ -417,9 +417,9 @@ export namespace jspb {
         }
 
         class TestGroup1 {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public group?: jspb.test.TestGroup.RepeatedGroup;
-            public static create(properties?: Object): jspb.test.TestGroup1;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestGroup1;
             public static encode(message: (jspb.test.TestGroup1|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestGroup1|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup1;
@@ -433,9 +433,9 @@ export namespace jspb {
         }
 
         class TestReservedNames {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public extension?: number;
-            public static create(properties?: Object): jspb.test.TestReservedNames;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestReservedNames;
             public static encode(message: (jspb.test.TestReservedNames|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestReservedNames|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestReservedNames;
@@ -449,8 +449,8 @@ export namespace jspb {
         }
 
         class TestReservedNamesExtension {
-            constructor(properties?: Object);
-            public static create(properties?: Object): jspb.test.TestReservedNamesExtension;
+            constructor(properties?: { [k: string]: any });
+            public static create(properties?: { [k: string]: any }): jspb.test.TestReservedNamesExtension;
             public static encode(message: (jspb.test.TestReservedNamesExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestReservedNamesExtension|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestReservedNamesExtension;
@@ -464,7 +464,7 @@ export namespace jspb {
         }
 
         class TestMessageWithOneof {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public pone?: string;
             public pthree?: string;
             public rone?: jspb.test.TestMessageWithOneof;
@@ -479,7 +479,7 @@ export namespace jspb {
             public recursiveOneof?: string;
             public defaultOneofA?: string;
             public defaultOneofB?: string;
-            public static create(properties?: Object): jspb.test.TestMessageWithOneof;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestMessageWithOneof;
             public static encode(message: (jspb.test.TestMessageWithOneof|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestMessageWithOneof|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestMessageWithOneof;
@@ -493,10 +493,10 @@ export namespace jspb {
         }
 
         class TestEndsWithBytes {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public value?: number;
             public data?: Uint8Array;
-            public static create(properties?: Object): jspb.test.TestEndsWithBytes;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestEndsWithBytes;
             public static encode(message: (jspb.test.TestEndsWithBytes|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestEndsWithBytes|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestEndsWithBytes;
@@ -510,7 +510,7 @@ export namespace jspb {
         }
 
         class TestMapFieldsNoBinary {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public mapStringString?: { [k: string]: string };
             public mapStringInt32?: { [k: string]: number };
             public mapStringInt64?: { [k: string]: (number|$protobuf.Long) };
@@ -523,7 +523,7 @@ export namespace jspb {
             public mapBoolString?: { [k: string]: string };
             public testMapFields?: jspb.test.TestMapFieldsNoBinary;
             public mapStringTestmapfields?: { [k: string]: jspb.test.TestMapFieldsNoBinary };
-            public static create(properties?: Object): jspb.test.TestMapFieldsNoBinary;
+            public static create(properties?: { [k: string]: any }): jspb.test.TestMapFieldsNoBinary;
             public static encode(message: (jspb.test.TestMapFieldsNoBinary|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.TestMapFieldsNoBinary|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestMapFieldsNoBinary;
@@ -543,9 +543,9 @@ export namespace jspb {
         }
 
         class MapValueMessageNoBinary {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public foo?: number;
-            public static create(properties?: Object): jspb.test.MapValueMessageNoBinary;
+            public static create(properties?: { [k: string]: any }): jspb.test.MapValueMessageNoBinary;
             public static encode(message: (jspb.test.MapValueMessageNoBinary|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.MapValueMessageNoBinary|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.MapValueMessageNoBinary;
@@ -559,8 +559,8 @@ export namespace jspb {
         }
 
         class Deeply {
-            constructor(properties?: Object);
-            public static create(properties?: Object): jspb.test.Deeply;
+            constructor(properties?: { [k: string]: any });
+            public static create(properties?: { [k: string]: any }): jspb.test.Deeply;
             public static encode(message: (jspb.test.Deeply|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (jspb.test.Deeply|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply;
@@ -576,8 +576,8 @@ export namespace jspb {
         namespace Deeply {
 
             class Nested {
-                constructor(properties?: Object);
-                public static create(properties?: Object): jspb.test.Deeply.Nested;
+                constructor(properties?: { [k: string]: any });
+                public static create(properties?: { [k: string]: any }): jspb.test.Deeply.Nested;
                 public static encode(message: (jspb.test.Deeply.Nested|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (jspb.test.Deeply.Nested|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply.Nested;
@@ -593,9 +593,9 @@ export namespace jspb {
             namespace Nested {
 
                 class Message {
-                    constructor(properties?: Object);
+                    constructor(properties?: { [k: string]: any });
                     public count?: number;
-                    public static create(properties?: Object): jspb.test.Deeply.Nested.Message;
+                    public static create(properties?: { [k: string]: any }): jspb.test.Deeply.Nested.Message;
                     public static encode(message: (jspb.test.Deeply.Nested.Message|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                     public static encodeDelimited(message: (jspb.test.Deeply.Nested.Message|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                     public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply.Nested.Message;
@@ -617,9 +617,9 @@ export namespace google {
     namespace protobuf {
 
         class FileDescriptorSet {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public file?: google.protobuf.FileDescriptorProto[];
-            public static create(properties?: Object): google.protobuf.FileDescriptorSet;
+            public static create(properties?: { [k: string]: any }): google.protobuf.FileDescriptorSet;
             public static encode(message: (google.protobuf.FileDescriptorSet|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.FileDescriptorSet|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet;
@@ -633,7 +633,7 @@ export namespace google {
         }
 
         class FileDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public package?: string;
             public dependency?: string[];
@@ -646,7 +646,7 @@ export namespace google {
             public options?: google.protobuf.FileOptions;
             public sourceCodeInfo?: google.protobuf.SourceCodeInfo;
             public syntax?: string;
-            public static create(properties?: Object): google.protobuf.FileDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.FileDescriptorProto;
             public static encode(message: (google.protobuf.FileDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.FileDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto;
@@ -660,7 +660,7 @@ export namespace google {
         }
 
         class DescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public field?: google.protobuf.FieldDescriptorProto[];
             public extension?: google.protobuf.FieldDescriptorProto[];
@@ -671,7 +671,7 @@ export namespace google {
             public options?: google.protobuf.MessageOptions;
             public reservedRange?: google.protobuf.DescriptorProto.ReservedRange[];
             public reservedName?: string[];
-            public static create(properties?: Object): google.protobuf.DescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.DescriptorProto;
             public static encode(message: (google.protobuf.DescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.DescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto;
@@ -687,10 +687,10 @@ export namespace google {
         namespace DescriptorProto {
 
             class ExtensionRange {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public start?: number;
                 public end?: number;
-                public static create(properties?: Object): google.protobuf.DescriptorProto.ExtensionRange;
+                public static create(properties?: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange;
                 public static encode(message: (google.protobuf.DescriptorProto.ExtensionRange|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (google.protobuf.DescriptorProto.ExtensionRange|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange;
@@ -704,10 +704,10 @@ export namespace google {
             }
 
             class ReservedRange {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public start?: number;
                 public end?: number;
-                public static create(properties?: Object): google.protobuf.DescriptorProto.ReservedRange;
+                public static create(properties?: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange;
                 public static encode(message: (google.protobuf.DescriptorProto.ReservedRange|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (google.protobuf.DescriptorProto.ReservedRange|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange;
@@ -722,7 +722,7 @@ export namespace google {
         }
 
         class FieldDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public number?: number;
             public label?: number;
@@ -733,7 +733,7 @@ export namespace google {
             public oneofIndex?: number;
             public jsonName?: string;
             public options?: google.protobuf.FieldOptions;
-            public static create(properties?: Object): google.protobuf.FieldDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.FieldDescriptorProto;
             public static encode(message: (google.protobuf.FieldDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.FieldDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto;
@@ -777,10 +777,10 @@ export namespace google {
         }
 
         class OneofDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public options?: google.protobuf.OneofOptions;
-            public static create(properties?: Object): google.protobuf.OneofDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.OneofDescriptorProto;
             public static encode(message: (google.protobuf.OneofDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.OneofDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto;
@@ -794,11 +794,11 @@ export namespace google {
         }
 
         class EnumDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public value?: google.protobuf.EnumValueDescriptorProto[];
             public options?: google.protobuf.EnumOptions;
-            public static create(properties?: Object): google.protobuf.EnumDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.EnumDescriptorProto;
             public static encode(message: (google.protobuf.EnumDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.EnumDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto;
@@ -812,11 +812,11 @@ export namespace google {
         }
 
         class EnumValueDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public number?: number;
             public options?: google.protobuf.EnumValueOptions;
-            public static create(properties?: Object): google.protobuf.EnumValueDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto;
             public static encode(message: (google.protobuf.EnumValueDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.EnumValueDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto;
@@ -830,11 +830,11 @@ export namespace google {
         }
 
         class ServiceDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public method?: google.protobuf.MethodDescriptorProto[];
             public options?: google.protobuf.ServiceOptions;
-            public static create(properties?: Object): google.protobuf.ServiceDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.ServiceDescriptorProto;
             public static encode(message: (google.protobuf.ServiceDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.ServiceDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto;
@@ -848,14 +848,14 @@ export namespace google {
         }
 
         class MethodDescriptorProto {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: string;
             public inputType?: string;
             public outputType?: string;
             public options?: google.protobuf.MethodOptions;
             public clientStreaming?: boolean;
             public serverStreaming?: boolean;
-            public static create(properties?: Object): google.protobuf.MethodDescriptorProto;
+            public static create(properties?: { [k: string]: any }): google.protobuf.MethodDescriptorProto;
             public static encode(message: (google.protobuf.MethodDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.MethodDescriptorProto|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto;
@@ -869,7 +869,7 @@ export namespace google {
         }
 
         class FileOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public javaPackage?: string;
             public javaOuterClassname?: string;
             public javaMultipleFiles?: boolean;
@@ -885,7 +885,7 @@ export namespace google {
             public objcClassPrefix?: string;
             public csharpNamespace?: string;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.FileOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.FileOptions;
             public static encode(message: (google.protobuf.FileOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.FileOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions;
@@ -908,13 +908,13 @@ export namespace google {
         }
 
         class MessageOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public messageSetWireFormat?: boolean;
             public noStandardDescriptorAccessor?: boolean;
             public deprecated?: boolean;
             public mapEntry?: boolean;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.MessageOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.MessageOptions;
             public static encode(message: (google.protobuf.MessageOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.MessageOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions;
@@ -928,7 +928,7 @@ export namespace google {
         }
 
         class FieldOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public ctype?: number;
             public packed?: boolean;
             public jstype?: number;
@@ -936,7 +936,7 @@ export namespace google {
             public deprecated?: boolean;
             public weak?: boolean;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.FieldOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.FieldOptions;
             public static encode(message: (google.protobuf.FieldOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.FieldOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions;
@@ -965,9 +965,9 @@ export namespace google {
         }
 
         class OneofOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.OneofOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.OneofOptions;
             public static encode(message: (google.protobuf.OneofOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.OneofOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions;
@@ -981,11 +981,11 @@ export namespace google {
         }
 
         class EnumOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public allowAlias?: boolean;
             public deprecated?: boolean;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.EnumOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.EnumOptions;
             public static encode(message: (google.protobuf.EnumOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.EnumOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions;
@@ -999,10 +999,10 @@ export namespace google {
         }
 
         class EnumValueOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public deprecated?: boolean;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.EnumValueOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.EnumValueOptions;
             public static encode(message: (google.protobuf.EnumValueOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.EnumValueOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions;
@@ -1016,10 +1016,10 @@ export namespace google {
         }
 
         class ServiceOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public deprecated?: boolean;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.ServiceOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.ServiceOptions;
             public static encode(message: (google.protobuf.ServiceOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.ServiceOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions;
@@ -1033,11 +1033,11 @@ export namespace google {
         }
 
         class MethodOptions {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public deprecated?: boolean;
             public idempotencyLevel?: number;
             public uninterpretedOption?: google.protobuf.UninterpretedOption[];
-            public static create(properties?: Object): google.protobuf.MethodOptions;
+            public static create(properties?: { [k: string]: any }): google.protobuf.MethodOptions;
             public static encode(message: (google.protobuf.MethodOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.MethodOptions|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions;
@@ -1060,7 +1060,7 @@ export namespace google {
         }
 
         class UninterpretedOption {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public name?: google.protobuf.UninterpretedOption.NamePart[];
             public identifierValue?: string;
             public positiveIntValue?: (number|$protobuf.Long);
@@ -1068,7 +1068,7 @@ export namespace google {
             public doubleValue?: number;
             public stringValue?: Uint8Array;
             public aggregateValue?: string;
-            public static create(properties?: Object): google.protobuf.UninterpretedOption;
+            public static create(properties?: { [k: string]: any }): google.protobuf.UninterpretedOption;
             public static encode(message: (google.protobuf.UninterpretedOption|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.UninterpretedOption|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption;
@@ -1084,10 +1084,10 @@ export namespace google {
         namespace UninterpretedOption {
 
             class NamePart {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public namePart: string;
                 public isExtension: boolean;
-                public static create(properties?: Object): google.protobuf.UninterpretedOption.NamePart;
+                public static create(properties?: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart;
                 public static encode(message: (google.protobuf.UninterpretedOption.NamePart|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (google.protobuf.UninterpretedOption.NamePart|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart;
@@ -1102,9 +1102,9 @@ export namespace google {
         }
 
         class SourceCodeInfo {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public location?: google.protobuf.SourceCodeInfo.Location[];
-            public static create(properties?: Object): google.protobuf.SourceCodeInfo;
+            public static create(properties?: { [k: string]: any }): google.protobuf.SourceCodeInfo;
             public static encode(message: (google.protobuf.SourceCodeInfo|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.SourceCodeInfo|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo;
@@ -1120,13 +1120,13 @@ export namespace google {
         namespace SourceCodeInfo {
 
             class Location {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public path?: number[];
                 public span?: number[];
                 public leadingComments?: string;
                 public trailingComments?: string;
                 public leadingDetachedComments?: string[];
-                public static create(properties?: Object): google.protobuf.SourceCodeInfo.Location;
+                public static create(properties?: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location;
                 public static encode(message: (google.protobuf.SourceCodeInfo.Location|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (google.protobuf.SourceCodeInfo.Location|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location;
@@ -1141,9 +1141,9 @@ export namespace google {
         }
 
         class GeneratedCodeInfo {
-            constructor(properties?: Object);
+            constructor(properties?: { [k: string]: any });
             public annotation?: google.protobuf.GeneratedCodeInfo.Annotation[];
-            public static create(properties?: Object): google.protobuf.GeneratedCodeInfo;
+            public static create(properties?: { [k: string]: any }): google.protobuf.GeneratedCodeInfo;
             public static encode(message: (google.protobuf.GeneratedCodeInfo|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static encodeDelimited(message: (google.protobuf.GeneratedCodeInfo|Object), writer?: $protobuf.Writer): $protobuf.Writer;
             public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo;
@@ -1159,12 +1159,12 @@ export namespace google {
         namespace GeneratedCodeInfo {
 
             class Annotation {
-                constructor(properties?: Object);
+                constructor(properties?: { [k: string]: any });
                 public path?: number[];
                 public sourceFile?: string;
                 public begin?: number;
                 public end?: number;
-                public static create(properties?: Object): google.protobuf.GeneratedCodeInfo.Annotation;
+                public static create(properties?: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation;
                 public static encode(message: (google.protobuf.GeneratedCodeInfo.Annotation|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static encodeDelimited(message: (google.protobuf.GeneratedCodeInfo.Annotation|Object), writer?: $protobuf.Writer): $protobuf.Writer;
                 public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation;
diff --git a/tests/data/test.js b/tests/data/test.js
index 1a4e4c8ac..2d1cef06a 100644
--- a/tests/data/test.js
+++ b/tests/data/test.js
@@ -36,7 +36,7 @@ $root.jspb = (function() {
              * Constructs a new Empty.
              * @exports jspb.test.Empty
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Empty(properties) {
                 if (properties)
@@ -46,7 +46,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Empty instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.Empty} Empty instance
              */
             Empty.create = function create(properties) {
@@ -193,7 +193,7 @@ $root.jspb = (function() {
              * Constructs a new EnumContainer.
              * @exports jspb.test.EnumContainer
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function EnumContainer(properties) {
                 if (properties)
@@ -214,7 +214,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new EnumContainer instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.EnumContainer} EnumContainer instance
              */
             EnumContainer.create = function create(properties) {
@@ -377,7 +377,7 @@ $root.jspb = (function() {
              * Constructs a new Simple1.
              * @exports jspb.test.Simple1
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Simple1(properties) {
                 if (properties)
@@ -405,7 +405,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Simple1 instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.Simple1} Simple1 instance
              */
             Simple1.create = function create(properties) {
@@ -598,7 +598,7 @@ $root.jspb = (function() {
              * Constructs a new Simple2.
              * @exports jspb.test.Simple2
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Simple2(properties) {
                 if (properties)
@@ -620,7 +620,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Simple2 instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.Simple2} Simple2 instance
              */
             Simple2.create = function create(properties) {
@@ -799,7 +799,7 @@ $root.jspb = (function() {
              * Constructs a new SpecialCases.
              * @exports jspb.test.SpecialCases
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function SpecialCases(properties) {
                 if (properties)
@@ -836,7 +836,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new SpecialCases instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.SpecialCases} SpecialCases instance
              */
             SpecialCases.create = function create(properties) {
@@ -1026,7 +1026,7 @@ $root.jspb = (function() {
              * Constructs a new OptionalFields.
              * @exports jspb.test.OptionalFields
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function OptionalFields(properties) {
                 if (properties)
@@ -1072,7 +1072,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new OptionalFields instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.OptionalFields} OptionalFields instance
              */
             OptionalFields.create = function create(properties) {
@@ -1314,7 +1314,7 @@ $root.jspb = (function() {
                  * Constructs a new Nested.
                  * @exports jspb.test.OptionalFields.Nested
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function Nested(properties) {
                     if (properties)
@@ -1330,7 +1330,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Nested instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.OptionalFields.Nested} Nested instance
                  */
                 Nested.create = function create(properties) {
@@ -1483,7 +1483,7 @@ $root.jspb = (function() {
              * Constructs a new HasExtensions.
              * @exports jspb.test.HasExtensions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function HasExtensions(properties) {
                 if (properties)
@@ -1561,7 +1561,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new HasExtensions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.HasExtensions} HasExtensions instance
              */
             HasExtensions.create = function create(properties) {
@@ -1868,7 +1868,7 @@ $root.jspb = (function() {
              * Constructs a new Complex.
              * @exports jspb.test.Complex
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Complex(properties) {
                 if (properties)
@@ -1914,7 +1914,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Complex instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.Complex} Complex instance
              */
             Complex.create = function create(properties) {
@@ -2156,7 +2156,7 @@ $root.jspb = (function() {
                  * Constructs a new Nested.
                  * @exports jspb.test.Complex.Nested
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function Nested(properties) {
                     if (properties)
@@ -2172,7 +2172,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Nested instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.Complex.Nested} Nested instance
                  */
                 Nested.create = function create(properties) {
@@ -2325,7 +2325,7 @@ $root.jspb = (function() {
              * Constructs a new OuterMessage.
              * @exports jspb.test.OuterMessage
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function OuterMessage(properties) {
                 if (properties)
@@ -2335,7 +2335,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new OuterMessage instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.OuterMessage} OuterMessage instance
              */
             OuterMessage.create = function create(properties) {
@@ -2464,7 +2464,7 @@ $root.jspb = (function() {
                  * Constructs a new Complex.
                  * @exports jspb.test.OuterMessage.Complex
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function Complex(properties) {
                     if (properties)
@@ -2480,7 +2480,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Complex instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.OuterMessage.Complex} Complex instance
                  */
                 Complex.create = function create(properties) {
@@ -2633,7 +2633,7 @@ $root.jspb = (function() {
              * Constructs a new IsExtension.
              * @exports jspb.test.IsExtension
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function IsExtension(properties) {
                 if (properties)
@@ -2649,7 +2649,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new IsExtension instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.IsExtension} IsExtension instance
              */
             IsExtension.create = function create(properties) {
@@ -2799,7 +2799,7 @@ $root.jspb = (function() {
              * Constructs a new IndirectExtension.
              * @exports jspb.test.IndirectExtension
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function IndirectExtension(properties) {
                 if (properties)
@@ -2809,7 +2809,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new IndirectExtension instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.IndirectExtension} IndirectExtension instance
              */
             IndirectExtension.create = function create(properties) {
@@ -2941,7 +2941,7 @@ $root.jspb = (function() {
              * Constructs a new DefaultValues.
              * @exports jspb.test.DefaultValues
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function DefaultValues(properties) {
                 if (properties)
@@ -2992,7 +2992,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new DefaultValues instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.DefaultValues} DefaultValues instance
              */
             DefaultValues.create = function create(properties) {
@@ -3257,7 +3257,7 @@ $root.jspb = (function() {
              * Constructs a new FloatingPointFields.
              * @exports jspb.test.FloatingPointFields
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function FloatingPointFields(properties) {
                 if (properties)
@@ -3315,7 +3315,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new FloatingPointFields instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.FloatingPointFields} FloatingPointFields instance
              */
             FloatingPointFields.create = function create(properties) {
@@ -3599,7 +3599,7 @@ $root.jspb = (function() {
              * Constructs a new TestClone.
              * @exports jspb.test.TestClone
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestClone(properties) {
                 if (properties)
@@ -3653,7 +3653,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestClone instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestClone} TestClone instance
              */
             TestClone.create = function create(properties) {
@@ -3903,7 +3903,7 @@ $root.jspb = (function() {
              * Constructs a new CloneExtension.
              * @exports jspb.test.CloneExtension
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function CloneExtension(properties) {
                 if (properties)
@@ -3919,7 +3919,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new CloneExtension instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.CloneExtension} CloneExtension instance
              */
             CloneExtension.create = function create(properties) {
@@ -4069,7 +4069,7 @@ $root.jspb = (function() {
              * Constructs a new TestGroup.
              * @exports jspb.test.TestGroup
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestGroup(properties) {
                 if (properties)
@@ -4124,7 +4124,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestGroup instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestGroup} TestGroup instance
              */
             TestGroup.create = function create(properties) {
@@ -4376,7 +4376,7 @@ $root.jspb = (function() {
                  * Constructs a new RepeatedGroup.
                  * @exports jspb.test.TestGroup.RepeatedGroup
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function RepeatedGroup(properties) {
                     if (properties)
@@ -4398,7 +4398,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new RepeatedGroup instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.TestGroup.RepeatedGroup} RepeatedGroup instance
                  */
                 RepeatedGroup.create = function create(properties) {
@@ -4584,7 +4584,7 @@ $root.jspb = (function() {
                  * Constructs a new RequiredGroup.
                  * @exports jspb.test.TestGroup.RequiredGroup
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function RequiredGroup(properties) {
                     if (properties)
@@ -4600,7 +4600,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new RequiredGroup instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.TestGroup.RequiredGroup} RequiredGroup instance
                  */
                 RequiredGroup.create = function create(properties) {
@@ -4752,7 +4752,7 @@ $root.jspb = (function() {
                  * Constructs a new OptionalGroup.
                  * @exports jspb.test.TestGroup.OptionalGroup
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function OptionalGroup(properties) {
                     if (properties)
@@ -4768,7 +4768,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new OptionalGroup instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.TestGroup.OptionalGroup} OptionalGroup instance
                  */
                 OptionalGroup.create = function create(properties) {
@@ -4923,7 +4923,7 @@ $root.jspb = (function() {
              * Constructs a new TestGroup1.
              * @exports jspb.test.TestGroup1
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestGroup1(properties) {
                 if (properties)
@@ -4944,7 +4944,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestGroup1 instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestGroup1} TestGroup1 instance
              */
             TestGroup1.create = function create(properties) {
@@ -5099,7 +5099,7 @@ $root.jspb = (function() {
              * Constructs a new TestReservedNames.
              * @exports jspb.test.TestReservedNames
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestReservedNames(properties) {
                 if (properties)
@@ -5122,7 +5122,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestReservedNames instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestReservedNames} TestReservedNames instance
              */
             TestReservedNames.create = function create(properties) {
@@ -5286,7 +5286,7 @@ $root.jspb = (function() {
              * Constructs a new TestReservedNamesExtension.
              * @exports jspb.test.TestReservedNamesExtension
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestReservedNamesExtension(properties) {
                 if (properties)
@@ -5296,7 +5296,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestReservedNamesExtension instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestReservedNamesExtension} TestReservedNamesExtension instance
              */
             TestReservedNamesExtension.create = function create(properties) {
@@ -5428,7 +5428,7 @@ $root.jspb = (function() {
              * Constructs a new TestMessageWithOneof.
              * @exports jspb.test.TestMessageWithOneof
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestMessageWithOneof(properties) {
                 if (properties)
@@ -5546,7 +5546,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestMessageWithOneof instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestMessageWithOneof} TestMessageWithOneof instance
              */
             TestMessageWithOneof.create = function create(properties) {
@@ -5562,43 +5562,27 @@ $root.jspb = (function() {
             TestMessageWithOneof.encode = function encode(message, writer) {
                 if (!writer)
                     writer = $Writer.create();
+                if (message.pone !== undefined && message.hasOwnProperty("pone"))
+                    writer.uint32(/* id 3, wireType 2 =*/26).string(message.pone);
+                if (message.pthree !== undefined && message.hasOwnProperty("pthree"))
+                    writer.uint32(/* id 5, wireType 2 =*/42).string(message.pthree);
+                if (message.rone && message.hasOwnProperty("rone"))
+                    $types[2].encode(message.rone, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim();
+                if (message.rtwo !== undefined && message.hasOwnProperty("rtwo"))
+                    writer.uint32(/* id 7, wireType 2 =*/58).string(message.rtwo);
                 if (message.normalField !== undefined && message.hasOwnProperty("normalField"))
                     writer.uint32(/* id 8, wireType 0 =*/64).bool(message.normalField);
                 if (message.repeatedField !== undefined && message.hasOwnProperty("repeatedField"))
                     for (var i = 0; i < message.repeatedField.length; ++i)
                         writer.uint32(/* id 9, wireType 2 =*/74).string(message.repeatedField[i]);
-                switch (message.partialOneof) {
-                case "pone":
-                    writer.uint32(/* id 3, wireType 2 =*/26).string(message.pone);
-                    break;
-                case "pthree":
-                    writer.uint32(/* id 5, wireType 2 =*/42).string(message.pthree);
-                    break;
-                }
-                switch (message.recursiveOneof) {
-                case "rone":
-                    $types[2].encode(message.rone, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim();
-                    break;
-                case "rtwo":
-                    writer.uint32(/* id 7, wireType 2 =*/58).string(message.rtwo);
-                    break;
-                }
-                switch (message.defaultOneofA) {
-                case "aone":
+                if (message.aone !== undefined && message.hasOwnProperty("aone"))
                     writer.uint32(/* id 10, wireType 0 =*/80).int32(message.aone);
-                    break;
-                case "atwo":
+                if (message.atwo !== undefined && message.hasOwnProperty("atwo"))
                     writer.uint32(/* id 11, wireType 0 =*/88).int32(message.atwo);
-                    break;
-                }
-                switch (message.defaultOneofB) {
-                case "bone":
+                if (message.bone !== undefined && message.hasOwnProperty("bone"))
                     writer.uint32(/* id 12, wireType 0 =*/96).int32(message.bone);
-                    break;
-                case "btwo":
+                if (message.btwo !== undefined && message.hasOwnProperty("btwo"))
                     writer.uint32(/* id 13, wireType 0 =*/104).int32(message.btwo);
-                    break;
-                }
                 return writer;
             };
 
@@ -5851,7 +5835,7 @@ $root.jspb = (function() {
              * Constructs a new TestEndsWithBytes.
              * @exports jspb.test.TestEndsWithBytes
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestEndsWithBytes(properties) {
                 if (properties)
@@ -5873,7 +5857,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestEndsWithBytes instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestEndsWithBytes} TestEndsWithBytes instance
              */
             TestEndsWithBytes.create = function create(properties) {
@@ -6040,7 +6024,7 @@ $root.jspb = (function() {
              * Constructs a new TestMapFieldsNoBinary.
              * @exports jspb.test.TestMapFieldsNoBinary
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function TestMapFieldsNoBinary(properties) {
                 if (properties)
@@ -6130,7 +6114,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new TestMapFieldsNoBinary instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.TestMapFieldsNoBinary} TestMapFieldsNoBinary instance
              */
             TestMapFieldsNoBinary.create = function create(properties) {
@@ -6708,7 +6692,7 @@ $root.jspb = (function() {
              * Constructs a new MapValueMessageNoBinary.
              * @exports jspb.test.MapValueMessageNoBinary
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function MapValueMessageNoBinary(properties) {
                 if (properties)
@@ -6724,7 +6708,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new MapValueMessageNoBinary instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.MapValueMessageNoBinary} MapValueMessageNoBinary instance
              */
             MapValueMessageNoBinary.create = function create(properties) {
@@ -6874,7 +6858,7 @@ $root.jspb = (function() {
              * Constructs a new Deeply.
              * @exports jspb.test.Deeply
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function Deeply(properties) {
                 if (properties)
@@ -6884,7 +6868,7 @@ $root.jspb = (function() {
 
             /**
              * Creates a new Deeply instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {jspb.test.Deeply} Deeply instance
              */
             Deeply.create = function create(properties) {
@@ -7013,7 +6997,7 @@ $root.jspb = (function() {
                  * Constructs a new Nested.
                  * @exports jspb.test.Deeply.Nested
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function Nested(properties) {
                     if (properties)
@@ -7023,7 +7007,7 @@ $root.jspb = (function() {
 
                 /**
                  * Creates a new Nested instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {jspb.test.Deeply.Nested} Nested instance
                  */
                 Nested.create = function create(properties) {
@@ -7152,7 +7136,7 @@ $root.jspb = (function() {
                      * Constructs a new Message.
                      * @exports jspb.test.Deeply.Nested.Message
                      * @constructor
-                     * @param {Object} [properties] Properties to set
+                     * @param {Object.<string,*>=} [properties] Properties to set
                      */
                     function Message(properties) {
                         if (properties)
@@ -7168,7 +7152,7 @@ $root.jspb = (function() {
 
                     /**
                      * Creates a new Message instance using the specified properties.
-                     * @param {Object} [properties] Properties to set
+                     * @param {Object.<string,*>=} [properties] Properties to set
                      * @returns {jspb.test.Deeply.Nested.Message} Message instance
                      */
                     Message.create = function create(properties) {
@@ -7348,7 +7332,7 @@ $root.google = (function() {
              * Constructs a new FileDescriptorSet.
              * @exports google.protobuf.FileDescriptorSet
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function FileDescriptorSet(properties) {
                 if (properties)
@@ -7369,7 +7353,7 @@ $root.google = (function() {
 
             /**
              * Creates a new FileDescriptorSet instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance
              */
             FileDescriptorSet.create = function create(properties) {
@@ -7539,7 +7523,7 @@ $root.google = (function() {
              * Constructs a new FileDescriptorProto.
              * @exports google.protobuf.FileDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function FileDescriptorProto(properties) {
                 if (properties)
@@ -7632,7 +7616,7 @@ $root.google = (function() {
 
             /**
              * Creates a new FileDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance
              */
             FileDescriptorProto.create = function create(properties) {
@@ -8073,7 +8057,7 @@ $root.google = (function() {
              * Constructs a new DescriptorProto.
              * @exports google.protobuf.DescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function DescriptorProto(properties) {
                 if (properties)
@@ -8155,7 +8139,7 @@ $root.google = (function() {
 
             /**
              * Creates a new DescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.DescriptorProto} DescriptorProto instance
              */
             DescriptorProto.create = function create(properties) {
@@ -8582,7 +8566,7 @@ $root.google = (function() {
                  * Constructs a new ExtensionRange.
                  * @exports google.protobuf.DescriptorProto.ExtensionRange
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function ExtensionRange(properties) {
                     if (properties)
@@ -8604,7 +8588,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new ExtensionRange instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance
                  */
                 ExtensionRange.create = function create(properties) {
@@ -8768,7 +8752,7 @@ $root.google = (function() {
                  * Constructs a new ReservedRange.
                  * @exports google.protobuf.DescriptorProto.ReservedRange
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function ReservedRange(properties) {
                     if (properties)
@@ -8790,7 +8774,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new ReservedRange instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance
                  */
                 ReservedRange.create = function create(properties) {
@@ -8957,7 +8941,7 @@ $root.google = (function() {
              * Constructs a new FieldDescriptorProto.
              * @exports google.protobuf.FieldDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function FieldDescriptorProto(properties) {
                 if (properties)
@@ -9034,7 +9018,7 @@ $root.google = (function() {
 
             /**
              * Creates a new FieldDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance
              */
             FieldDescriptorProto.create = function create(properties) {
@@ -9482,7 +9466,7 @@ $root.google = (function() {
              * Constructs a new OneofDescriptorProto.
              * @exports google.protobuf.OneofDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function OneofDescriptorProto(properties) {
                 if (properties)
@@ -9509,7 +9493,7 @@ $root.google = (function() {
 
             /**
              * Creates a new OneofDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance
              */
             OneofDescriptorProto.create = function create(properties) {
@@ -9678,7 +9662,7 @@ $root.google = (function() {
              * Constructs a new EnumDescriptorProto.
              * @exports google.protobuf.EnumDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function EnumDescriptorProto(properties) {
                 if (properties)
@@ -9712,7 +9696,7 @@ $root.google = (function() {
 
             /**
              * Creates a new EnumDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance
              */
             EnumDescriptorProto.create = function create(properties) {
@@ -9915,7 +9899,7 @@ $root.google = (function() {
              * Constructs a new EnumValueDescriptorProto.
              * @exports google.protobuf.EnumValueDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function EnumValueDescriptorProto(properties) {
                 if (properties)
@@ -9948,7 +9932,7 @@ $root.google = (function() {
 
             /**
              * Creates a new EnumValueDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance
              */
             EnumValueDescriptorProto.create = function create(properties) {
@@ -10130,7 +10114,7 @@ $root.google = (function() {
              * Constructs a new ServiceDescriptorProto.
              * @exports google.protobuf.ServiceDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function ServiceDescriptorProto(properties) {
                 if (properties)
@@ -10164,7 +10148,7 @@ $root.google = (function() {
 
             /**
              * Creates a new ServiceDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance
              */
             ServiceDescriptorProto.create = function create(properties) {
@@ -10367,7 +10351,7 @@ $root.google = (function() {
              * Constructs a new MethodDescriptorProto.
              * @exports google.protobuf.MethodDescriptorProto
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function MethodDescriptorProto(properties) {
                 if (properties)
@@ -10418,7 +10402,7 @@ $root.google = (function() {
 
             /**
              * Creates a new MethodDescriptorProto instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance
              */
             MethodDescriptorProto.create = function create(properties) {
@@ -10639,7 +10623,7 @@ $root.google = (function() {
              * Constructs a new FileOptions.
              * @exports google.protobuf.FileOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function FileOptions(properties) {
                 if (properties)
@@ -10745,7 +10729,7 @@ $root.google = (function() {
 
             /**
              * Creates a new FileOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.FileOptions} FileOptions instance
              */
             FileOptions.create = function create(properties) {
@@ -11134,7 +11118,7 @@ $root.google = (function() {
              * Constructs a new MessageOptions.
              * @exports google.protobuf.MessageOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function MessageOptions(properties) {
                 if (properties)
@@ -11179,7 +11163,7 @@ $root.google = (function() {
 
             /**
              * Creates a new MessageOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.MessageOptions} MessageOptions instance
              */
             MessageOptions.create = function create(properties) {
@@ -11403,7 +11387,7 @@ $root.google = (function() {
              * Constructs a new FieldOptions.
              * @exports google.protobuf.FieldOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function FieldOptions(properties) {
                 if (properties)
@@ -11462,7 +11446,7 @@ $root.google = (function() {
 
             /**
              * Creates a new FieldOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.FieldOptions} FieldOptions instance
              */
             FieldOptions.create = function create(properties) {
@@ -11782,7 +11766,7 @@ $root.google = (function() {
              * Constructs a new OneofOptions.
              * @exports google.protobuf.OneofOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function OneofOptions(properties) {
                 if (properties)
@@ -11803,7 +11787,7 @@ $root.google = (function() {
 
             /**
              * Creates a new OneofOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.OneofOptions} OneofOptions instance
              */
             OneofOptions.create = function create(properties) {
@@ -11973,7 +11957,7 @@ $root.google = (function() {
              * Constructs a new EnumOptions.
              * @exports google.protobuf.EnumOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function EnumOptions(properties) {
                 if (properties)
@@ -12013,7 +11997,7 @@ $root.google = (function() {
 
             /**
              * Creates a new EnumOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.EnumOptions} EnumOptions instance
              */
             EnumOptions.create = function create(properties) {
@@ -12224,7 +12208,7 @@ $root.google = (function() {
              * Constructs a new EnumValueOptions.
              * @exports google.protobuf.EnumValueOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function EnumValueOptions(properties) {
                 if (properties)
@@ -12251,7 +12235,7 @@ $root.google = (function() {
 
             /**
              * Creates a new EnumValueOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance
              */
             EnumValueOptions.create = function create(properties) {
@@ -12435,7 +12419,7 @@ $root.google = (function() {
              * Constructs a new ServiceOptions.
              * @exports google.protobuf.ServiceOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function ServiceOptions(properties) {
                 if (properties)
@@ -12462,7 +12446,7 @@ $root.google = (function() {
 
             /**
              * Creates a new ServiceOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.ServiceOptions} ServiceOptions instance
              */
             ServiceOptions.create = function create(properties) {
@@ -12646,7 +12630,7 @@ $root.google = (function() {
              * Constructs a new MethodOptions.
              * @exports google.protobuf.MethodOptions
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function MethodOptions(properties) {
                 if (properties)
@@ -12680,7 +12664,7 @@ $root.google = (function() {
 
             /**
              * Creates a new MethodOptions instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.MethodOptions} MethodOptions instance
              */
             MethodOptions.create = function create(properties) {
@@ -12913,7 +12897,7 @@ $root.google = (function() {
              * Constructs a new UninterpretedOption.
              * @exports google.protobuf.UninterpretedOption
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function UninterpretedOption(properties) {
                 if (properties)
@@ -12970,7 +12954,7 @@ $root.google = (function() {
 
             /**
              * Creates a new UninterpretedOption instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance
              */
             UninterpretedOption.create = function create(properties) {
@@ -13248,7 +13232,7 @@ $root.google = (function() {
                  * Constructs a new NamePart.
                  * @exports google.protobuf.UninterpretedOption.NamePart
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function NamePart(properties) {
                     if (properties)
@@ -13270,7 +13254,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new NamePart instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance
                  */
                 NamePart.create = function create(properties) {
@@ -13437,7 +13421,7 @@ $root.google = (function() {
              * Constructs a new SourceCodeInfo.
              * @exports google.protobuf.SourceCodeInfo
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function SourceCodeInfo(properties) {
                 if (properties)
@@ -13458,7 +13442,7 @@ $root.google = (function() {
 
             /**
              * Creates a new SourceCodeInfo instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance
              */
             SourceCodeInfo.create = function create(properties) {
@@ -13625,7 +13609,7 @@ $root.google = (function() {
                  * Constructs a new Location.
                  * @exports google.protobuf.SourceCodeInfo.Location
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function Location(properties) {
                     if (properties)
@@ -13665,7 +13649,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new Location instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {google.protobuf.SourceCodeInfo.Location} Location instance
                  */
                 Location.create = function create(properties) {
@@ -13934,7 +13918,7 @@ $root.google = (function() {
              * Constructs a new GeneratedCodeInfo.
              * @exports google.protobuf.GeneratedCodeInfo
              * @constructor
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              */
             function GeneratedCodeInfo(properties) {
                 if (properties)
@@ -13955,7 +13939,7 @@ $root.google = (function() {
 
             /**
              * Creates a new GeneratedCodeInfo instance using the specified properties.
-             * @param {Object} [properties] Properties to set
+             * @param {Object.<string,*>=} [properties] Properties to set
              * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance
              */
             GeneratedCodeInfo.create = function create(properties) {
@@ -14122,7 +14106,7 @@ $root.google = (function() {
                  * Constructs a new Annotation.
                  * @exports google.protobuf.GeneratedCodeInfo.Annotation
                  * @constructor
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  */
                 function Annotation(properties) {
                     if (properties)
@@ -14156,7 +14140,7 @@ $root.google = (function() {
 
                 /**
                  * Creates a new Annotation instance using the specified properties.
-                 * @param {Object} [properties] Properties to set
+                 * @param {Object.<string,*>=} [properties] Properties to set
                  * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance
                  */
                 Annotation.create = function create(properties) {