diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index 050f8a18925..5ad6debfbe1 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -554,10 +554,10 @@ NAPI_NO_RETURN void napi_fatal_error(const char* location,
 
 - `[in] location`: Optional location at which the error occurred.
 - `[in] location_len`: The length of the location in bytes, or
-NAPI_AUTO_LENGTH if it is null-terminated.
+`NAPI_AUTO_LENGTH` if it is null-terminated.
 - `[in] message`: The message associated with the error.
 - `[in] message_len`: The length of the message in bytes, or
-NAPI_AUTO_LENGTH if it is
+`NAPI_AUTO_LENGTH` if it is
 null-terminated.
 
 The function call does not return, the process will be terminated.
@@ -1255,7 +1255,7 @@ napi_status napi_create_function(napi_env env,
 - `[in] utf8name`: A string representing the name of the function encoded as
 UTF8.
 - `[in] length`: The length of the utf8name in bytes, or
-NAPI_AUTO_LENGTH if it is null-terminated.
+`NAPI_AUTO_LENGTH` if it is null-terminated.
 - `[in] cb`: A function pointer to the native function to be invoked when the
 created function is invoked from JavaScript.
 - `[in] data`: Optional arbitrary context data to be passed into the native
@@ -1483,7 +1483,7 @@ napi_status napi_create_string_latin1(napi_env env,
 - `[in] env`: The environment that the API is invoked under.
 - `[in] str`: Character buffer representing a ISO-8859-1-encoded string.
 - `[in] length`: The length of the string in bytes, or
-NAPI_AUTO_LENGTH if it is null-terminated.
+`NAPI_AUTO_LENGTH` if it is null-terminated.
 - `[out] result`: A `napi_value` representing a JavaScript String.
 
 Returns `napi_ok` if the API succeeded.
@@ -1507,7 +1507,7 @@ napi_status napi_create_string_utf16(napi_env env,
 - `[in] env`: The environment that the API is invoked under.
 - `[in] str`: Character buffer representing a UTF16-LE-encoded string.
 - `[in] length`: The length of the string in two-byte code units, or
-NAPI_AUTO_LENGTH if it is null-terminated.
+`NAPI_AUTO_LENGTH` if it is null-terminated.
 - `[out] result`: A `napi_value` representing a JavaScript String.
 
 Returns `napi_ok` if the API succeeded.
@@ -1530,7 +1530,7 @@ napi_status napi_create_string_utf8(napi_env env,
 
 - `[in] env`: The environment that the API is invoked under.
 - `[in] str`: Character buffer representing a UTF8-encoded string.
-- `[in] length`: The length of the string in bytes, or NAPI_AUTO_LENGTH
+- `[in] length`: The length of the string in bytes, or `NAPI_AUTO_LENGTH`
 if it is null-terminated.
 - `[out] result`: A `napi_value` representing a JavaScript String.
 
@@ -3052,7 +3052,7 @@ napi_status napi_define_class(napi_env env,
  - `[in] utf8name`: Name of the JavaScript constructor function; this is
    not required to be the same as the C++ class name, though it is recommended
    for clarity.
- - `[in] length`: The length of the utf8name in bytes, or NAPI_AUTO_LENGTH
+ - `[in] length`: The length of the utf8name in bytes, or `NAPI_AUTO_LENGTH`
 if it is null-terminated.
  - `[in] constructor`: Callback function that handles constructing instances
    of the class. (This should be a static method on the class, not an actual
diff --git a/lib/internal/loader/ModuleWrap.js b/lib/internal/loader/ModuleWrap.js
deleted file mode 100644
index b2b11daead7..00000000000
--- a/lib/internal/loader/ModuleWrap.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-// exposes ModuleWrap for testing
-
-module.exports = internalBinding('module_wrap').ModuleWrap;
diff --git a/lib/internal/test/binding.js b/lib/internal/test/binding.js
new file mode 100644
index 00000000000..7b9e1a089d2
--- /dev/null
+++ b/lib/internal/test/binding.js
@@ -0,0 +1,13 @@
+'use strict';
+
+process.emitWarning(
+  'These APIs are exposed only for testing and are not ' +
+  'tracked by any versioning system or deprecation process.',
+  'internal/test/binding');
+
+// These exports should be scoped as specifically as possible
+// to avoid exposing APIs because even with that warning and
+// this file being internal people will still try to abuse it.
+module.exports = {
+  ModuleWrap: internalBinding('module_wrap').ModuleWrap,
+};
diff --git a/lib/internal/url.js b/lib/internal/url.js
index 7055667718b..0bdfc4783e6 100644
--- a/lib/internal/url.js
+++ b/lib/internal/url.js
@@ -98,8 +98,7 @@ class URLSearchParams {
   constructor(init = undefined) {
     if (init === null || init === undefined) {
       this[searchParams] = [];
-    } else if ((typeof init === 'object' && init !== null) ||
-               typeof init === 'function') {
+    } else if (typeof init === 'object' || typeof init === 'function') {
       const method = init[Symbol.iterator];
       if (method === this[Symbol.iterator]) {
         // While the spec does not have this branch, we can use it as a
diff --git a/lib/timers.js b/lib/timers.js
index 8e914d751a9..08ddf167856 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -379,7 +379,7 @@ function enroll(item, msecs) {
 
 exports.enroll = util.deprecate(enroll,
                                 'timers.enroll() is deprecated. ' +
-                                'Please use clearTimeout instead.',
+                                'Please use setTimeout instead.',
                                 'DEP0095');
 
 
diff --git a/node.gyp b/node.gyp
index 2aee687ab7d..70ed4df7637 100644
--- a/node.gyp
+++ b/node.gyp
@@ -109,7 +109,6 @@
       'lib/internal/loader/DefaultResolve.js',
       'lib/internal/loader/ModuleJob.js',
       'lib/internal/loader/ModuleMap.js',
-      'lib/internal/loader/ModuleWrap.js',
       'lib/internal/loader/Translators.js',
       'lib/internal/safe_globals.js',
       'lib/internal/net.js',
@@ -127,6 +126,7 @@
       'lib/internal/repl.js',
       'lib/internal/repl/await.js',
       'lib/internal/socket_list.js',
+      'lib/internal/test/binding.js',
       'lib/internal/test/unicode.js',
       'lib/internal/timers.js',
       'lib/internal/tls.js',
diff --git a/test/parallel/test-internal-module-wrap.js b/test/parallel/test-internal-module-wrap.js
index 634d1ebc6f6..66a17a0f344 100644
--- a/test/parallel/test-internal-module-wrap.js
+++ b/test/parallel/test-internal-module-wrap.js
@@ -6,7 +6,7 @@ const common = require('../common');
 common.crashOnUnhandledRejection();
 const assert = require('assert');
 
-const ModuleWrap = require('internal/loader/ModuleWrap');
+const { ModuleWrap } = require('internal/test/binding');
 const { getPromiseDetails, isPromise } = process.binding('util');
 const setTimeoutAsync = require('util').promisify(setTimeout);