diff --git a/pkg/_macros/CONTRIBUTING.md b/pkg/_macros/CONTRIBUTING.md
index 5c8bf5a955cf..c672c960de91 100644
--- a/pkg/_macros/CONTRIBUTING.md
+++ b/pkg/_macros/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 ## Required steps when updating this package
 
-Whenever any change to the `lib` directory of this package is made, the
+When making any functional change in the `lib` directory of this package, the
 following procedure **must** be followed.
 
 ### Update pubspec/changelog for each release.
@@ -30,6 +30,12 @@ version of this package, during the pre-release period. Version compatibility is
 thus **not** guaranteed on the dev or main channels, only the beta and stable
 channels.
 
+### Bypassing presubmit checks
+
+When making a non-functional change in the `lib` directory, use the
+`--bypass-hooks` flag to bypass presubmit checks, as in
+`git cl upload --bypass-hooks`.
+
 ## Special considerations for this package
 
 This package should generally be treated like a `dart:` library, since only
diff --git a/pkg/_macros/lib/src/api/code.dart b/pkg/_macros/lib/src/api/code.dart
index d7e5a24ddedd..84793ecec270 100644
--- a/pkg/_macros/lib/src/api/code.dart
+++ b/pkg/_macros/lib/src/api/code.dart
@@ -457,7 +457,8 @@ final class TypeParameterCode implements Code {
 }
 
 extension Join<T extends Object> on List<T> {
-  /// Joins all the items in [this] with [separator], and returns a new list.
+  /// Joins all the items in this [Join] with [separator], and returns a new
+  /// list.
   ///
   /// Works on any kind of non-nullable list which accepts String entries, and
   /// does not convert the individual items to strings.
diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.1.expect
index d308fc8c2524..d5fa3a65c71c 100644
--- a/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.1.expect
@@ -49,7 +49,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.2.expect
index 8362ff20d070..a046e3c7afa2 100644
--- a/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.2.expect
@@ -36,7 +36,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.1.expect
index f242c3da554a..e3b30ce86489 100644
--- a/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.1.expect
@@ -49,7 +49,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.2.expect
index f4f30ea20c24..87b29107c666 100644
--- a/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.2.expect
@@ -45,7 +45,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.1.expect
index 03707668ea63..f64acf41c648 100644
--- a/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.1.expect
@@ -69,7 +69,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.2.expect
index c71df823904f..4c958cf7f0d9 100644
--- a/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.2.expect
@@ -84,7 +84,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.1.expect
index 03707668ea63..f64acf41c648 100644
--- a/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.1.expect
@@ -69,7 +69,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.2.expect
index 09674efa184d..b052f0d61726 100644
--- a/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.2.expect
@@ -66,7 +66,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.1.expect
index 1bab1bcca97b..f318eba4c5c2 100644
--- a/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.1.expect
@@ -68,7 +68,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
diff --git a/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.2.expect
index 3f227c0db589..be7f2c5191ef 100644
--- a/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.2.expect
@@ -65,7 +65,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:473:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:474:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)