diff --git a/bench/data/static_pbjs.js b/bench/data/static_pbjs.js
index 8eb587c94..4f28cc258 100644
--- a/bench/data/static_pbjs.js
+++ b/bench/data/static_pbjs.js
@@ -3,30 +3,12 @@
 
 var $protobuf = require("../../minimal");
 
-// Common aliases
 var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
 
-// Exported root namespace
 var $root = $protobuf.roots.test_bench || ($protobuf.roots.test_bench = {});
 
 $root.Test = (function() {
 
-    /**
-     * Properties of a Test.
-     * @typedef Test$Properties
-     * @type {Object}
-     * @property {string} [string] Test string.
-     * @property {number} [uint32] Test uint32.
-     * @property {Test.Inner$Properties} [inner] Test inner.
-     * @property {number} [float] Test float.
-     */
-
-    /**
-     * Constructs a new Test.
-     * @exports Test
-     * @constructor
-     * @param {Test$Properties=} [properties] Properties to set
-     */
     function Test(properties) {
         if (properties)
             for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
@@ -34,77 +16,25 @@ $root.Test = (function() {
                     this[keys[i]] = properties[keys[i]];
     }
 
-    /**
-     * Test string.
-     * @type {string}
-     */
     Test.prototype.string = "";
-
-    /**
-     * Test uint32.
-     * @type {number}
-     */
     Test.prototype.uint32 = 0;
-
-    /**
-     * Test inner.
-     * @type {(Test.Inner$Properties|null)}
-     */
     Test.prototype.inner = null;
-
-    /**
-     * Test float.
-     * @type {number}
-     */
     Test.prototype.float = 0;
 
-    /**
-     * Creates a new Test instance using the specified properties.
-     * @param {Test$Properties=} [properties] Properties to set
-     * @returns {Test} Test instance
-     */
-    Test.create = function create(properties) {
-        return new Test(properties);
-    };
-
-    /**
-     * Encodes the specified Test message. Does not implicitly {@link Test.verify|verify} messages.
-     * @param {Test$Properties} message Test message or plain object to encode
-     * @param {$protobuf.Writer} [writer] Writer to encode to
-     * @returns {$protobuf.Writer} Writer
-     */
     Test.encode = function encode(message, writer) {
         if (!writer)
             writer = $Writer.create();
         if (message.string != null && message.hasOwnProperty("string"))
-            writer.uint32(/* id 1, wireType 2 =*/10).string(message.string);
+            writer.uint32(10).string(message.string);
         if (message.uint32 != null && message.hasOwnProperty("uint32"))
-            writer.uint32(/* id 2, wireType 0 =*/16).uint32(message.uint32);
+            writer.uint32(16).uint32(message.uint32);
         if (message.inner != null && message.hasOwnProperty("inner"))
-            $root.Test.Inner.encode(message.inner, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+            $root.Test.Inner.encode(message.inner, writer.uint32(26).fork()).ldelim();
         if (message.float != null && message.hasOwnProperty("float"))
-            writer.uint32(/* id 4, wireType 5 =*/37).float(message.float);
+            writer.uint32(37).float(message.float);
         return writer;
     };
 
-    /**
-     * Encodes the specified Test message, length delimited. Does not implicitly {@link Test.verify|verify} messages.
-     * @param {Test$Properties} message Test message or plain object to encode
-     * @param {$protobuf.Writer} [writer] Writer to encode to
-     * @returns {$protobuf.Writer} Writer
-     */
-    Test.encodeDelimited = function encodeDelimited(message, writer) {
-        return this.encode(message, writer).ldelim();
-    };
-
-    /**
-     * Decodes a Test message from the specified reader or buffer.
-     * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-     * @param {number} [length] Message length if known beforehand
-     * @returns {Test} Test
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
     Test.decode = function decode(reader, length) {
         if (!(reader instanceof $Reader))
             reader = $Reader.create(reader);
@@ -132,137 +62,8 @@ $root.Test = (function() {
         return message;
     };
 
-    /**
-     * Decodes a Test message from the specified reader or buffer, length delimited.
-     * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-     * @returns {Test} Test
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
-    Test.decodeDelimited = function decodeDelimited(reader) {
-        if (!(reader instanceof $Reader))
-            reader = $Reader(reader);
-        return this.decode(reader, reader.uint32());
-    };
-
-    /**
-     * Verifies a Test message.
-     * @param {Object.<string,*>} message Plain object to verify
-     * @returns {?string} `null` if valid, otherwise the reason why it is not
-     */
-    Test.verify = function verify(message) {
-        if (typeof message !== "object" || message === null)
-            return "object expected";
-        if (message.string != null && message.hasOwnProperty("string"))
-            if (!$util.isString(message.string))
-                return "string: string expected";
-        if (message.uint32 != null && message.hasOwnProperty("uint32"))
-            if (!$util.isInteger(message.uint32))
-                return "uint32: integer expected";
-        if (message.inner != null && message.hasOwnProperty("inner")) {
-            var error = $root.Test.Inner.verify(message.inner);
-            if (error)
-                return "inner." + error;
-        }
-        if (message.float != null && message.hasOwnProperty("float"))
-            if (typeof message.float !== "number")
-                return "float: number expected";
-        return null;
-    };
-
-    /**
-     * Creates a Test message from a plain object. Also converts values to their respective internal types.
-     * @param {Object.<string,*>} object Plain object
-     * @returns {Test} Test
-     */
-    Test.fromObject = function fromObject(object) {
-        if (object instanceof $root.Test)
-            return object;
-        var message = new $root.Test();
-        if (object.string != null)
-            message.string = String(object.string);
-        if (object.uint32 != null)
-            message.uint32 = object.uint32 >>> 0;
-        if (object.inner != null) {
-            if (typeof object.inner !== "object")
-                throw TypeError(".Test.inner: object expected");
-            message.inner = $root.Test.Inner.fromObject(object.inner);
-        }
-        if (object.float != null)
-            message.float = Number(object.float);
-        return message;
-    };
-
-    /**
-     * Creates a Test message from a plain object. Also converts values to their respective internal types.
-     * This is an alias of {@link Test.fromObject}.
-     * @function
-     * @param {Object.<string,*>} object Plain object
-     * @returns {Test} Test
-     */
-    Test.from = Test.fromObject;
-
-    /**
-     * Creates a plain object from a Test message. Also converts values to other types if specified.
-     * @param {Test} message Test
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
-     * @returns {Object.<string,*>} Plain object
-     */
-    Test.toObject = function toObject(message, options) {
-        if (!options)
-            options = {};
-        var object = {};
-        if (options.defaults) {
-            object.string = "";
-            object.uint32 = 0;
-            object.inner = null;
-            object.float = 0;
-        }
-        if (message.string != null && message.hasOwnProperty("string"))
-            object.string = message.string;
-        if (message.uint32 != null && message.hasOwnProperty("uint32"))
-            object.uint32 = message.uint32;
-        if (message.inner != null && message.hasOwnProperty("inner"))
-            object.inner = $root.Test.Inner.toObject(message.inner, options);
-        if (message.float != null && message.hasOwnProperty("float"))
-            object.float = message.float;
-        return object;
-    };
-
-    /**
-     * Creates a plain object from this Test message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
-     * @returns {Object.<string,*>} Plain object
-     */
-    Test.prototype.toObject = function toObject(options) {
-        return this.constructor.toObject(this, options);
-    };
-
-    /**
-     * Converts this Test to JSON.
-     * @returns {Object.<string,*>} JSON object
-     */
-    Test.prototype.toJSON = function toJSON() {
-        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-    };
-
     Test.Inner = (function() {
 
-        /**
-         * Properties of an Inner.
-         * @typedef Test.Inner$Properties
-         * @type {Object}
-         * @property {number} [int32] Inner int32.
-         * @property {Test.Inner.InnerInner$Properties} [innerInner] Inner innerInner.
-         * @property {Outer$Properties} [outer] Inner outer.
-         */
-
-        /**
-         * Constructs a new Inner.
-         * @exports Test.Inner
-         * @constructor
-         * @param {Test.Inner$Properties=} [properties] Properties to set
-         */
         function Inner(properties) {
             if (properties)
                 for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
@@ -270,69 +71,22 @@ $root.Test = (function() {
                         this[keys[i]] = properties[keys[i]];
         }
 
-        /**
-         * Inner int32.
-         * @type {number}
-         */
         Inner.prototype.int32 = 0;
-
-        /**
-         * Inner innerInner.
-         * @type {(Test.Inner.InnerInner$Properties|null)}
-         */
         Inner.prototype.innerInner = null;
-
-        /**
-         * Inner outer.
-         * @type {(Outer$Properties|null)}
-         */
         Inner.prototype.outer = null;
 
-        /**
-         * Creates a new Inner instance using the specified properties.
-         * @param {Test.Inner$Properties=} [properties] Properties to set
-         * @returns {Test.Inner} Inner instance
-         */
-        Inner.create = function create(properties) {
-            return new Inner(properties);
-        };
-
-        /**
-         * Encodes the specified Inner message. Does not implicitly {@link Test.Inner.verify|verify} messages.
-         * @param {Test.Inner$Properties} message Inner message or plain object to encode
-         * @param {$protobuf.Writer} [writer] Writer to encode to
-         * @returns {$protobuf.Writer} Writer
-         */
         Inner.encode = function encode(message, writer) {
             if (!writer)
                 writer = $Writer.create();
             if (message.int32 != null && message.hasOwnProperty("int32"))
-                writer.uint32(/* id 1, wireType 0 =*/8).int32(message.int32);
+                writer.uint32(8).int32(message.int32);
             if (message.innerInner != null && message.hasOwnProperty("innerInner"))
-                $root.Test.Inner.InnerInner.encode(message.innerInner, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
+                $root.Test.Inner.InnerInner.encode(message.innerInner, writer.uint32(18).fork()).ldelim();
             if (message.outer != null && message.hasOwnProperty("outer"))
-                $root.Outer.encode(message.outer, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+                $root.Outer.encode(message.outer, writer.uint32(26).fork()).ldelim();
             return writer;
         };
 
-        /**
-         * Encodes the specified Inner message, length delimited. Does not implicitly {@link Test.Inner.verify|verify} messages.
-         * @param {Test.Inner$Properties} message Inner message or plain object to encode
-         * @param {$protobuf.Writer} [writer] Writer to encode to
-         * @returns {$protobuf.Writer} Writer
-         */
-        Inner.encodeDelimited = function encodeDelimited(message, writer) {
-            return this.encode(message, writer).ldelim();
-        };
-
-        /**
-         * Decodes an Inner message from the specified reader or buffer.
-         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-         * @param {number} [length] Message length if known beforehand
-         * @returns {Test.Inner} Inner
-         * @throws {Error} If the payload is not a reader or valid buffer
-         * @throws {$protobuf.util.ProtocolError} If required fields are missing
-         */
         Inner.decode = function decode(reader, length) {
             if (!(reader instanceof $Reader))
                 reader = $Reader.create(reader);
@@ -357,134 +111,8 @@ $root.Test = (function() {
             return message;
         };
 
-        /**
-         * Decodes an Inner message from the specified reader or buffer, length delimited.
-         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-         * @returns {Test.Inner} Inner
-         * @throws {Error} If the payload is not a reader or valid buffer
-         * @throws {$protobuf.util.ProtocolError} If required fields are missing
-         */
-        Inner.decodeDelimited = function decodeDelimited(reader) {
-            if (!(reader instanceof $Reader))
-                reader = $Reader(reader);
-            return this.decode(reader, reader.uint32());
-        };
-
-        /**
-         * Verifies an Inner message.
-         * @param {Object.<string,*>} message Plain object to verify
-         * @returns {?string} `null` if valid, otherwise the reason why it is not
-         */
-        Inner.verify = function verify(message) {
-            if (typeof message !== "object" || message === null)
-                return "object expected";
-            if (message.int32 != null && message.hasOwnProperty("int32"))
-                if (!$util.isInteger(message.int32))
-                    return "int32: integer expected";
-            if (message.innerInner != null && message.hasOwnProperty("innerInner")) {
-                var error = $root.Test.Inner.InnerInner.verify(message.innerInner);
-                if (error)
-                    return "innerInner." + error;
-            }
-            if (message.outer != null && message.hasOwnProperty("outer")) {
-                var error = $root.Outer.verify(message.outer);
-                if (error)
-                    return "outer." + error;
-            }
-            return null;
-        };
-
-        /**
-         * Creates an Inner message from a plain object. Also converts values to their respective internal types.
-         * @param {Object.<string,*>} object Plain object
-         * @returns {Test.Inner} Inner
-         */
-        Inner.fromObject = function fromObject(object) {
-            if (object instanceof $root.Test.Inner)
-                return object;
-            var message = new $root.Test.Inner();
-            if (object.int32 != null)
-                message.int32 = object.int32 | 0;
-            if (object.innerInner != null) {
-                if (typeof object.innerInner !== "object")
-                    throw TypeError(".Test.Inner.innerInner: object expected");
-                message.innerInner = $root.Test.Inner.InnerInner.fromObject(object.innerInner);
-            }
-            if (object.outer != null) {
-                if (typeof object.outer !== "object")
-                    throw TypeError(".Test.Inner.outer: object expected");
-                message.outer = $root.Outer.fromObject(object.outer);
-            }
-            return message;
-        };
-
-        /**
-         * Creates an Inner message from a plain object. Also converts values to their respective internal types.
-         * This is an alias of {@link Test.Inner.fromObject}.
-         * @function
-         * @param {Object.<string,*>} object Plain object
-         * @returns {Test.Inner} Inner
-         */
-        Inner.from = Inner.fromObject;
-
-        /**
-         * Creates a plain object from an Inner message. Also converts values to other types if specified.
-         * @param {Test.Inner} message Inner
-         * @param {$protobuf.ConversionOptions} [options] Conversion options
-         * @returns {Object.<string,*>} Plain object
-         */
-        Inner.toObject = function toObject(message, options) {
-            if (!options)
-                options = {};
-            var object = {};
-            if (options.defaults) {
-                object.int32 = 0;
-                object.innerInner = null;
-                object.outer = null;
-            }
-            if (message.int32 != null && message.hasOwnProperty("int32"))
-                object.int32 = message.int32;
-            if (message.innerInner != null && message.hasOwnProperty("innerInner"))
-                object.innerInner = $root.Test.Inner.InnerInner.toObject(message.innerInner, options);
-            if (message.outer != null && message.hasOwnProperty("outer"))
-                object.outer = $root.Outer.toObject(message.outer, options);
-            return object;
-        };
-
-        /**
-         * Creates a plain object from this Inner message. Also converts values to other types if specified.
-         * @param {$protobuf.ConversionOptions} [options] Conversion options
-         * @returns {Object.<string,*>} Plain object
-         */
-        Inner.prototype.toObject = function toObject(options) {
-            return this.constructor.toObject(this, options);
-        };
-
-        /**
-         * Converts this Inner to JSON.
-         * @returns {Object.<string,*>} JSON object
-         */
-        Inner.prototype.toJSON = function toJSON() {
-            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-        };
-
         Inner.InnerInner = (function() {
 
-            /**
-             * Properties of an InnerInner.
-             * @typedef Test.Inner.InnerInner$Properties
-             * @type {Object}
-             * @property {number|Long} [long] InnerInner long.
-             * @property {Test.Enum} ["enum"] InnerInner enum.
-             * @property {number} [sint32] InnerInner sint32.
-             */
-
-            /**
-             * Constructs a new InnerInner.
-             * @exports Test.Inner.InnerInner
-             * @constructor
-             * @param {Test.Inner.InnerInner$Properties=} [properties] Properties to set
-             */
             function InnerInner(properties) {
                 if (properties)
                     for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
@@ -492,69 +120,22 @@ $root.Test = (function() {
                             this[keys[i]] = properties[keys[i]];
             }
 
-            /**
-             * InnerInner long.
-             * @type {number|Long}
-             */
             InnerInner.prototype.long = $util.Long ? $util.Long.fromBits(0,0,false) : 0;
-
-            /**
-             * InnerInner enum.
-             * @type {Test.Enum}
-             */
             InnerInner.prototype["enum"] = 0;
-
-            /**
-             * InnerInner sint32.
-             * @type {number}
-             */
             InnerInner.prototype.sint32 = 0;
 
-            /**
-             * Creates a new InnerInner instance using the specified properties.
-             * @param {Test.Inner.InnerInner$Properties=} [properties] Properties to set
-             * @returns {Test.Inner.InnerInner} InnerInner instance
-             */
-            InnerInner.create = function create(properties) {
-                return new InnerInner(properties);
-            };
-
-            /**
-             * Encodes the specified InnerInner message. Does not implicitly {@link Test.Inner.InnerInner.verify|verify} messages.
-             * @param {Test.Inner.InnerInner$Properties} message InnerInner message or plain object to encode
-             * @param {$protobuf.Writer} [writer] Writer to encode to
-             * @returns {$protobuf.Writer} Writer
-             */
             InnerInner.encode = function encode(message, writer) {
                 if (!writer)
                     writer = $Writer.create();
                 if (message.long != null && message.hasOwnProperty("long"))
-                    writer.uint32(/* id 1, wireType 0 =*/8).int64(message.long);
+                    writer.uint32(8).int64(message.long);
                 if (message["enum"] != null && message.hasOwnProperty("enum"))
-                    writer.uint32(/* id 2, wireType 0 =*/16).uint32(message["enum"]);
+                    writer.uint32(16).uint32(message["enum"]);
                 if (message.sint32 != null && message.hasOwnProperty("sint32"))
-                    writer.uint32(/* id 3, wireType 0 =*/24).sint32(message.sint32);
+                    writer.uint32(24).sint32(message.sint32);
                 return writer;
             };
 
-            /**
-             * Encodes the specified InnerInner message, length delimited. Does not implicitly {@link Test.Inner.InnerInner.verify|verify} messages.
-             * @param {Test.Inner.InnerInner$Properties} message InnerInner message or plain object to encode
-             * @param {$protobuf.Writer} [writer] Writer to encode to
-             * @returns {$protobuf.Writer} Writer
-             */
-            InnerInner.encodeDelimited = function encodeDelimited(message, writer) {
-                return this.encode(message, writer).ldelim();
-            };
-
-            /**
-             * Decodes an InnerInner message from the specified reader or buffer.
-             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-             * @param {number} [length] Message length if known beforehand
-             * @returns {Test.Inner.InnerInner} InnerInner
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
             InnerInner.decode = function decode(reader, length) {
                 if (!(reader instanceof $Reader))
                     reader = $Reader.create(reader);
@@ -579,166 +160,12 @@ $root.Test = (function() {
                 return message;
             };
 
-            /**
-             * Decodes an InnerInner message from the specified reader or buffer, length delimited.
-             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-             * @returns {Test.Inner.InnerInner} InnerInner
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
-            InnerInner.decodeDelimited = function decodeDelimited(reader) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader(reader);
-                return this.decode(reader, reader.uint32());
-            };
-
-            /**
-             * Verifies an InnerInner message.
-             * @param {Object.<string,*>} message Plain object to verify
-             * @returns {?string} `null` if valid, otherwise the reason why it is not
-             */
-            InnerInner.verify = function verify(message) {
-                if (typeof message !== "object" || message === null)
-                    return "object expected";
-                if (message.long != null && message.hasOwnProperty("long"))
-                    if (!$util.isInteger(message.long) && !(message.long && $util.isInteger(message.long.low) && $util.isInteger(message.long.high)))
-                        return "long: integer|Long expected";
-                if (message["enum"] != null && message.hasOwnProperty("enum"))
-                    switch (message["enum"]) {
-                    default:
-                        return "enum: enum value expected";
-                    case 0:
-                    case 1:
-                    case 2:
-                    case 3:
-                    case 4:
-                        break;
-                    }
-                if (message.sint32 != null && message.hasOwnProperty("sint32"))
-                    if (!$util.isInteger(message.sint32))
-                        return "sint32: integer expected";
-                return null;
-            };
-
-            /**
-             * Creates an InnerInner message from a plain object. Also converts values to their respective internal types.
-             * @param {Object.<string,*>} object Plain object
-             * @returns {Test.Inner.InnerInner} InnerInner
-             */
-            InnerInner.fromObject = function fromObject(object) {
-                if (object instanceof $root.Test.Inner.InnerInner)
-                    return object;
-                var message = new $root.Test.Inner.InnerInner();
-                if (object.long != null)
-                    if ($util.Long)
-                        (message.long = $util.Long.fromValue(object.long)).unsigned = false;
-                    else if (typeof object.long === "string")
-                        message.long = parseInt(object.long, 10);
-                    else if (typeof object.long === "number")
-                        message.long = object.long;
-                    else if (typeof object.long === "object")
-                        message.long = new $util.LongBits(object.long.low >>> 0, object.long.high >>> 0).toNumber();
-                switch (object["enum"]) {
-                case "ONE":
-                case 0:
-                    message["enum"] = 0;
-                    break;
-                case "TWO":
-                case 1:
-                    message["enum"] = 1;
-                    break;
-                case "THREE":
-                case 2:
-                    message["enum"] = 2;
-                    break;
-                case "FOUR":
-                case 3:
-                    message["enum"] = 3;
-                    break;
-                case "FIVE":
-                case 4:
-                    message["enum"] = 4;
-                    break;
-                }
-                if (object.sint32 != null)
-                    message.sint32 = object.sint32 | 0;
-                return message;
-            };
-
-            /**
-             * Creates an InnerInner message from a plain object. Also converts values to their respective internal types.
-             * This is an alias of {@link Test.Inner.InnerInner.fromObject}.
-             * @function
-             * @param {Object.<string,*>} object Plain object
-             * @returns {Test.Inner.InnerInner} InnerInner
-             */
-            InnerInner.from = InnerInner.fromObject;
-
-            /**
-             * Creates a plain object from an InnerInner message. Also converts values to other types if specified.
-             * @param {Test.Inner.InnerInner} message InnerInner
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
-             * @returns {Object.<string,*>} Plain object
-             */
-            InnerInner.toObject = function toObject(message, options) {
-                if (!options)
-                    options = {};
-                var object = {};
-                if (options.defaults) {
-                    if ($util.Long) {
-                        var long = new $util.Long(0, 0, false);
-                        object.long = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
-                    } else
-                        object.long = options.longs === String ? "0" : 0;
-                    object["enum"] = options.enums === String ? "ONE" : 0;
-                    object.sint32 = 0;
-                }
-                if (message.long != null && message.hasOwnProperty("long"))
-                    if (typeof message.long === "number")
-                        object.long = options.longs === String ? String(message.long) : message.long;
-                    else
-                        object.long = options.longs === String ? $util.Long.prototype.toString.call(message.long) : options.longs === Number ? new $util.LongBits(message.long.low >>> 0, message.long.high >>> 0).toNumber() : message.long;
-                if (message["enum"] != null && message.hasOwnProperty("enum"))
-                    object["enum"] = options.enums === String ? $root.Test.Enum[message["enum"]] : message["enum"];
-                if (message.sint32 != null && message.hasOwnProperty("sint32"))
-                    object.sint32 = message.sint32;
-                return object;
-            };
-
-            /**
-             * Creates a plain object from this InnerInner message. Also converts values to other types if specified.
-             * @param {$protobuf.ConversionOptions} [options] Conversion options
-             * @returns {Object.<string,*>} Plain object
-             */
-            InnerInner.prototype.toObject = function toObject(options) {
-                return this.constructor.toObject(this, options);
-            };
-
-            /**
-             * Converts this InnerInner to JSON.
-             * @returns {Object.<string,*>} JSON object
-             */
-            InnerInner.prototype.toJSON = function toJSON() {
-                return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-            };
-
             return InnerInner;
         })();
 
         return Inner;
     })();
 
-    /**
-     * Enum enum.
-     * @name Enum
-     * @memberof Test
-     * @enum {number}
-     * @property {number} ONE=0 ONE value
-     * @property {number} TWO=1 TWO value
-     * @property {number} THREE=2 THREE value
-     * @property {number} FOUR=3 FOUR value
-     * @property {number} FIVE=4 FIVE value
-     */
     Test.Enum = (function() {
         var valuesById = {}, values = Object.create(valuesById);
         values[valuesById[0] = "ONE"] = 0;
@@ -754,20 +181,6 @@ $root.Test = (function() {
 
 $root.Outer = (function() {
 
-    /**
-     * Properties of an Outer.
-     * @typedef Outer$Properties
-     * @type {Object}
-     * @property {Array.<boolean>} [bool] Outer bool.
-     * @property {number} [double] Outer double.
-     */
-
-    /**
-     * Constructs a new Outer.
-     * @exports Outer
-     * @constructor
-     * @param {Outer$Properties=} [properties] Properties to set
-     */
     function Outer(properties) {
         this.bool = [];
         if (properties)
@@ -776,65 +189,23 @@ $root.Outer = (function() {
                     this[keys[i]] = properties[keys[i]];
     }
 
-    /**
-     * Outer bool.
-     * @type {Array.<boolean>}
-     */
     Outer.prototype.bool = $util.emptyArray;
-
-    /**
-     * Outer double.
-     * @type {number}
-     */
     Outer.prototype.double = 0;
 
-    /**
-     * Creates a new Outer instance using the specified properties.
-     * @param {Outer$Properties=} [properties] Properties to set
-     * @returns {Outer} Outer instance
-     */
-    Outer.create = function create(properties) {
-        return new Outer(properties);
-    };
-
-    /**
-     * Encodes the specified Outer message. Does not implicitly {@link Outer.verify|verify} messages.
-     * @param {Outer$Properties} message Outer message or plain object to encode
-     * @param {$protobuf.Writer} [writer] Writer to encode to
-     * @returns {$protobuf.Writer} Writer
-     */
     Outer.encode = function encode(message, writer) {
         if (!writer)
             writer = $Writer.create();
         if (message.bool != null && message.bool.length) {
-            writer.uint32(/* id 1, wireType 2 =*/10).fork();
+            writer.uint32(10).fork();
             for (var i = 0; i < message.bool.length; ++i)
                 writer.bool(message.bool[i]);
             writer.ldelim();
         }
         if (message.double != null && message.hasOwnProperty("double"))
-            writer.uint32(/* id 2, wireType 1 =*/17).double(message.double);
+            writer.uint32(17).double(message.double);
         return writer;
     };
 
-    /**
-     * Encodes the specified Outer message, length delimited. Does not implicitly {@link Outer.verify|verify} messages.
-     * @param {Outer$Properties} message Outer message or plain object to encode
-     * @param {$protobuf.Writer} [writer] Writer to encode to
-     * @returns {$protobuf.Writer} Writer
-     */
-    Outer.encodeDelimited = function encodeDelimited(message, writer) {
-        return this.encode(message, writer).ldelim();
-    };
-
-    /**
-     * Decodes an Outer message from the specified reader or buffer.
-     * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-     * @param {number} [length] Message length if known beforehand
-     * @returns {Outer} Outer
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
     Outer.decode = function decode(reader, length) {
         if (!(reader instanceof $Reader))
             reader = $Reader.create(reader);
@@ -863,111 +234,6 @@ $root.Outer = (function() {
         return message;
     };
 
-    /**
-     * Decodes an Outer message from the specified reader or buffer, length delimited.
-     * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-     * @returns {Outer} Outer
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
-    Outer.decodeDelimited = function decodeDelimited(reader) {
-        if (!(reader instanceof $Reader))
-            reader = $Reader(reader);
-        return this.decode(reader, reader.uint32());
-    };
-
-    /**
-     * Verifies an Outer message.
-     * @param {Object.<string,*>} message Plain object to verify
-     * @returns {?string} `null` if valid, otherwise the reason why it is not
-     */
-    Outer.verify = function verify(message) {
-        if (typeof message !== "object" || message === null)
-            return "object expected";
-        if (message.bool != null && message.hasOwnProperty("bool")) {
-            if (!Array.isArray(message.bool))
-                return "bool: array expected";
-            for (var i = 0; i < message.bool.length; ++i)
-                if (typeof message.bool[i] !== "boolean")
-                    return "bool: boolean[] expected";
-        }
-        if (message.double != null && message.hasOwnProperty("double"))
-            if (typeof message.double !== "number")
-                return "double: number expected";
-        return null;
-    };
-
-    /**
-     * Creates an Outer message from a plain object. Also converts values to their respective internal types.
-     * @param {Object.<string,*>} object Plain object
-     * @returns {Outer} Outer
-     */
-    Outer.fromObject = function fromObject(object) {
-        if (object instanceof $root.Outer)
-            return object;
-        var message = new $root.Outer();
-        if (object.bool) {
-            if (!Array.isArray(object.bool))
-                throw TypeError(".Outer.bool: array expected");
-            message.bool = [];
-            for (var i = 0; i < object.bool.length; ++i)
-                message.bool[i] = Boolean(object.bool[i]);
-        }
-        if (object.double != null)
-            message.double = Number(object.double);
-        return message;
-    };
-
-    /**
-     * Creates an Outer message from a plain object. Also converts values to their respective internal types.
-     * This is an alias of {@link Outer.fromObject}.
-     * @function
-     * @param {Object.<string,*>} object Plain object
-     * @returns {Outer} Outer
-     */
-    Outer.from = Outer.fromObject;
-
-    /**
-     * Creates a plain object from an Outer message. Also converts values to other types if specified.
-     * @param {Outer} message Outer
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
-     * @returns {Object.<string,*>} Plain object
-     */
-    Outer.toObject = function toObject(message, options) {
-        if (!options)
-            options = {};
-        var object = {};
-        if (options.arrays || options.defaults)
-            object.bool = [];
-        if (options.defaults)
-            object.double = 0;
-        if (message.bool && message.bool.length) {
-            object.bool = [];
-            for (var j = 0; j < message.bool.length; ++j)
-                object.bool[j] = message.bool[j];
-        }
-        if (message.double != null && message.hasOwnProperty("double"))
-            object.double = message.double;
-        return object;
-    };
-
-    /**
-     * Creates a plain object from this Outer message. Also converts values to other types if specified.
-     * @param {$protobuf.ConversionOptions} [options] Conversion options
-     * @returns {Object.<string,*>} Plain object
-     */
-    Outer.prototype.toObject = function toObject(options) {
-        return this.constructor.toObject(this, options);
-    };
-
-    /**
-     * Converts this Outer to JSON.
-     * @returns {Object.<string,*>} JSON object
-     */
-    Outer.prototype.toJSON = function toJSON() {
-        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-    };
-
     return Outer;
 })();
 
diff --git a/scripts/gentests.js b/scripts/gentests.js
index 5725a5edd..594c1ac0f 100644
--- a/scripts/gentests.js
+++ b/scripts/gentests.js
@@ -12,7 +12,7 @@ var fs   = require("fs"),
     { file: "tests/data/rpc.proto", flags: [ "es6" ] },
     { file: "tests/data/rpc.proto", flags: [] },
     { file: "tests/data/test.proto", flags: [] },
-    { file: "bench/data/bench.proto", flags: [], out: "bench/data/static_pbjs.js" }
+    { file: "bench/data/bench.proto", flags: ["no-create", "no-verify", "no-delimited", "no-convert", "no-comments"], out: "bench/data/static_pbjs.js" }
 ]
 .forEach(function({ file, flags, out }) {
     var basename = file.replace(/\.proto$/, "");