@@ -21,22 +21,37 @@ const childProcess = require('child_process');
 
 
 /**
- * A hash with configuration options for an executed command.
+ * Options for configuring an executed command.
  *
- * - `args` - Command line arguments.
- * - `env` - Command environment; will inherit from the current process if
- *     missing.
- * - `stdio` - IO configuration for the spawned server process. For more
- *     information, refer to the documentation of `child_process.spawn`.
- *
- * @typedef {{
- *   args: (!Array<string>|undefined),
- *   env: (!Object<string, string>|undefined),
- *   stdio: (string|!Array<string|number|!stream.Stream|null|undefined>|
- *           undefined)
- * }}
+ * @record
  */
-var Options;
+class Options {
+  constructor() {
+    /**
+     * Command line arguments for the child process, if any.
+     * @type (!Array<string>|undefined)
+     */
+    this.args;
+
+    /**
+     * Environment variables for the spawned process. If unspecified, the
+     * child will inherit this process' environment.
+     *
+     * @type {(!Object<string, string>|undefined)}
+     */
+    this.env;
+
+    /**
+     * IO conifguration for the spawned server child process. If unspecified,
+     * the child process' IO output will be ignored.
+     *
+     * @type {(string|!Array<string|number|!stream.Stream|null|undefined>|
+     *           undefined)}
+     * @see <https://nodejs.org/dist/latest-v8.x/docs/api/child_process.html#child_process_options_stdio>
+     */
+    this.stdio;
+  }
+}
 
 
 /**
@@ -148,6 +163,5 @@ module.exports = function exec(command, opt_options) {
 // Exported to improve generated API documentation.
 
 module.exports.Command = Command;
-/** @typedef {!Options} */
 module.exports.Options = Options;
 module.exports.Result = Result;
@@ -252,10 +252,6 @@ class Entry {
 }
 
 
-/** @typedef {(string|function(): string)} */
-let Loggable;
-
-
 /**
  * An object used to log debugging messages. Loggers use a hierarchical,
  * dot-separated naming scheme. For instance, "foo" is considered the parent of
@@ -523,7 +519,7 @@ function getLogger(name) {
 
 /**
  * Pads a number to ensure it has a minimum of two digits.
- * 
+ *
  * @param {number} n the number to be padded.
  * @return {string} the padded number.
  */
 
@@ -500,33 +500,65 @@ class SeleniumServer extends DriverService {
 
 
 /**
- * Options for the Selenium server:
- *
- * - `loopback` - Whether the server should only be accessed on this host's
- *     loopback address.
- * - `port` - The port to start the server on (must be > 0). If the port is
- *     provided as a promise, the service will wait for the promise to resolve
- *     before starting.
- * - `args` - The arguments to pass to the service. If a promise is provided,
- *     the service will wait for it to resolve before starting.
- * - `jvmArgs` - The arguments to pass to the JVM. If a promise is provided,
- *     the service will wait for it to resolve before starting.
- * - `env` - The environment variables that should be visible to the server
- *     process. Defaults to inheriting the current process's environment.
- * - `stdio` - IO configuration for the spawned server process. For more
- *     information, refer to the documentation of `child_process.spawn`.
+ * A record object describing configuration options for a {@link SeleniumServer}
+ * instance.
  *
- * @typedef {{
- *   loopback: (boolean|undefined),
- *   port: (number|!IThenable<number>),
- *   args: !(Array<string>|IThenable<!Array<string>>),
- *   jvmArgs: (!Array<string>|!IThenable<!Array<string>>|undefined),
- *   env: (!Object<string, string>|undefined),
- *   stdio: (string|!Array<string|number|!stream.Stream|null|undefined>|
- *           undefined)
- * }}
+ * @record
  */
-SeleniumServer.Options;
+SeleniumServer.Options = class {
+  constructor() {
+    /**
+     * Whether the server should only be accessible on this host's loopback
+     * address.
+     *
+     * @type {(boolean|undefined)}
+     */
+    this.loopback;
+
+    /**
+     * The port to start the server on (must be > 0). If the port is provided as
+     * a promise, the service will wait for the promise to resolve before
+     * starting.
+     *
+     * @type {(number|!IThenable<number>)}
+     */
+    this.port;
+
+    /**
+     * The arguments to pass to the service. If a promise is provided,
+     * the service will wait for it to resolve before starting.
+     *
+     * @type {!(Array<string>|IThenable<!Array<string>>)}
+     */
+    this.args;
+
+    /**
+     * The arguments to pass to the JVM. If a promise is provided,
+     * the service will wait for it to resolve before starting.
+     *
+     * @type {(!Array<string>|!IThenable<!Array<string>>|undefined)}
+     */
+    this.jvmArgs;
+
+    /**
+     * The environment variables that should be visible to the server
+     * process. Defaults to inheriting the current process's environment.
+     *
+     * @type {(!Object<string, string>|undefined)}
+     */
+    this.env;
+
+    /**
+     * IO configuration for the spawned server process. If unspecified, IO will
+     * be ignored.
+     *
+     * @type {(string|!Array<string|number|!stream.Stream|null|undefined>|
+     *         undefined)}
+     * @see <https://nodejs.org/dist/latest-v8.x/docs/api/child_process.html#child_process_options_stdio>
+     */
+    this.stdio;
+  }
+};