diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index 037dc99b1..4de87b5d8 100644
--- a/dwds/CHANGELOG.md
+++ b/dwds/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 16.0.1-dev
+## 16.0.1
 
 - Allow the following API to return `null` and add error handling:
   - `LoadStrategy.serverPathForModule`
diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js
index 66f32e907..e77e80a2f 100644
--- a/dwds/lib/src/injected/client.js
+++ b/dwds/lib/src/injected/client.js
@@ -1,4 +1,4 @@
-// Generated by dart2js (NullSafetyMode.sound, csp, deferred-serialization, intern-composite-values), the Dart to JavaScript compiler version: 2.19.0-177.0.dev.
+// Generated by dart2js (NullSafetyMode.sound, deferred-serialization, csp), the Dart to JavaScript compiler version: 2.18.3.
 // The code supports the following hooks:
 // dartPrint(message):
 //    if this function is defined it is called instead of the Dart [print]
@@ -3055,10 +3055,9 @@
     _Parser_toType(universe, environment, item) {
       if (typeof item == "string")
         return A._Universe__lookupInterfaceRti(universe, item, universe.sEA);
-      else if (typeof item == "number") {
-        environment.toString;
+      else if (typeof item == "number")
         return A._Parser_indexToType(universe, environment, item);
-      } else
+      else
         return item;
     },
     _Parser_toTypes(universe, environment, items) {
@@ -5564,66 +5563,78 @@
             scheme = _null;
             isSimple = false;
           } else {
-            if (!(queryStart < end && queryStart === pathStart + 2 && B.JSString_methods.startsWith$2(uri, "..", pathStart)))
-              t2 = queryStart > pathStart + 2 && B.JSString_methods.startsWith$2(uri, "/..", queryStart - 3);
+            if (!B.JSString_methods.startsWith$2(uri, "\\", pathStart))
+              if (hostStart > 0)
+                t2 = B.JSString_methods.startsWith$2(uri, "\\", hostStart - 1) || B.JSString_methods.startsWith$2(uri, "\\", hostStart - 2);
+              else
+                t2 = false;
             else
               t2 = true;
             if (t2) {
               scheme = _null;
               isSimple = false;
             } else {
-              if (schemeEnd === 4)
-                if (B.JSString_methods.startsWith$2(uri, "file", 0)) {
-                  if (hostStart <= 0) {
-                    if (!B.JSString_methods.startsWith$2(uri, "/", pathStart)) {
-                      schemeAuth = "file:///";
-                      delta = 3;
-                    } else {
-                      schemeAuth = "file://";
-                      delta = 2;
+              if (!(queryStart < end && queryStart === pathStart + 2 && B.JSString_methods.startsWith$2(uri, "..", pathStart)))
+                t2 = queryStart > pathStart + 2 && B.JSString_methods.startsWith$2(uri, "/..", queryStart - 3);
+              else
+                t2 = true;
+              if (t2) {
+                scheme = _null;
+                isSimple = false;
+              } else {
+                if (schemeEnd === 4)
+                  if (B.JSString_methods.startsWith$2(uri, "file", 0)) {
+                    if (hostStart <= 0) {
+                      if (!B.JSString_methods.startsWith$2(uri, "/", pathStart)) {
+                        schemeAuth = "file:///";
+                        delta = 3;
+                      } else {
+                        schemeAuth = "file://";
+                        delta = 2;
+                      }
+                      uri = schemeAuth + B.JSString_methods.substring$2(uri, pathStart, end);
+                      schemeEnd -= 0;
+                      t1 = delta - 0;
+                      queryStart += t1;
+                      fragmentStart += t1;
+                      end = uri.length;
+                      hostStart = 7;
+                      portStart = 7;
+                      pathStart = 7;
+                    } else if (pathStart === queryStart) {
+                      ++fragmentStart;
+                      queryStart0 = queryStart + 1;
+                      uri = B.JSString_methods.replaceRange$3(uri, pathStart, queryStart, "/");
+                      ++end;
+                      queryStart = queryStart0;
                     }
-                    uri = schemeAuth + B.JSString_methods.substring$2(uri, pathStart, end);
-                    schemeEnd -= 0;
-                    t1 = delta - 0;
-                    queryStart += t1;
-                    fragmentStart += t1;
-                    end = uri.length;
-                    hostStart = 7;
-                    portStart = 7;
-                    pathStart = 7;
-                  } else if (pathStart === queryStart) {
-                    ++fragmentStart;
-                    queryStart0 = queryStart + 1;
-                    uri = B.JSString_methods.replaceRange$3(uri, pathStart, queryStart, "/");
-                    ++end;
-                    queryStart = queryStart0;
-                  }
-                  scheme = "file";
-                } else if (B.JSString_methods.startsWith$2(uri, "http", 0)) {
-                  if (t1 && portStart + 3 === pathStart && B.JSString_methods.startsWith$2(uri, "80", portStart + 1)) {
-                    fragmentStart -= 3;
-                    pathStart0 = pathStart - 3;
-                    queryStart -= 3;
+                    scheme = "file";
+                  } else if (B.JSString_methods.startsWith$2(uri, "http", 0)) {
+                    if (t1 && portStart + 3 === pathStart && B.JSString_methods.startsWith$2(uri, "80", portStart + 1)) {
+                      fragmentStart -= 3;
+                      pathStart0 = pathStart - 3;
+                      queryStart -= 3;
+                      uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, "");
+                      end -= 3;
+                      pathStart = pathStart0;
+                    }
+                    scheme = "http";
+                  } else
+                    scheme = _null;
+                else if (schemeEnd === 5 && B.JSString_methods.startsWith$2(uri, "https", 0)) {
+                  if (t1 && portStart + 4 === pathStart && B.JSString_methods.startsWith$2(uri, "443", portStart + 1)) {
+                    fragmentStart -= 4;
+                    pathStart0 = pathStart - 4;
+                    queryStart -= 4;
                     uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, "");
                     end -= 3;
                     pathStart = pathStart0;
                   }
-                  scheme = "http";
+                  scheme = "https";
                 } else
                   scheme = _null;
-              else if (schemeEnd === 5 && B.JSString_methods.startsWith$2(uri, "https", 0)) {
-                if (t1 && portStart + 4 === pathStart && B.JSString_methods.startsWith$2(uri, "443", portStart + 1)) {
-                  fragmentStart -= 4;
-                  pathStart0 = pathStart - 4;
-                  queryStart -= 4;
-                  uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, "");
-                  end -= 3;
-                  pathStart = pathStart0;
-                }
-                scheme = "https";
-              } else
-                scheme = _null;
-              isSimple = true;
+                isSimple = true;
+              }
             }
           }
         }
@@ -6033,7 +6044,7 @@
     _Uri__makeUserInfo(userInfo, start, end) {
       if (userInfo == null)
         return "";
-      return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_gRj, false);
+      return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_gRj, false, false);
     },
     _Uri__makePath(path, start, end, pathSegments, scheme, hasAuthority) {
       var t1, result,
@@ -6047,7 +6058,7 @@
       } else if (pathSegments != null)
         throw A.wrapException(A.ArgumentError$("Both path and pathSegments specified", null));
       else
-        result = A._Uri__normalizeOrSubstring(path, start, end, B.List_qg4, true);
+        result = A._Uri__normalizeOrSubstring(path, start, end, B.List_qg4, true, true);
       if (result.length === 0) {
         if (isFile)
           return "/";
@@ -6057,19 +6068,19 @@
     },
     _Uri__normalizePath(path, scheme, hasAuthority) {
       var t1 = scheme.length === 0;
-      if (t1 && !hasAuthority && !B.JSString_methods.startsWith$1(path, "/"))
+      if (t1 && !hasAuthority && !B.JSString_methods.startsWith$1(path, "/") && !B.JSString_methods.startsWith$1(path, "\\"))
         return A._Uri__normalizeRelativePath(path, !t1 || hasAuthority);
       return A._Uri__removeDotSegments(path);
     },
     _Uri__makeQuery(query, start, end, queryParameters) {
       if (query != null)
-        return A._Uri__normalizeOrSubstring(query, start, end, B.List_CVk, true);
+        return A._Uri__normalizeOrSubstring(query, start, end, B.List_CVk, true, false);
       return null;
     },
     _Uri__makeFragment(fragment, start, end) {
       if (fragment == null)
         return null;
-      return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_CVk, true);
+      return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_CVk, true, false);
     },
     _Uri__normalizeEscape(source, index, lowerCase) {
       var firstDigit, secondDigit, firstDigitValue, secondDigitValue, value,
@@ -6139,11 +6150,11 @@
       }
       return A.String_String$fromCharCodes(codeUnits, 0, null);
     },
-    _Uri__normalizeOrSubstring(component, start, end, charTable, escapeDelimiters) {
-      var t1 = A._Uri__normalize(component, start, end, charTable, escapeDelimiters);
+    _Uri__normalizeOrSubstring(component, start, end, charTable, escapeDelimiters, replaceBackslash) {
+      var t1 = A._Uri__normalize(component, start, end, charTable, escapeDelimiters, replaceBackslash);
       return t1 == null ? B.JSString_methods.substring$2(component, start, end) : t1;
     },
-    _Uri__normalize(component, start, end, charTable, escapeDelimiters) {
+    _Uri__normalize(component, start, end, charTable, escapeDelimiters, replaceBackslash) {
       var t1, index, sectionStart, buffer, char, t2, replacement, sourceLength, tail, t3, _null = null;
       for (t1 = !escapeDelimiters, index = start, sectionStart = index, buffer = _null; index < end;) {
         char = B.JSString_methods.codeUnitAt$1(component, index);
@@ -6168,6 +6179,9 @@
               sourceLength = 1;
             } else
               sourceLength = 3;
+          } else if (char === 92 && replaceBackslash) {
+            replacement = "/";
+            sourceLength = 1;
           } else {
             if (t1)
               if (char <= 93) {
@@ -6365,7 +6379,7 @@
       if ((indices.length & 1) === 1)
         text = B.C_Base64Codec.normalize$3(0, text, t2, t1);
       else {
-        data = A._Uri__normalize(text, t2, t1, B.List_CVk, true);
+        data = A._Uri__normalize(text, t2, t1, B.List_CVk, true, false);
         if (data != null)
           text = B.JSString_methods.replaceRange$3(text, t2, t1, data);
       }
@@ -6374,7 +6388,7 @@
     _createTables() {
       var _i, t2, t3, t4, b,
         _s77_ = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-._~!$&'()*+,;=",
-        _s1_ = ".", _s1_0 = ":", _s1_1 = "/", _s1_2 = "?", _s1_3 = "#",
+        _s1_ = ".", _s1_0 = ":", _s1_1 = "/", _s1_2 = "\\", _s1_3 = "?", _s1_4 = "#", _s2_ = "/\\",
         t1 = type$.Uint8List,
         tables = J.JSArray_JSArray$allocateGrowable(22, t1);
       for (_i = 0; _i < 22; ++_i)
@@ -6387,40 +6401,45 @@
       t3.call$3(t1, _s1_, 14);
       t3.call$3(t1, _s1_0, 34);
       t3.call$3(t1, _s1_1, 3);
-      t3.call$3(t1, _s1_2, 172);
-      t3.call$3(t1, _s1_3, 205);
+      t3.call$3(t1, _s1_2, 227);
+      t3.call$3(t1, _s1_3, 172);
+      t3.call$3(t1, _s1_4, 205);
       b = t2.call$2(14, 225);
       t3.call$3(b, _s77_, 1);
       t3.call$3(b, _s1_, 15);
       t3.call$3(b, _s1_0, 34);
-      t3.call$3(b, _s1_1, 234);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(15, 225);
       t3.call$3(b, _s77_, 1);
       t3.call$3(b, "%", 225);
       t3.call$3(b, _s1_0, 34);
       t3.call$3(b, _s1_1, 9);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 233);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(1, 225);
       t3.call$3(b, _s77_, 1);
       t3.call$3(b, _s1_0, 34);
       t3.call$3(b, _s1_1, 10);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(2, 235);
       t3.call$3(b, _s77_, 139);
       t3.call$3(b, _s1_1, 131);
+      t3.call$3(b, _s1_2, 131);
       t3.call$3(b, _s1_, 146);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(3, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_1, 68);
+      t3.call$3(b, _s1_2, 68);
       t3.call$3(b, _s1_, 18);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(4, 229);
       t3.call$3(b, _s77_, 5);
       t4.call$3(b, "AZ", 229);
@@ -6428,75 +6447,81 @@
       t3.call$3(b, "@", 68);
       t3.call$3(b, "[", 232);
       t3.call$3(b, _s1_1, 138);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 138);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(5, 229);
       t3.call$3(b, _s77_, 5);
       t4.call$3(b, "AZ", 229);
       t3.call$3(b, _s1_0, 102);
       t3.call$3(b, "@", 68);
       t3.call$3(b, _s1_1, 138);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 138);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(6, 231);
       t4.call$3(b, "19", 7);
       t3.call$3(b, "@", 68);
       t3.call$3(b, _s1_1, 138);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 138);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(7, 231);
       t4.call$3(b, "09", 7);
       t3.call$3(b, "@", 68);
       t3.call$3(b, _s1_1, 138);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 138);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       t3.call$3(t2.call$2(8, 8), "]", 5);
       b = t2.call$2(9, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_, 16);
-      t3.call$3(b, _s1_1, 234);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(16, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_, 17);
-      t3.call$3(b, _s1_1, 234);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(17, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_1, 9);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_2, 233);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(10, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_, 18);
-      t3.call$3(b, _s1_1, 234);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(18, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_, 19);
-      t3.call$3(b, _s1_1, 234);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(19, 235);
       t3.call$3(b, _s77_, 11);
-      t3.call$3(b, _s1_1, 234);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(11, 235);
       t3.call$3(b, _s77_, 11);
       t3.call$3(b, _s1_1, 10);
-      t3.call$3(b, _s1_2, 172);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s2_, 234);
+      t3.call$3(b, _s1_3, 172);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(12, 236);
       t3.call$3(b, _s77_, 12);
-      t3.call$3(b, _s1_2, 12);
-      t3.call$3(b, _s1_3, 205);
+      t3.call$3(b, _s1_3, 12);
+      t3.call$3(b, _s1_4, 205);
       b = t2.call$2(13, 237);
       t3.call$3(b, _s77_, 13);
-      t3.call$3(b, _s1_2, 13);
+      t3.call$3(b, _s1_3, 13);
       t4.call$3(t2.call$2(20, 245), "az", 21);
       b = t2.call$2(21, 245);
       t4.call$3(b, "az", 21);
@@ -6737,9 +6762,9 @@
       var t1, exception,
         result = "element tag unavailable";
       try {
-        t1 = element.tagName;
-        t1.toString;
-        result = t1;
+        t1 = J.getInterceptor$x(element);
+        t1.get$tagName(element);
+        result = t1.get$tagName(element);
       } catch (exception) {
       }
       return result;
@@ -7789,10 +7814,8 @@
       hash ^= hash >>> 11;
       return hash + ((hash & 16383) << 15) & 536870911;
     },
-    BuiltValueNullFieldError_checkNotNull(value, type, field, $T) {
-      if (value == null)
-        throw A.wrapException(new A.BuiltValueNullFieldError(type, field));
-      return value;
+    BuiltValueNullFieldError$(type, field) {
+      return new A.BuiltValueNullFieldError(type, field);
     },
     BuiltValueNestedFieldError$(type, field, error) {
       return new A.BuiltValueNestedFieldError(type, field, error);
@@ -16279,11 +16302,11 @@
         queryIndex = B.JSString_methods.indexOf$2(t2, "?", t1);
         end = t2.length;
         if (queryIndex >= 0) {
-          query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_CVk, false);
+          query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_CVk, false, false);
           end = queryIndex;
         } else
           query = _null;
-        t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_qg4, false), query, _null);
+        t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_qg4, false, false), query, _null);
       }
       return t1;
     },
@@ -16815,6 +16838,11 @@
     set$_innerHtml(receiver, value) {
       receiver.innerHTML = value;
     },
+    get$tagName(receiver) {
+      var t1 = receiver.tagName;
+      t1.toString;
+      return t1;
+    },
     $isElement: 1
   };
   A.Element_Element$html_closure.prototype = {
@@ -22000,7 +22028,6 @@
     },
     deserialize$3$specifiedType(serializers, serialized, specifiedType) {
       var t1, t2, value, $$v, _$result,
-        _s11_ = "BuildResult",
         result = new A.BuildResultBuilder(),
         iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized));
       for (t1 = type$.BuildStatus; iterator.moveNext$0();) {
@@ -22025,9 +22052,10 @@
       }
       _$result = result._build_result$_$v;
       if (_$result == null) {
-        t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_build_result$_$this()._status, _s11_, "status", t1);
-        _$result = new A._$BuildResult(t2);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s11_, "status", t1);
+        t1 = result.get$_build_result$_$this()._status;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$("BuildResult", "status"));
+        _$result = new A._$BuildResult(t1);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.BuildResult);
       return result._build_result$_$v = _$result;
@@ -22161,20 +22189,20 @@
       return _this;
     },
     _build$0() {
-      var t1, t2, t3, t4, _this = this,
+      var t1, t2, t3, _this = this,
         _s14_ = "ConnectRequest",
-        _s10_ = "instanceId",
-        _s14_0 = "entrypointPath",
         _$result = _this._$v;
       if (_$result == null) {
-        t1 = type$.String;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_$this()._appId, _s14_, "appId", t1);
-        t3 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_$this()._instanceId, _s14_, _s10_, t1);
-        t4 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_$this()._entrypointPath, _s14_, _s14_0, t1);
-        _$result = new A._$ConnectRequest(t2, t3, t4);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s14_, "appId", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t3, _s14_, _s10_, t1);
-        A.BuiltValueNullFieldError_checkNotNull(t4, _s14_, _s14_0, t1);
+        t1 = _this.get$_$this()._appId;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s14_, "appId"));
+        t2 = _this.get$_$this()._instanceId;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s14_, "instanceId"));
+        t3 = _this.get$_$this()._entrypointPath;
+        if (t3 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s14_, "entrypointPath"));
+        _$result = new A._$ConnectRequest(t1, t2, t3);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.ConnectRequest);
       return _this._$v = _$result;
@@ -22344,21 +22372,20 @@
       return _this;
     },
     _debug_event$_build$0() {
-      var t1, t2, t3, t4, t5, _this = this,
+      var t1, t2, t3, _this = this,
         _s10_ = "DebugEvent",
-        _s9_ = "eventData",
-        _s9_0 = "timestamp",
         _$result = _this._debug_event$_$v;
       if (_$result == null) {
-        t1 = type$.String;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._debug_event$_kind, _s10_, "kind", t1);
-        t3 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._eventData, _s10_, _s9_, t1);
-        t4 = type$.int;
-        t5 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._timestamp, _s10_, _s9_0, t4);
-        _$result = new A._$DebugEvent(t2, t3, t5);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s10_, "kind", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t3, _s10_, _s9_, t1);
-        A.BuiltValueNullFieldError_checkNotNull(t5, _s10_, _s9_0, t4);
+        t1 = _this.get$_debug_event$_$this()._debug_event$_kind;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s10_, "kind"));
+        t2 = _this.get$_debug_event$_$this()._eventData;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s10_, "eventData"));
+        t3 = _this.get$_debug_event$_$this()._timestamp;
+        if (t3 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s10_, "timestamp"));
+        _$result = new A._$DebugEvent(t1, t2, t3);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.DebugEvent);
       return _this._debug_event$_$v = _$result;
@@ -22406,16 +22433,11 @@
       return _this;
     },
     _debug_event$_build$0() {
-      var _$failedField, e, _$result0, t1, exception, t2, _this = this,
-        _s18_ = "BatchedDebugEvents",
-        _$result = null;
+      var _$failedField, e, _$result0, exception, t1, t2, _this = this, _$result = null;
       try {
         _$result0 = _this._debug_event$_$v;
-        if (_$result0 == null) {
-          t1 = _this.get$events().build$0();
-          _$result0 = new A._$BatchedDebugEvents(t1);
-          A.BuiltValueNullFieldError_checkNotNull(t1, _s18_, "events", type$.BuiltList_DebugEvent);
-        }
+        if (_$result0 == null)
+          _$result0 = new A._$BatchedDebugEvents(_this.get$events().build$0());
         _$result = _$result0;
       } catch (exception) {
         _$failedField = A._Cell$named("_$failedField");
@@ -22424,7 +22446,7 @@
           _this.get$events().build$0();
         } catch (exception) {
           e = A.unwrapException(exception);
-          t1 = A.BuiltValueNestedFieldError$(_s18_, _$failedField.readLocal$0(), J.toString$0$(e));
+          t1 = A.BuiltValueNestedFieldError$("BatchedDebugEvents", _$failedField.readLocal$0(), J.toString$0$(e));
           throw A.wrapException(t1);
         }
         throw exception;
@@ -22533,8 +22555,7 @@
       return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false);
     },
     deserialize$3$specifiedType(serializers, serialized, specifiedType) {
-      var t1, value, _$result, t2, t3,
-        _s15_ = "promptExtension",
+      var t1, value, _$result, t2,
         _s16_ = "DevToolsResponse",
         result = new A.DevToolsResponseBuilder(),
         iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized));
@@ -22565,12 +22586,13 @@
       }
       _$result = result._devtools_request$_$v;
       if (_$result == null) {
-        t1 = type$.bool;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_devtools_request$_$this()._success, _s16_, "success", t1);
-        t3 = A.BuiltValueNullFieldError_checkNotNull(result.get$_devtools_request$_$this()._promptExtension, _s16_, _s15_, t1);
-        _$result = new A._$DevToolsResponse(t2, t3, result.get$_devtools_request$_$this()._error);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s16_, "success", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t3, _s16_, _s15_, t1);
+        t1 = result.get$_devtools_request$_$this()._success;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s16_, "success"));
+        t2 = result.get$_devtools_request$_$this()._promptExtension;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s16_, "promptExtension"));
+        _$result = new A._$DevToolsResponse(t1, t2, result.get$_devtools_request$_$this()._error);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.DevToolsResponse);
       return result._devtools_request$_$v = _$result;
@@ -22627,17 +22649,17 @@
       return _this;
     },
     _devtools_request$_build$0() {
-      var t1, t2, t3, _this = this,
+      var t1, t2, _this = this,
         _s15_ = "DevToolsRequest",
-        _s10_ = "instanceId",
         _$result = _this._devtools_request$_$v;
       if (_$result == null) {
-        t1 = type$.String;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_appId, _s15_, "appId", t1);
-        t3 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_instanceId, _s15_, _s10_, t1);
-        _$result = new A._$DevToolsRequest(t2, t3, _this.get$_devtools_request$_$this()._contextId, _this.get$_devtools_request$_$this()._tabUrl, _this.get$_devtools_request$_$this()._uriOnly);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s15_, "appId", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t3, _s15_, _s10_, t1);
+        t1 = _this.get$_devtools_request$_$this()._devtools_request$_appId;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s15_, "appId"));
+        t2 = _this.get$_devtools_request$_$this()._devtools_request$_instanceId;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s15_, "instanceId"));
+        _$result = new A._$DevToolsRequest(t1, t2, _this.get$_devtools_request$_$this()._contextId, _this.get$_devtools_request$_$this()._tabUrl, _this.get$_devtools_request$_$this()._uriOnly);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.DevToolsRequest);
       return _this._devtools_request$_$v = _$result;
@@ -22687,8 +22709,7 @@
       return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false);
     },
     deserialize$3$specifiedType(serializers, serialized, specifiedType) {
-      var t1, value, $$v, _$result, t2, t3,
-        _s10_ = "stackTrace",
+      var t1, value, $$v, _$result, t2,
         _s13_ = "ErrorResponse",
         result = new A.ErrorResponseBuilder(),
         iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized));
@@ -22727,12 +22748,13 @@
       }
       _$result = result._error_response$_$v;
       if (_$result == null) {
-        t1 = type$.String;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_error_response$_$this()._error_response$_error, _s13_, "error", t1);
-        t3 = A.BuiltValueNullFieldError_checkNotNull(result.get$_error_response$_$this()._error_response$_stackTrace, _s13_, _s10_, t1);
-        _$result = new A._$ErrorResponse(t2, t3);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s13_, "error", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t3, _s13_, _s10_, t1);
+        t1 = result.get$_error_response$_$this()._error_response$_error;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s13_, "error"));
+        t2 = result.get$_error_response$_$this()._error_response$_stackTrace;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s13_, "stackTrace"));
+        _$result = new A._$ErrorResponse(t1, t2);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.ErrorResponse);
       return result._error_response$_$v = _$result;
@@ -22800,7 +22822,7 @@
       return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false);
     },
     deserialize$3$specifiedType(serializers, serialized, specifiedType) {
-      var t1, value, _$result, t2, t3, t4,
+      var t1, value, _$result, t2,
         _s16_ = "ExtensionRequest",
         result = new A.ExtensionRequestBuilder(),
         iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized));
@@ -22831,13 +22853,13 @@
       }
       _$result = result._extension_request$_$v;
       if (_$result == null) {
-        t1 = type$.int;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._id, _s16_, "id", t1);
-        t3 = type$.String;
-        t4 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._command, _s16_, "command", t3);
-        _$result = new A._$ExtensionRequest(t2, t4, result.get$_extension_request$_$this()._commandParams);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s16_, "id", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t4, _s16_, "command", t3);
+        t1 = result.get$_extension_request$_$this()._id;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s16_, "id"));
+        t2 = result.get$_extension_request$_$this()._command;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s16_, "command"));
+        _$result = new A._$ExtensionRequest(t1, t2, result.get$_extension_request$_$this()._commandParams);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.ExtensionRequest);
       return result._extension_request$_$v = _$result;
@@ -22870,7 +22892,7 @@
       return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false);
     },
     deserialize$3$specifiedType(serializers, serialized, specifiedType) {
-      var t1, value, _$result, t2, t3, t4, t5, t6,
+      var t1, value, _$result, t2, t3,
         _s17_ = "ExtensionResponse",
         result = new A.ExtensionResponseBuilder(),
         iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized));
@@ -22907,16 +22929,16 @@
       }
       _$result = result._extension_request$_$v;
       if (_$result == null) {
-        t1 = type$.int;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._id, _s17_, "id", t1);
-        t3 = type$.bool;
-        t4 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_success, _s17_, "success", t3);
-        t5 = type$.String;
-        t6 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_result, _s17_, "result", t5);
-        _$result = new A._$ExtensionResponse(t2, t4, t6, result.get$_extension_request$_$this()._extension_request$_error);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s17_, "id", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t4, _s17_, "success", t3);
-        A.BuiltValueNullFieldError_checkNotNull(t6, _s17_, "result", t5);
+        t1 = result.get$_extension_request$_$this()._id;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s17_, "id"));
+        t2 = result.get$_extension_request$_$this()._extension_request$_success;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s17_, "success"));
+        t3 = result.get$_extension_request$_$this()._extension_request$_result;
+        if (t3 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s17_, "result"));
+        _$result = new A._$ExtensionResponse(t1, t2, t3, result.get$_extension_request$_$this()._extension_request$_error);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.ExtensionResponse);
       return result._extension_request$_$v = _$result;
@@ -22942,7 +22964,7 @@
       return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false);
     },
     deserialize$3$specifiedType(serializers, serialized, specifiedType) {
-      var t1, value, $$v, _$result, t2, t3,
+      var t1, value, $$v, _$result, t2,
         _s14_ = "ExtensionEvent",
         result = new A.ExtensionEventBuilder(),
         iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized));
@@ -22981,12 +23003,13 @@
       }
       _$result = result._extension_request$_$v;
       if (_$result == null) {
-        t1 = type$.String;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._params, _s14_, "params", t1);
-        t3 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_method, _s14_, "method", t1);
-        _$result = new A._$ExtensionEvent(t2, t3);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s14_, "params", t1);
-        A.BuiltValueNullFieldError_checkNotNull(t3, _s14_, "method", t1);
+        t1 = result.get$_extension_request$_$this()._params;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s14_, "params"));
+        t2 = result.get$_extension_request$_$this()._extension_request$_method;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s14_, "method"));
+        _$result = new A._$ExtensionEvent(t1, t2);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.ExtensionEvent);
       return result._extension_request$_$v = _$result;
@@ -23217,16 +23240,11 @@
       return t1;
     },
     _extension_request$_build$0() {
-      var _$failedField, e, _$result0, t1, exception, t2, _this = this,
-        _s13_ = "BatchedEvents",
-        _$result = null;
+      var _$failedField, e, _$result0, exception, t1, t2, _this = this, _$result = null;
       try {
         _$result0 = _this._extension_request$_$v;
-        if (_$result0 == null) {
-          t1 = _this.get$events().build$0();
-          _$result0 = new A._$BatchedEvents(t1);
-          A.BuiltValueNullFieldError_checkNotNull(t1, _s13_, "events", type$.BuiltList_ExtensionEvent);
-        }
+        if (_$result0 == null)
+          _$result0 = new A._$BatchedEvents(_this.get$events().build$0());
         _$result = _$result0;
       } catch (exception) {
         _$failedField = A._Cell$named("_$failedField");
@@ -23235,7 +23253,7 @@
           _this.get$events().build$0();
         } catch (exception) {
           e = A.unwrapException(exception);
-          t1 = A.BuiltValueNestedFieldError$(_s13_, _$failedField.readLocal$0(), J.toString$0$(e));
+          t1 = A.BuiltValueNestedFieldError$("BatchedEvents", _$failedField.readLocal$0(), J.toString$0$(e));
           throw A.wrapException(t1);
         }
         throw exception;
@@ -23439,19 +23457,17 @@
       return _this;
     },
     _register_event$_build$0() {
-      var t1, t2, t3, t4, _this = this,
+      var t1, t2, _this = this,
         _s13_ = "RegisterEvent",
-        _s9_ = "eventData",
-        _s9_0 = "timestamp",
         _$result = _this._register_event$_$v;
       if (_$result == null) {
-        t1 = type$.String;
-        t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_register_event$_$this()._register_event$_eventData, _s13_, _s9_, t1);
-        t3 = type$.int;
-        t4 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_register_event$_$this()._register_event$_timestamp, _s13_, _s9_0, t3);
-        _$result = new A._$RegisterEvent(t2, t4);
-        A.BuiltValueNullFieldError_checkNotNull(t2, _s13_, _s9_, t1);
-        A.BuiltValueNullFieldError_checkNotNull(t4, _s13_, _s9_0, t3);
+        t1 = _this.get$_register_event$_$this()._register_event$_eventData;
+        if (t1 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s13_, "eventData"));
+        t2 = _this.get$_register_event$_$this()._register_event$_timestamp;
+        if (t2 == null)
+          A.throwExpression(A.BuiltValueNullFieldError$(_s13_, "timestamp"));
+        _$result = new A._$RegisterEvent(t1, t2);
       }
       A.ArgumentError_checkNotNull(_$result, "other", type$.RegisterEvent);
       return _this._register_event$_$v = _$result;
@@ -25841,8 +25857,6 @@
       BuildResult: findType("BuildResult"),
       BuildStatus: findType("BuildStatus"),
       BuiltListMultimap_dynamic_dynamic: findType("BuiltListMultimap<@,@>"),
-      BuiltList_DebugEvent: findType("BuiltList<DebugEvent>"),
-      BuiltList_ExtensionEvent: findType("BuiltList<ExtensionEvent>"),
       BuiltList_dynamic: findType("BuiltList<@>"),
       BuiltList_nullable_Object: findType("BuiltList<Object?>"),
       BuiltMap_dynamic_dynamic: findType("BuiltMap<@,@>"),
diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
index 7b29a7fa3..a0e68d578 100644
--- a/dwds/lib/src/version.dart
+++ b/dwds/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '16.0.1-dev';
+const packageVersion = '16.0.1';
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
index 2a80c3873..9efb97384 100644
--- a/dwds/pubspec.yaml
+++ b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 16.0.1-dev
+version: 16.0.1
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.
diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml
index c3c45c11b..feef0dd39 100644
--- a/webdev/pubspec.yaml
+++ b/webdev/pubspec.yaml
@@ -50,9 +50,9 @@ dev_dependencies:
   webdriver: ^3.0.0
 
 # Comment out before releasing webdev.
-dependency_overrides:
-  dwds:
-    path: ../dwds
+# dependency_overrides:
+#   dwds:
+#     path: ../dwds
 
 executables:
   webdev: