diff --git a/data/fixtures/scopes/cpp/anonymousFunction.scope b/data/fixtures/scopes/cpp/anonymousFunction.scope
index 34a003480c..44426a869d 100644
--- a/data/fixtures/scopes/cpp/anonymousFunction.scope
+++ b/data/fixtures/scopes/cpp/anonymousFunction.scope
@@ -1,15 +1,10 @@
-[]() {
-    return 0;
-};
+[]() {}
 ---
 
 [Content] =
 [Removal] =
-[Domain] = 0:0-2:1
-  >------
-0| []() {
-1|     return 0;
-2| };
-   -<
+[Domain] = 0:0-0:7
+  >-------<
+0| []() {}
 
 [Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..a74a2e4ade
--- /dev/null
+++ b/data/fixtures/scopes/cpp/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+[](int aaa, int bbb) {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:23
+  >-----------------------<
+0| [](int aaa, int bbb) {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:3-0:19
+     >----------------<
+0| [](int aaa, int bbb) {}
diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..00da09bc76
--- /dev/null
+++ b/data/fixtures/scopes/cpp/name/name.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+[](int aaa, int bbb) {}
+---
+
+[#1 Content] = 0:7-0:10
+         >---<
+0| [](int aaa, int bbb) {}
+
+[#1 Removal] = 0:6-0:10
+        >----<
+0| [](int aaa, int bbb) {}
+
+[#1 Leading delimiter] = 0:6-0:7
+        >-<
+0| [](int aaa, int bbb) {}
+
+[#1 Domain] = 0:3-0:10
+     >-------<
+0| [](int aaa, int bbb) {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:16-0:19
+                  >---<
+0| [](int aaa, int bbb) {}
+
+[#2 Removal] = 0:15-0:19
+                 >----<
+0| [](int aaa, int bbb) {}
+
+[#2 Leading delimiter] = 0:15-0:16
+                 >-<
+0| [](int aaa, int bbb) {}
+
+[#2 Domain] = 0:12-0:19
+              >-------<
+0| [](int aaa, int bbb) {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..a74a2e4ade
--- /dev/null
+++ b/data/fixtures/scopes/cpp/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+[](int aaa, int bbb) {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:23
+  >-----------------------<
+0| [](int aaa, int bbb) {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:3-0:19
+     >----------------<
+0| [](int aaa, int bbb) {}
diff --git a/data/fixtures/scopes/cpp/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..d6ba0b8a11
--- /dev/null
+++ b/data/fixtures/scopes/cpp/type/type.argument.formal.lambda.scope
@@ -0,0 +1,43 @@
+[](int aaa, int bbb) {}
+---
+
+[#1 Content] = 0:3-0:6
+     >---<
+0| [](int aaa, int bbb) {}
+
+[#1 Removal] = 0:3-0:7
+     >----<
+0| [](int aaa, int bbb) {}
+
+[#1 Trailing delimiter] = 0:6-0:7
+        >-<
+0| [](int aaa, int bbb) {}
+
+[#1 Domain] = 0:3-0:10
+     >-------<
+0| [](int aaa, int bbb) {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:12-0:15
+              >---<
+0| [](int aaa, int bbb) {}
+
+[#2 Removal] = 0:12-0:16
+              >----<
+0| [](int aaa, int bbb) {}
+
+[#2 Leading delimiter] = 0:11-0:12
+             >-<
+0| [](int aaa, int bbb) {}
+
+[#2 Trailing delimiter] = 0:15-0:16
+                 >-<
+0| [](int aaa, int bbb) {}
+
+[#2 Domain] = 0:12-0:19
+              >-------<
+0| [](int aaa, int bbb) {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/anonymousFunction.scope b/data/fixtures/scopes/csharp/anonymousFunction.scope
index d8674beeec..6ff2c1d6c3 100644
--- a/data/fixtures/scopes/csharp/anonymousFunction.scope
+++ b/data/fixtures/scopes/csharp/anonymousFunction.scope
@@ -1,10 +1,10 @@
-() => {};
+() => {}
 ---
 
 [Content] =
 [Removal] =
 [Domain] = 0:0-0:8
   >--------<
-0| () => {};
+0| () => {}
 
 [Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..3d9947fc2f
--- /dev/null
+++ b/data/fixtures/scopes/csharp/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(int aaa, int bbb) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:24
+  >------------------------<
+0| (int aaa, int bbb) => {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:17
+   >----------------<
+0| (int aaa, int bbb) => {}
diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..b8a4e10a52
--- /dev/null
+++ b/data/fixtures/scopes/csharp/name/name.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+(int aaa, int bbb) => {}
+---
+
+[#1 Content] = 0:5-0:8
+       >---<
+0| (int aaa, int bbb) => {}
+
+[#1 Removal] = 0:4-0:8
+      >----<
+0| (int aaa, int bbb) => {}
+
+[#1 Leading delimiter] = 0:4-0:5
+      >-<
+0| (int aaa, int bbb) => {}
+
+[#1 Domain] = 0:1-0:8
+   >-------<
+0| (int aaa, int bbb) => {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:14-0:17
+                >---<
+0| (int aaa, int bbb) => {}
+
+[#2 Removal] = 0:13-0:17
+               >----<
+0| (int aaa, int bbb) => {}
+
+[#2 Leading delimiter] = 0:13-0:14
+               >-<
+0| (int aaa, int bbb) => {}
+
+[#2 Domain] = 0:10-0:17
+            >-------<
+0| (int aaa, int bbb) => {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..3d9947fc2f
--- /dev/null
+++ b/data/fixtures/scopes/csharp/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(int aaa, int bbb) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:24
+  >------------------------<
+0| (int aaa, int bbb) => {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:17
+   >----------------<
+0| (int aaa, int bbb) => {}
diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..f3ffceb0e0
--- /dev/null
+++ b/data/fixtures/scopes/csharp/type/type.argument.formal.lambda.scope
@@ -0,0 +1,43 @@
+(int aaa, int bbb) => {}
+---
+
+[#1 Content] = 0:1-0:4
+   >---<
+0| (int aaa, int bbb) => {}
+
+[#1 Removal] = 0:1-0:5
+   >----<
+0| (int aaa, int bbb) => {}
+
+[#1 Trailing delimiter] = 0:4-0:5
+      >-<
+0| (int aaa, int bbb) => {}
+
+[#1 Domain] = 0:1-0:8
+   >-------<
+0| (int aaa, int bbb) => {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:10-0:13
+            >---<
+0| (int aaa, int bbb) => {}
+
+[#2 Removal] = 0:10-0:14
+            >----<
+0| (int aaa, int bbb) => {}
+
+[#2 Leading delimiter] = 0:9-0:10
+           >-<
+0| (int aaa, int bbb) => {}
+
+[#2 Trailing delimiter] = 0:13-0:14
+               >-<
+0| (int aaa, int bbb) => {}
+
+[#2 Domain] = 0:10-0:17
+            >-------<
+0| (int aaa, int bbb) => {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/go/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/go/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..a90621b702
--- /dev/null
+++ b/data/fixtures/scopes/go/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+foo := func(aaa int, bbb int) {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:32
+  >--------------------------------<
+0| foo := func(aaa int, bbb int) {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:12-0:28
+              >----------------<
+0| foo := func(aaa int, bbb int) {}
diff --git a/data/fixtures/scopes/go/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/go/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..e491af1cc6
--- /dev/null
+++ b/data/fixtures/scopes/go/name/name.argument.formal.lambda.scope
@@ -0,0 +1,62 @@
+foo := func(aaa int, bbb int) {}
+---
+
+[#1 Content] = 0:0-0:3
+  >---<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Removal] = 0:0-0:7
+  >-------<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Trailing delimiter] = 0:3-0:4
+     >-<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Domain] = 0:0-0:32
+  >--------------------------------<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:12-0:15
+              >---<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Removal] = 0:12-0:16
+              >----<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Trailing delimiter] = 0:15-0:16
+                 >-<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Domain] = 0:12-0:19
+              >-------<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] = 0:21-0:24
+                       >---<
+0| foo := func(aaa int, bbb int) {}
+
+[#3 Removal] = 0:21-0:25
+                       >----<
+0| foo := func(aaa int, bbb int) {}
+
+[#3 Leading delimiter] = 0:20-0:21
+                      >-<
+0| foo := func(aaa int, bbb int) {}
+
+[#3 Trailing delimiter] = 0:24-0:25
+                          >-<
+0| foo := func(aaa int, bbb int) {}
+
+[#3 Domain] = 0:21-0:28
+                       >-------<
+0| foo := func(aaa int, bbb int) {}
+
+[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/go/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/go/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..a90621b702
--- /dev/null
+++ b/data/fixtures/scopes/go/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+foo := func(aaa int, bbb int) {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:32
+  >--------------------------------<
+0| foo := func(aaa int, bbb int) {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:12-0:28
+              >----------------<
+0| foo := func(aaa int, bbb int) {}
diff --git a/data/fixtures/scopes/go/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/go/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..35599e34ea
--- /dev/null
+++ b/data/fixtures/scopes/go/type/type.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+foo := func(aaa int, bbb int) {}
+---
+
+[#1 Content] = 0:16-0:19
+                  >---<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Removal] = 0:15-0:19
+                 >----<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Leading delimiter] = 0:15-0:16
+                 >-<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Domain] = 0:12-0:19
+              >-------<
+0| foo := func(aaa int, bbb int) {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:25-0:28
+                           >---<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Removal] = 0:24-0:28
+                          >----<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Leading delimiter] = 0:24-0:25
+                          >-<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Domain] = 0:21-0:28
+                       >-------<
+0| foo := func(aaa int, bbb int) {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/java/anonymousFunction.scope b/data/fixtures/scopes/java/anonymousFunction.scope
index 8d87d11a99..ac977f56d5 100644
--- a/data/fixtures/scopes/java/anonymousFunction.scope
+++ b/data/fixtures/scopes/java/anonymousFunction.scope
@@ -1,10 +1,10 @@
-() -> {};
+() -> {}
 ---
 
 [Content] =
 [Removal] =
 [Domain] = 0:0-0:8
   >--------<
-0| () -> {};
+0| () -> {}
 
 [Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/java/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/java/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..ef9491d4d3
--- /dev/null
+++ b/data/fixtures/scopes/java/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(int aaa, int bbb) -> {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:24
+  >------------------------<
+0| (int aaa, int bbb) -> {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:17
+   >----------------<
+0| (int aaa, int bbb) -> {}
diff --git a/data/fixtures/scopes/java/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/java/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..de41f2efb1
--- /dev/null
+++ b/data/fixtures/scopes/java/name/name.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+(int aaa, int bbb) -> {}
+---
+
+[#1 Content] = 0:5-0:8
+       >---<
+0| (int aaa, int bbb) -> {}
+
+[#1 Removal] = 0:4-0:8
+      >----<
+0| (int aaa, int bbb) -> {}
+
+[#1 Leading delimiter] = 0:4-0:5
+      >-<
+0| (int aaa, int bbb) -> {}
+
+[#1 Domain] = 0:1-0:8
+   >-------<
+0| (int aaa, int bbb) -> {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:14-0:17
+                >---<
+0| (int aaa, int bbb) -> {}
+
+[#2 Removal] = 0:13-0:17
+               >----<
+0| (int aaa, int bbb) -> {}
+
+[#2 Leading delimiter] = 0:13-0:14
+               >-<
+0| (int aaa, int bbb) -> {}
+
+[#2 Domain] = 0:10-0:17
+            >-------<
+0| (int aaa, int bbb) -> {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/java/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/java/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..ef9491d4d3
--- /dev/null
+++ b/data/fixtures/scopes/java/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(int aaa, int bbb) -> {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:24
+  >------------------------<
+0| (int aaa, int bbb) -> {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:17
+   >----------------<
+0| (int aaa, int bbb) -> {}
diff --git a/data/fixtures/scopes/java/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/java/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..eb5b42d28f
--- /dev/null
+++ b/data/fixtures/scopes/java/type/type.argument.formal.lambda.scope
@@ -0,0 +1,43 @@
+(int aaa, int bbb) -> {}
+---
+
+[#1 Content] = 0:1-0:4
+   >---<
+0| (int aaa, int bbb) -> {}
+
+[#1 Removal] = 0:1-0:5
+   >----<
+0| (int aaa, int bbb) -> {}
+
+[#1 Trailing delimiter] = 0:4-0:5
+      >-<
+0| (int aaa, int bbb) -> {}
+
+[#1 Domain] = 0:1-0:8
+   >-------<
+0| (int aaa, int bbb) -> {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:10-0:13
+            >---<
+0| (int aaa, int bbb) -> {}
+
+[#2 Removal] = 0:10-0:14
+            >----<
+0| (int aaa, int bbb) -> {}
+
+[#2 Leading delimiter] = 0:9-0:10
+           >-<
+0| (int aaa, int bbb) -> {}
+
+[#2 Trailing delimiter] = 0:13-0:14
+               >-<
+0| (int aaa, int bbb) -> {}
+
+[#2 Domain] = 0:10-0:17
+            >-------<
+0| (int aaa, int bbb) -> {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..eedb9defeb
--- /dev/null
+++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(aaa, bbb) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:16
+  >----------------<
+0| (aaa, bbb) => {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:9
+   >--------<
+0| (aaa, bbb) => {}
diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..e9109ff898
--- /dev/null
+++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.lambda.scope
@@ -0,0 +1,26 @@
+(aaa, bbb) => {}
+---
+
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 0:1-0:4
+   >---<
+0| (aaa, bbb) => {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Domain] = 0:6-0:9
+        >---<
+0| (aaa, bbb) => {}
+
+[#2 Removal] = 0:5-0:9
+       >----<
+0| (aaa, bbb) => {}
+
+[#2 Leading delimiter] = 0:5-0:6
+       >-<
+0| (aaa, bbb) => {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.iteration.scope
index 11a8eddbfb..67eeeff3d3 100644
--- a/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.iteration.scope
+++ b/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.iteration.scope
@@ -1,10 +1,10 @@
-{ aaa, bbb -> }
+{aaa, bbb -> }
 ---
 
-[Content] = 0:2-0:10
-    >--------<
-0| { aaa, bbb -> }
+[Content] = 0:1-0:9
+   >--------<
+0| {aaa, bbb -> }
 
-[Domain] = 0:0-0:15
-  >---------------<
-0| { aaa, bbb -> }
+[Domain] = 0:0-0:14
+  >--------------<
+0| {aaa, bbb -> }
diff --git a/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.singleLine.scope
index ec0eef877e..8b42e29773 100644
--- a/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.singleLine.scope
+++ b/data/fixtures/scopes/kotlin/argument/argument.formal.lambda.singleLine.scope
@@ -1,33 +1,33 @@
-{ aaa, bbb -> }
+{aaa, bbb -> }
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:2-0:5
-    >---<
-0| { aaa, bbb -> }
+[#1 Domain] = 0:1-0:4
+   >---<
+0| {aaa, bbb -> }
 
-[#1 Removal] = 0:2-0:7
-    >-----<
-0| { aaa, bbb -> }
+[#1 Removal] = 0:1-0:6
+   >-----<
+0| {aaa, bbb -> }
 
-[#1 Trailing delimiter] = 0:5-0:7
-       >--<
-0| { aaa, bbb -> }
+[#1 Trailing delimiter] = 0:4-0:6
+      >--<
+0| {aaa, bbb -> }
 
 [#1 Insertion delimiter] = ", "
 
 
 [#2 Content] =
-[#2 Domain] = 0:7-0:10
-         >---<
-0| { aaa, bbb -> }
+[#2 Domain] = 0:6-0:9
+        >---<
+0| {aaa, bbb -> }
 
-[#2 Removal] = 0:5-0:10
-       >-----<
-0| { aaa, bbb -> }
+[#2 Removal] = 0:4-0:9
+      >-----<
+0| {aaa, bbb -> }
 
-[#2 Leading delimiter] = 0:5-0:7
-       >--<
-0| { aaa, bbb -> }
+[#2 Leading delimiter] = 0:4-0:6
+      >--<
+0| {aaa, bbb -> }
 
 [#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/kotlin/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/kotlin/argumentList/argumentList.formal.lambda.singleLine.scope
index 37f9417c86..fdec9f83f6 100644
--- a/data/fixtures/scopes/kotlin/argumentList/argumentList.formal.lambda.singleLine.scope
+++ b/data/fixtures/scopes/kotlin/argumentList/argumentList.formal.lambda.singleLine.scope
@@ -1,24 +1,20 @@
-{ aaa, bbb -> }
+{aaa, bbb -> }
 ---
 
-[Content] = 0:2-0:10
-    >--------<
-0| { aaa, bbb -> }
+[Content] = 0:1-0:9
+   >--------<
+0| {aaa, bbb -> }
 
-[Removal] = 0:2-0:11
-    >---------<
-0| { aaa, bbb -> }
+[Removal] = 0:1-0:10
+   >---------<
+0| {aaa, bbb -> }
 
-[Leading delimiter] = 0:1-0:2
-   >-<
-0| { aaa, bbb -> }
+[Trailing delimiter] = 0:9-0:10
+           >-<
+0| {aaa, bbb -> }
 
-[Trailing delimiter] = 0:10-0:11
-            >-<
-0| { aaa, bbb -> }
-
-[Domain] = 0:0-0:15
-  >---------------<
-0| { aaa, bbb -> }
+[Domain] = 0:0-0:14
+  >--------------<
+0| {aaa, bbb -> }
 
 [Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/kotlin/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/kotlin/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..397cf9615c
--- /dev/null
+++ b/data/fixtures/scopes/kotlin/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+{aaa: Int, bbb: Int -> }
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:24
+  >------------------------<
+0| {aaa: Int, bbb: Int -> }
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:19
+   >------------------<
+0| {aaa: Int, bbb: Int -> }
diff --git a/data/fixtures/scopes/kotlin/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/kotlin/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..1f6828a14a
--- /dev/null
+++ b/data/fixtures/scopes/kotlin/name/name.argument.formal.lambda.scope
@@ -0,0 +1,32 @@
+{aaa: Int, bbb: Int -> }
+---
+
+[#1 Content] =
+[#1 Removal] = 0:1-0:4
+   >---<
+0| {aaa: Int, bbb: Int -> }
+
+[#1 Domain] = 0:1-0:9
+   >--------<
+0| {aaa: Int, bbb: Int -> }
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:11-0:14
+             >---<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Removal] = 0:10-0:14
+            >----<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Leading delimiter] = 0:10-0:11
+            >-<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Domain] = 0:11-0:19
+             >--------<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/kotlin/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/kotlin/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..397cf9615c
--- /dev/null
+++ b/data/fixtures/scopes/kotlin/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+{aaa: Int, bbb: Int -> }
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:24
+  >------------------------<
+0| {aaa: Int, bbb: Int -> }
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:19
+   >------------------<
+0| {aaa: Int, bbb: Int -> }
diff --git a/data/fixtures/scopes/kotlin/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/kotlin/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..e6995406fe
--- /dev/null
+++ b/data/fixtures/scopes/kotlin/type/type.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+{aaa: Int, bbb: Int -> }
+---
+
+[#1 Content] = 0:6-0:9
+        >---<
+0| {aaa: Int, bbb: Int -> }
+
+[#1 Removal] = 0:4-0:9
+      >-----<
+0| {aaa: Int, bbb: Int -> }
+
+[#1 Leading delimiter] = 0:4-0:6
+      >--<
+0| {aaa: Int, bbb: Int -> }
+
+[#1 Domain] = 0:1-0:9
+   >--------<
+0| {aaa: Int, bbb: Int -> }
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:16-0:19
+                  >---<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Removal] = 0:14-0:19
+                >-----<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Leading delimiter] = 0:14-0:16
+                >--<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Domain] = 0:11-0:19
+             >--------<
+0| {aaa: Int, bbb: Int -> }
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/lua/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/lua/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..0e6f4c370c
--- /dev/null
+++ b/data/fixtures/scopes/lua/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+f = function(aaa, bbb) end
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:26
+  >--------------------------<
+0| f = function(aaa, bbb) end
+
+
+[#2 Content] =
+[#2 Domain] = 0:13-0:21
+               >--------<
+0| f = function(aaa, bbb) end
diff --git a/data/fixtures/scopes/lua/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/lua/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..c6b1675b7b
--- /dev/null
+++ b/data/fixtures/scopes/lua/name/name.argument.formal.lambda.scope
@@ -0,0 +1,45 @@
+f = function(aaa, bbb) end
+---
+
+[#1 Content] = 0:0-0:1
+  >-<
+0| f = function(aaa, bbb) end
+
+[#1 Removal] = 0:0-0:4
+  >----<
+0| f = function(aaa, bbb) end
+
+[#1 Trailing delimiter] = 0:1-0:4
+   >---<
+0| f = function(aaa, bbb) end
+
+[#1 Domain] = 0:0-0:26
+  >--------------------------<
+0| f = function(aaa, bbb) end
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 0:13-0:16
+               >---<
+0| f = function(aaa, bbb) end
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Domain] = 0:18-0:21
+                    >---<
+0| f = function(aaa, bbb) end
+
+[#3 Removal] = 0:17-0:21
+                   >----<
+0| f = function(aaa, bbb) end
+
+[#3 Leading delimiter] = 0:17-0:18
+                   >-<
+0| f = function(aaa, bbb) end
+
+[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..a0dc96a0f5
--- /dev/null
+++ b/data/fixtures/scopes/python/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+lambda aaa, bbb: pass
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:21
+  >---------------------<
+0| lambda aaa, bbb: pass
+
+
+[#2 Content] =
+[#2 Domain] = 0:7-0:15
+         >--------<
+0| lambda aaa, bbb: pass
diff --git a/data/fixtures/scopes/python/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/python/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..92d95b6b02
--- /dev/null
+++ b/data/fixtures/scopes/python/name/name.argument.formal.lambda.scope
@@ -0,0 +1,33 @@
+lambda aaa, bbb: pass
+---
+
+[#1 Content] =
+[#1 Domain] = 0:7-0:10
+         >---<
+0| lambda aaa, bbb: pass
+
+[#1 Removal] = 0:6-0:10
+        >----<
+0| lambda aaa, bbb: pass
+
+[#1 Leading delimiter] = 0:6-0:7
+        >-<
+0| lambda aaa, bbb: pass
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Domain] = 0:12-0:15
+              >---<
+0| lambda aaa, bbb: pass
+
+[#2 Removal] = 0:11-0:15
+             >----<
+0| lambda aaa, bbb: pass
+
+[#2 Leading delimiter] = 0:11-0:12
+             >-<
+0| lambda aaa, bbb: pass
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/name/name.resource.iteration.scope b/data/fixtures/scopes/python/name/name.resource.iteration.scope
deleted file mode 100644
index b014dd3e66..0000000000
--- a/data/fixtures/scopes/python/name/name.resource.iteration.scope
+++ /dev/null
@@ -1,16 +0,0 @@
-with foo, bar as baz: pass
----
-
-[#1 Content] = 0:5-0:20
-       >---------------<
-0| with foo, bar as baz: pass
-
-[#1 Domain] = 0:0-0:26
-  >--------------------------<
-0| with foo, bar as baz: pass
-
-
-[#2 Content] =
-[#2 Domain] = 0:22-0:26
-                        >----<
-0| with foo, bar as baz: pass
diff --git a/data/fixtures/scopes/python/name/name.resource.scope b/data/fixtures/scopes/python/name/name.resource.scope
index 42704cdf14..ee9ef4e50f 100644
--- a/data/fixtures/scopes/python/name/name.resource.scope
+++ b/data/fixtures/scopes/python/name/name.resource.scope
@@ -1,20 +1,20 @@
-with foo as bar: pass
+with foo: pass
 ---
 
-[Content] = 0:12-0:15
-              >---<
-0| with foo as bar: pass
+[Content] = 0:5-0:8
+       >---<
+0| with foo: pass
 
-[Removal] = 0:8-0:15
-          >-------<
-0| with foo as bar: pass
+[Removal] = 0:4-0:8
+      >----<
+0| with foo: pass
 
-[Leading delimiter] = 0:8-0:12
-          >----<
-0| with foo as bar: pass
+[Leading delimiter] = 0:4-0:5
+      >-<
+0| with foo: pass
 
-[Domain] = 0:0-0:21
-  >---------------------<
-0| with foo as bar: pass
+[Domain] = 0:0-0:14
+  >--------------<
+0| with foo: pass
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/name/name.resource2.scope b/data/fixtures/scopes/python/name/name.resource2.scope
deleted file mode 100644
index bb2a8a74ce..0000000000
--- a/data/fixtures/scopes/python/name/name.resource2.scope
+++ /dev/null
@@ -1,69 +0,0 @@
-with foo, bar as baz: pass
----
-
-[#1.1 Content] = 0:5-0:8
-       >---<
-0| with foo, bar as baz: pass
-
-[#1.1 Removal] = 0:5-0:10
-       >-----<
-0| with foo, bar as baz: pass
-
-[#1.1 Trailing delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar as baz: pass
-
-[#1.1 Insertion delimiter] = " "
-
-[#1.2 Content] = 0:17-0:20
-                   >---<
-0| with foo, bar as baz: pass
-
-[#1.2 Removal] = 0:13-0:20
-               >-------<
-0| with foo, bar as baz: pass
-
-[#1.2 Leading delimiter] = 0:13-0:17
-               >----<
-0| with foo, bar as baz: pass
-
-[#1.2 Insertion delimiter] = " "
-
-[#1 Domain] = 0:0-0:26
-  >--------------------------<
-0| with foo, bar as baz: pass
-
-
-[#2 Content] =
-[#2 Domain] = 0:5-0:8
-       >---<
-0| with foo, bar as baz: pass
-
-[#2 Removal] = 0:5-0:10
-       >-----<
-0| with foo, bar as baz: pass
-
-[#2 Trailing delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar as baz: pass
-
-[#2 Insertion delimiter] = " "
-
-
-[#3 Content] = 0:17-0:20
-                   >---<
-0| with foo, bar as baz: pass
-
-[#3 Removal] = 0:13-0:20
-               >-------<
-0| with foo, bar as baz: pass
-
-[#3 Leading delimiter] = 0:13-0:17
-               >----<
-0| with foo, bar as baz: pass
-
-[#3 Domain] = 0:10-0:20
-            >----------<
-0| with foo, bar as baz: pass
-
-[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/name/name.resource3.scope b/data/fixtures/scopes/python/name/name.resource3.scope
deleted file mode 100644
index 2839bb93ae..0000000000
--- a/data/fixtures/scopes/python/name/name.resource3.scope
+++ /dev/null
@@ -1,72 +0,0 @@
-with foo as bar, baz as bongo: pass
----
-
-[#1.1 Content] = 0:12-0:15
-              >---<
-0| with foo as bar, baz as bongo: pass
-
-[#1.1 Removal] = 0:8-0:15
-          >-------<
-0| with foo as bar, baz as bongo: pass
-
-[#1.1 Leading delimiter] = 0:8-0:12
-          >----<
-0| with foo as bar, baz as bongo: pass
-
-[#1.1 Insertion delimiter] = " "
-
-[#1.2 Content] = 0:24-0:29
-                          >-----<
-0| with foo as bar, baz as bongo: pass
-
-[#1.2 Removal] = 0:20-0:29
-                      >---------<
-0| with foo as bar, baz as bongo: pass
-
-[#1.2 Leading delimiter] = 0:20-0:24
-                      >----<
-0| with foo as bar, baz as bongo: pass
-
-[#1.2 Insertion delimiter] = " "
-
-[#1 Domain] = 0:0-0:35
-  >-----------------------------------<
-0| with foo as bar, baz as bongo: pass
-
-
-[#2 Content] = 0:12-0:15
-              >---<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Removal] = 0:8-0:15
-          >-------<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Leading delimiter] = 0:8-0:12
-          >----<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Domain] = 0:5-0:15
-       >----------<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Insertion delimiter] = " "
-
-
-[#3 Content] = 0:24-0:29
-                          >-----<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Removal] = 0:20-0:29
-                      >---------<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Leading delimiter] = 0:20-0:24
-                      >----<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Domain] = 0:17-0:29
-                   >------------<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/value/value.resource.iteration.scope b/data/fixtures/scopes/python/value/value.resource.iteration.scope
deleted file mode 100644
index b014dd3e66..0000000000
--- a/data/fixtures/scopes/python/value/value.resource.iteration.scope
+++ /dev/null
@@ -1,16 +0,0 @@
-with foo, bar as baz: pass
----
-
-[#1 Content] = 0:5-0:20
-       >---------------<
-0| with foo, bar as baz: pass
-
-[#1 Domain] = 0:0-0:26
-  >--------------------------<
-0| with foo, bar as baz: pass
-
-
-[#2 Content] =
-[#2 Domain] = 0:22-0:26
-                        >----<
-0| with foo, bar as baz: pass
diff --git a/data/fixtures/scopes/python/value/value.resource.iteration2.scope b/data/fixtures/scopes/python/value/value.resource.iteration2.scope
deleted file mode 100644
index 3abf031d3c..0000000000
--- a/data/fixtures/scopes/python/value/value.resource.iteration2.scope
+++ /dev/null
@@ -1,16 +0,0 @@
-with foo: pass
----
-
-[#1 Content] = 0:5-0:8
-       >---<
-0| with foo: pass
-
-[#1 Domain] = 0:0-0:14
-  >--------------<
-0| with foo: pass
-
-
-[#2 Content] =
-[#2 Domain] = 0:10-0:14
-            >----<
-0| with foo: pass
diff --git a/data/fixtures/scopes/python/value/value.resource.scope b/data/fixtures/scopes/python/value/value.resource.scope
deleted file mode 100644
index ee9ef4e50f..0000000000
--- a/data/fixtures/scopes/python/value/value.resource.scope
+++ /dev/null
@@ -1,20 +0,0 @@
-with foo: pass
----
-
-[Content] = 0:5-0:8
-       >---<
-0| with foo: pass
-
-[Removal] = 0:4-0:8
-      >----<
-0| with foo: pass
-
-[Leading delimiter] = 0:4-0:5
-      >-<
-0| with foo: pass
-
-[Domain] = 0:0-0:14
-  >--------------<
-0| with foo: pass
-
-[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/value/value.resource2.scope b/data/fixtures/scopes/python/value/value.resource2.scope
deleted file mode 100644
index d4b503f4bb..0000000000
--- a/data/fixtures/scopes/python/value/value.resource2.scope
+++ /dev/null
@@ -1,66 +0,0 @@
-with foo, bar: pass
----
-
-[#1.1 Content] = 0:5-0:8
-       >---<
-0| with foo, bar: pass
-
-[#1.1 Removal] = 0:5-0:10
-       >-----<
-0| with foo, bar: pass
-
-[#1.1 Trailing delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar: pass
-
-[#1.1 Insertion delimiter] = " "
-
-[#1.2 Content] = 0:10-0:13
-            >---<
-0| with foo, bar: pass
-
-[#1.2 Removal] = 0:8-0:13
-          >-----<
-0| with foo, bar: pass
-
-[#1.2 Leading delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar: pass
-
-[#1.2 Insertion delimiter] = " "
-
-[#1 Domain] = 0:0-0:19
-  >-------------------<
-0| with foo, bar: pass
-
-
-[#2 Content] =
-[#2 Domain] = 0:5-0:8
-       >---<
-0| with foo, bar: pass
-
-[#2 Removal] = 0:5-0:10
-       >-----<
-0| with foo, bar: pass
-
-[#2 Trailing delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar: pass
-
-[#2 Insertion delimiter] = " "
-
-
-[#3 Content] =
-[#3 Domain] = 0:10-0:13
-            >---<
-0| with foo, bar: pass
-
-[#3 Removal] = 0:8-0:13
-          >-----<
-0| with foo, bar: pass
-
-[#3 Leading delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar: pass
-
-[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/value/value.resource3.scope b/data/fixtures/scopes/python/value/value.resource3.scope
deleted file mode 100644
index 5cd902a7a0..0000000000
--- a/data/fixtures/scopes/python/value/value.resource3.scope
+++ /dev/null
@@ -1,20 +0,0 @@
-with foo as bar: pass
----
-
-[Content] = 0:5-0:8
-       >---<
-0| with foo as bar: pass
-
-[Removal] = 0:5-0:12
-       >-------<
-0| with foo as bar: pass
-
-[Trailing delimiter] = 0:8-0:12
-          >----<
-0| with foo as bar: pass
-
-[Domain] = 0:0-0:21
-  >---------------------<
-0| with foo as bar: pass
-
-[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/value/value.resource4.scope b/data/fixtures/scopes/python/value/value.resource4.scope
deleted file mode 100644
index 71263b9c03..0000000000
--- a/data/fixtures/scopes/python/value/value.resource4.scope
+++ /dev/null
@@ -1,69 +0,0 @@
-with foo, bar as baz: pass
----
-
-[#1.1 Content] = 0:5-0:8
-       >---<
-0| with foo, bar as baz: pass
-
-[#1.1 Removal] = 0:5-0:10
-       >-----<
-0| with foo, bar as baz: pass
-
-[#1.1 Trailing delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar as baz: pass
-
-[#1.1 Insertion delimiter] = " "
-
-[#1.2 Content] = 0:10-0:13
-            >---<
-0| with foo, bar as baz: pass
-
-[#1.2 Removal] = 0:10-0:17
-            >-------<
-0| with foo, bar as baz: pass
-
-[#1.2 Trailing delimiter] = 0:13-0:17
-               >----<
-0| with foo, bar as baz: pass
-
-[#1.2 Insertion delimiter] = " "
-
-[#1 Domain] = 0:0-0:26
-  >--------------------------<
-0| with foo, bar as baz: pass
-
-
-[#2 Content] =
-[#2 Domain] = 0:5-0:8
-       >---<
-0| with foo, bar as baz: pass
-
-[#2 Removal] = 0:5-0:10
-       >-----<
-0| with foo, bar as baz: pass
-
-[#2 Trailing delimiter] = 0:8-0:10
-          >--<
-0| with foo, bar as baz: pass
-
-[#2 Insertion delimiter] = " "
-
-
-[#3 Content] = 0:10-0:13
-            >---<
-0| with foo, bar as baz: pass
-
-[#3 Removal] = 0:10-0:17
-            >-------<
-0| with foo, bar as baz: pass
-
-[#3 Trailing delimiter] = 0:13-0:17
-               >----<
-0| with foo, bar as baz: pass
-
-[#3 Domain] = 0:10-0:20
-            >----------<
-0| with foo, bar as baz: pass
-
-[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/value/value.resource5.scope b/data/fixtures/scopes/python/value/value.resource5.scope
deleted file mode 100644
index 947d75fc49..0000000000
--- a/data/fixtures/scopes/python/value/value.resource5.scope
+++ /dev/null
@@ -1,72 +0,0 @@
-with foo as bar, baz as bongo: pass
----
-
-[#1.1 Content] = 0:5-0:8
-       >---<
-0| with foo as bar, baz as bongo: pass
-
-[#1.1 Removal] = 0:5-0:12
-       >-------<
-0| with foo as bar, baz as bongo: pass
-
-[#1.1 Trailing delimiter] = 0:8-0:12
-          >----<
-0| with foo as bar, baz as bongo: pass
-
-[#1.1 Insertion delimiter] = " "
-
-[#1.2 Content] = 0:17-0:20
-                   >---<
-0| with foo as bar, baz as bongo: pass
-
-[#1.2 Removal] = 0:17-0:24
-                   >-------<
-0| with foo as bar, baz as bongo: pass
-
-[#1.2 Trailing delimiter] = 0:20-0:24
-                      >----<
-0| with foo as bar, baz as bongo: pass
-
-[#1.2 Insertion delimiter] = " "
-
-[#1 Domain] = 0:0-0:35
-  >-----------------------------------<
-0| with foo as bar, baz as bongo: pass
-
-
-[#2 Content] = 0:5-0:8
-       >---<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Removal] = 0:5-0:12
-       >-------<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Trailing delimiter] = 0:8-0:12
-          >----<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Domain] = 0:5-0:15
-       >----------<
-0| with foo as bar, baz as bongo: pass
-
-[#2 Insertion delimiter] = " "
-
-
-[#3 Content] = 0:17-0:20
-                   >---<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Removal] = 0:17-0:24
-                   >-------<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Trailing delimiter] = 0:20-0:24
-                      >----<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Domain] = 0:17-0:29
-                   >------------<
-0| with foo as bar, baz as bongo: pass
-
-[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/rust/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/rust/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..5914d3a8ce
--- /dev/null
+++ b/data/fixtures/scopes/rust/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+|aaa: i32, bbb: i32| {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:23
+  >-----------------------<
+0| |aaa: i32, bbb: i32| {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:19
+   >------------------<
+0| |aaa: i32, bbb: i32| {}
diff --git a/data/fixtures/scopes/rust/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/rust/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..6c8d57a6fb
--- /dev/null
+++ b/data/fixtures/scopes/rust/name/name.argument.formal.lambda.scope
@@ -0,0 +1,32 @@
+|aaa: i32, bbb: i32| {}
+---
+
+[#1 Content] =
+[#1 Removal] = 0:1-0:4
+   >---<
+0| |aaa: i32, bbb: i32| {}
+
+[#1 Domain] = 0:1-0:9
+   >--------<
+0| |aaa: i32, bbb: i32| {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:11-0:14
+             >---<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Removal] = 0:10-0:14
+            >----<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Leading delimiter] = 0:10-0:11
+            >-<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Domain] = 0:11-0:19
+             >--------<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/rust/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/rust/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..5914d3a8ce
--- /dev/null
+++ b/data/fixtures/scopes/rust/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+|aaa: i32, bbb: i32| {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:23
+  >-----------------------<
+0| |aaa: i32, bbb: i32| {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:19
+   >------------------<
+0| |aaa: i32, bbb: i32| {}
diff --git a/data/fixtures/scopes/rust/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/rust/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..f876a766ba
--- /dev/null
+++ b/data/fixtures/scopes/rust/type/type.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+|aaa: i32, bbb: i32| {}
+---
+
+[#1 Content] = 0:6-0:9
+        >---<
+0| |aaa: i32, bbb: i32| {}
+
+[#1 Removal] = 0:4-0:9
+      >-----<
+0| |aaa: i32, bbb: i32| {}
+
+[#1 Leading delimiter] = 0:4-0:6
+      >--<
+0| |aaa: i32, bbb: i32| {}
+
+[#1 Domain] = 0:1-0:9
+   >--------<
+0| |aaa: i32, bbb: i32| {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:16-0:19
+                  >---<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Removal] = 0:14-0:19
+                >-----<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Leading delimiter] = 0:14-0:16
+                >--<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Domain] = 0:11-0:19
+             >--------<
+0| |aaa: i32, bbb: i32| {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/scala/name/name.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/scala/name/name.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..bb50e00a92
--- /dev/null
+++ b/data/fixtures/scopes/scala/name/name.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(aaa: Int, bbb: Int) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:26
+  >--------------------------<
+0| (aaa: Int, bbb: Int) => {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:19
+   >------------------<
+0| (aaa: Int, bbb: Int) => {}
diff --git a/data/fixtures/scopes/scala/name/name.argument.formal.lambda.scope b/data/fixtures/scopes/scala/name/name.argument.formal.lambda.scope
new file mode 100644
index 0000000000..a7a8dae84b
--- /dev/null
+++ b/data/fixtures/scopes/scala/name/name.argument.formal.lambda.scope
@@ -0,0 +1,32 @@
+(aaa: Int, bbb: Int) => {}
+---
+
+[#1 Content] =
+[#1 Removal] = 0:1-0:4
+   >---<
+0| (aaa: Int, bbb: Int) => {}
+
+[#1 Domain] = 0:1-0:9
+   >--------<
+0| (aaa: Int, bbb: Int) => {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:11-0:14
+             >---<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Removal] = 0:10-0:14
+            >----<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Leading delimiter] = 0:10-0:11
+            >-<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Domain] = 0:11-0:19
+             >--------<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/scala/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/scala/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..bb50e00a92
--- /dev/null
+++ b/data/fixtures/scopes/scala/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(aaa: Int, bbb: Int) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:26
+  >--------------------------<
+0| (aaa: Int, bbb: Int) => {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:19
+   >------------------<
+0| (aaa: Int, bbb: Int) => {}
diff --git a/data/fixtures/scopes/scala/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/scala/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..a5dbc68da0
--- /dev/null
+++ b/data/fixtures/scopes/scala/type/type.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+(aaa: Int, bbb: Int) => {}
+---
+
+[#1 Content] = 0:6-0:9
+        >---<
+0| (aaa: Int, bbb: Int) => {}
+
+[#1 Removal] = 0:4-0:9
+      >-----<
+0| (aaa: Int, bbb: Int) => {}
+
+[#1 Leading delimiter] = 0:4-0:6
+      >--<
+0| (aaa: Int, bbb: Int) => {}
+
+[#1 Domain] = 0:1-0:9
+   >--------<
+0| (aaa: Int, bbb: Int) => {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:16-0:19
+                  >---<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Removal] = 0:14-0:19
+                >-----<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Leading delimiter] = 0:14-0:16
+                >--<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Domain] = 0:11-0:19
+             >--------<
+0| (aaa: Int, bbb: Int) => {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.lambda.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.lambda.iteration.scope
new file mode 100644
index 0000000000..eff79d2e36
--- /dev/null
+++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.lambda.iteration.scope
@@ -0,0 +1,13 @@
+(aaa: number, bbb: number) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:32
+  >--------------------------------<
+0| (aaa: number, bbb: number) => {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:1-0:25
+   >------------------------<
+0| (aaa: number, bbb: number) => {}
diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.lambda.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.lambda.scope
new file mode 100644
index 0000000000..bf0b332a2e
--- /dev/null
+++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.lambda.scope
@@ -0,0 +1,39 @@
+(aaa: number, bbb: number) => {}
+---
+
+[#1 Content] = 0:6-0:12
+        >------<
+0| (aaa: number, bbb: number) => {}
+
+[#1 Removal] = 0:4-0:12
+      >--------<
+0| (aaa: number, bbb: number) => {}
+
+[#1 Leading delimiter] = 0:4-0:6
+      >--<
+0| (aaa: number, bbb: number) => {}
+
+[#1 Domain] = 0:1-0:12
+   >-----------<
+0| (aaa: number, bbb: number) => {}
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 0:19-0:25
+                     >------<
+0| (aaa: number, bbb: number) => {}
+
+[#2 Removal] = 0:17-0:25
+                   >--------<
+0| (aaa: number, bbb: number) => {}
+
+[#2 Leading delimiter] = 0:17-0:19
+                   >--<
+0| (aaa: number, bbb: number) => {}
+
+[#2 Domain] = 0:14-0:25
+                >-----------<
+0| (aaa: number, bbb: number) => {}
+
+[#2 Insertion delimiter] = " "
diff --git a/data/scopeSupportFacetInfos.md b/data/scopeSupportFacetInfos.md
index 0a301b5836..6098f1f0cc 100644
--- a/data/scopeSupportFacetInfos.md
+++ b/data/scopeSupportFacetInfos.md
@@ -223,14 +223,16 @@
 ### name
 
 - `name.argument.actual` Name of a (keyword) argument in a function call
-- `name.argument.actual.iteration` Iteration scope for names of (keyword) arguments in a function call: the argument list..
+- `name.argument.actual.iteration` Iteration scope for names of (keyword) arguments in a function call: the argument list.
 - `name.argument.catch` Name of a parameter in a catch clause
 - `name.argument.formal` Name of a parameter in a function declaration
 - `name.argument.formal.constructor` The name of a parameter in a constructor declaration
-- `name.argument.formal.constructor.iteration` Iteration scope for names of formal parameters in a constructor declaration: the parameters list. The domain should be the entire constructor.
-- `name.argument.formal.iteration` Iteration scope for names of formal parameters in a function declaration: the parameters list. The domain should be the entire function.
+- `name.argument.formal.constructor.iteration` Iteration scope for names of formal parameters in a constructor declaration: the parameters list.
+- `name.argument.formal.iteration` Iteration scope for names of formal parameters in a function declaration: the parameters list.
+- `name.argument.formal.lambda` Name of a parameter in a lambda declaration
+- `name.argument.formal.lambda.iteration` Iteration scope for names of formal parameters in a lambda declaration: the parameters list.
 - `name.argument.formal.method` Name of a parameter in a class method declaration
-- `name.argument.formal.method.iteration` Iteration scope for names of formal parameters in a method declaration: the parameters list. The domain should be the entire method.
+- `name.argument.formal.method.iteration` Iteration scope for names of formal parameters in a method declaration: the parameters list.
 - `name.assignment` Name (LHS) of an assignment
 - `name.assignment.compound` Name (LHS) of a compound assignment, eg +=/-=
 - `name.assignment.destructuring` LHS of an assignment with pattern destructuring
@@ -253,7 +255,6 @@
 - `name.method` Name of a class method
 - `name.namespace` Name of a namespace
 - `name.resource` Name in a 'with' / 'use' / 'using' statement
-- `name.resource.iteration` Iteration scope for names in a 'with' / 'use' / 'using' statement: the resource list. The domain should be the entire statement.
 - `name.typeAlias` Name of a type alias
 - `name.variable.destructuring` Name (LHS) of a variable declaration with pattern destructuring
 - `name.variable.initialized` Name (LHS) of an initialized variable declaration
@@ -381,10 +382,12 @@
 - `type.argument.catch` Type of a parameter in a catch clause
 - `type.argument.formal` Type of a formal parameter in a function declaration
 - `type.argument.formal.constructor` Type of a formal parameter in a constructor declaration
-- `type.argument.formal.constructor.iteration` Iteration scope for types of formal parameters in a constructor declaration: the parameters list. The domain should be the entire constructor.
-- `type.argument.formal.iteration` Iteration scope for types of formal parameters in a function declaration: the parameters list. The domain should be the entire function.
+- `type.argument.formal.constructor.iteration` Iteration scope for types of formal parameters in a constructor declaration: the parameters list.
+- `type.argument.formal.iteration` Iteration scope for types of formal parameters in a function declaration: the parameters list.
+- `type.argument.formal.lambda` Type of a formal parameter in a lambda declaration
+- `type.argument.formal.lambda.iteration` Iteration scope for types of formal parameters in a lambda declaration: the parameters list.
 - `type.argument.formal.method` Type of a formal parameter in a class method declaration
-- `type.argument.formal.method.iteration` Iteration scope for types of formal parameters in a method declaration: the parameters list. The domain should be the entire method.
+- `type.argument.formal.method.iteration` Iteration scope for types of formal parameters in a method declaration: the parameters list.
 - `type.cast` A type cast
 - `type.class` A class declaration
 - `type.constant` Type of a constant declaration
@@ -398,7 +401,6 @@
 - `type.iteration.document` Iteration scope for types: the entire document including leading and trailing empty lines.
 - `type.iteration.interface` Iteration scope for types: interface bodies.
 - `type.resource` Type in a 'with' / 'use' / 'using' statement
-- `type.resource.iteration` Iteration scope for types in a 'with' / 'use' / 'using' statement: the resource list. The domain should be the entire statement.
 - `type.return` Type of a return value in a function declaration
 - `type.return.method` Type of a return value in a method declaration
 - `type.typeArgument` Type argument to a generic / parametrized type
@@ -417,13 +419,13 @@
 ### value
 
 - `value.argument.actual` The value of a (keyword) argument in a function call
-- `value.argument.actual.iteration` Iteration scope for values of (keyword) arguments in a function call: the arguments list..
+- `value.argument.actual.iteration` Iteration scope for values of (keyword) arguments in a function call: the arguments list.
 - `value.argument.formal` The value of a (keyword) argument in a function declaration
 - `value.argument.formal.constructor` The value of a parameter in a constructor declaration
-- `value.argument.formal.constructor.iteration` Iteration scope for values of formal parameters in a constructor declaration: the parameters list. The domain should be the entire constructor.
-- `value.argument.formal.iteration` Iteration scope for values of formal parameters in a function declaration: the parameters list. The domain should be the entire function.
+- `value.argument.formal.constructor.iteration` Iteration scope for values of formal parameters in a constructor declaration: the parameters list.
+- `value.argument.formal.iteration` Iteration scope for values of formal parameters in a function declaration: the parameters list.
 - `value.argument.formal.method` The value of a parameter in a class method declaration
-- `value.argument.formal.method.iteration` Iteration scope for values of formal parameters in a method declaration: the parameters list. The domain should be the entire method.
+- `value.argument.formal.method.iteration` Iteration scope for values of formal parameters in a method declaration: the parameters list.
 - `value.assignment` Value (RHS) of an assignment
 - `value.assignment.compound` Value (RHS) of a compound assignment, eg +=/-=
 - `value.assignment.destructuring` Value (RHS) of an assignment with pattern destructuring
@@ -441,7 +443,6 @@
 - `value.mapPair` Value (RHS) of a key-value pair in a map
 - `value.mapPair.iteration` Iteration scope for values of key-value pairs in a map: should be between the braces.
 - `value.resource` Value of a 'with' / 'use' / 'using' statement
-- `value.resource.iteration` Iteration scope for values in a 'with' / 'use' / 'using' statement: the resource list. The domain should be the entire statement.
 - `value.return` Return value of a function
 - `value.return.lambda` Implicit return value from a lambda
 - `value.switch` The value / subject of a switch statement
diff --git a/packages/common/src/scopeSupportFacets/c.ts b/packages/common/src/scopeSupportFacets/c.ts
index 27a5f23fb9..0641842f04 100644
--- a/packages/common/src/scopeSupportFacets/c.ts
+++ b/packages/common/src/scopeSupportFacets/c.ts
@@ -166,11 +166,8 @@ export const cCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Map literal
   map: notApplicable,
@@ -281,6 +278,10 @@ export const cScopeSupport: LanguageScopeSupportFacetMap = {
   "argumentList.formal.lambda.empty": notApplicable,
   "argumentList.formal.lambda.multiLine": notApplicable,
   "argumentList.formal.lambda.singleLine": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "interior.lambda": notApplicable,
   "value.return.lambda": notApplicable,
   anonymousFunction: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/cpp.ts b/packages/common/src/scopeSupportFacets/cpp.ts
index 1c8393ca55..a810fe9f0e 100644
--- a/packages/common/src/scopeSupportFacets/cpp.ts
+++ b/packages/common/src/scopeSupportFacets/cpp.ts
@@ -31,6 +31,10 @@ export const cppScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": supported,
   "argument.formal.lambda.multiLine": supported,
   "argument.formal.lambda.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "argument.catch": supported,
 
   "argumentList.actual.constructor.empty": supported,
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
index 98f5197e7c..9255c7ca8b 100644
--- a/packages/common/src/scopeSupportFacets/csharp.ts
+++ b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -58,6 +58,8 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.argument.formal": supported,
   "name.argument.catch": supported,
   "name.namespace": supported,
@@ -112,6 +114,8 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.argument.formal.constructor": supported,
   "type.argument.formal.constructor.iteration": supported,
   "type.argument.catch": supported,
@@ -274,11 +278,8 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Pattern destructuring
   "statement.variable.destructuring": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts
index 659c24120c..7f7c35fa28 100644
--- a/packages/common/src/scopeSupportFacets/css.ts
+++ b/packages/common/src/scopeSupportFacets/css.ts
@@ -174,6 +174,10 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -296,11 +300,8 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Multi-line string
   "string.multiLine": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/go.ts b/packages/common/src/scopeSupportFacets/go.ts
index 00b13550be..691dc4426b 100644
--- a/packages/common/src/scopeSupportFacets/go.ts
+++ b/packages/common/src/scopeSupportFacets/go.ts
@@ -134,6 +134,8 @@ export const goScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.iteration.block": supported,
   "name.iteration.class": supported,
   "name.iteration.document": supported,
@@ -162,6 +164,8 @@ export const goScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.return": supported,
   "type.return.method": supported,
   "type.class": supported,
@@ -294,11 +298,8 @@ export const goScopeSupport: LanguageScopeSupportFacetMap = {
   // Resource syntax
   "statement.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "interior.resource": notApplicable,
 
   // Static
diff --git a/packages/common/src/scopeSupportFacets/html.ts b/packages/common/src/scopeSupportFacets/html.ts
index 4a791e01b3..551c4a85af 100644
--- a/packages/common/src/scopeSupportFacets/html.ts
+++ b/packages/common/src/scopeSupportFacets/html.ts
@@ -148,6 +148,10 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -274,11 +278,8 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Map
   map: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts
index e5f38fee85..be53e48462 100644
--- a/packages/common/src/scopeSupportFacets/java.ts
+++ b/packages/common/src/scopeSupportFacets/java.ts
@@ -144,6 +144,8 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.constructor.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.argument.catch": supported,
   "name.class": supported,
   "name.interface": supported,
@@ -185,6 +187,8 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
 
   "type.argument.formal.constructor": supported,
   "type.argument.formal.method": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.argument.formal.constructor.iteration": supported,
   "type.argument.formal.method.iteration": supported,
   "type.argument.catch": supported,
@@ -310,11 +314,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   notebookCell: notApplicable,
   "interior.cell": notApplicable,
 
-  // Multiple resources
-  "value.resource.iteration": notApplicable,
-  "type.resource.iteration": notApplicable,
-  "name.resource.iteration": notApplicable,
-
   // Namespace
   "statement.namespace": notApplicable,
   "name.namespace": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts
index 27130865b7..3ded4b01a3 100644
--- a/packages/common/src/scopeSupportFacets/javascript.ts
+++ b/packages/common/src/scopeSupportFacets/javascript.ts
@@ -148,6 +148,8 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.argument.formal.constructor": supported,
   "name.argument.formal.constructor.iteration": supported,
   "name.argument.catch": supported,
@@ -235,11 +237,8 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   // Resource
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "name.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
   "value.resource": notApplicable,
 
   // Keyword argument
@@ -288,6 +287,8 @@ export const javascriptScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": notApplicable,
   "type.argument.formal.method": notApplicable,
   "type.argument.formal.method.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "type.argument.formal.constructor": notApplicable,
   "type.argument.formal.constructor.iteration": notApplicable,
   "type.argument.catch": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/json.ts b/packages/common/src/scopeSupportFacets/json.ts
index 7366ec50b1..4ade4f3a51 100644
--- a/packages/common/src/scopeSupportFacets/json.ts
+++ b/packages/common/src/scopeSupportFacets/json.ts
@@ -151,6 +151,10 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -277,11 +281,8 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Multiline string
   "string.multiLine": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/kotlin.ts b/packages/common/src/scopeSupportFacets/kotlin.ts
index a381e6c617..c57f9f4a96 100644
--- a/packages/common/src/scopeSupportFacets/kotlin.ts
+++ b/packages/common/src/scopeSupportFacets/kotlin.ts
@@ -144,6 +144,8 @@ export const kotlinScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.argument.formal.constructor": supported,
   "name.argument.formal.constructor.iteration": supported,
   "name.argument.catch": supported,
@@ -205,6 +207,8 @@ export const kotlinScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.argument.formal.constructor": supported,
   "type.argument.formal.constructor.iteration": supported,
   "type.argument.catch": supported,
@@ -280,11 +284,8 @@ export const kotlinScopeSupport: LanguageScopeSupportFacetMap = {
   // Resource
   "statement.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "interior.resource": notApplicable,
 
   // Namespace
diff --git a/packages/common/src/scopeSupportFacets/latex.ts b/packages/common/src/scopeSupportFacets/latex.ts
index 0e352226e8..af36435154 100644
--- a/packages/common/src/scopeSupportFacets/latex.ts
+++ b/packages/common/src/scopeSupportFacets/latex.ts
@@ -163,6 +163,10 @@ export const latexScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -279,11 +283,8 @@ export const latexScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // String
   "string.singleLine": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/lua.ts b/packages/common/src/scopeSupportFacets/lua.ts
index 12fcca216b..aaa9422a03 100644
--- a/packages/common/src/scopeSupportFacets/lua.ts
+++ b/packages/common/src/scopeSupportFacets/lua.ts
@@ -59,6 +59,8 @@ export const luaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.foreach": supported,
   "name.function": supported,
   "name.method": supported,
@@ -212,6 +214,8 @@ export const luaScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": notApplicable,
   "type.argument.formal.method": notApplicable,
   "type.argument.formal.method.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "type.argument.catch": notApplicable,
   "type.return": notApplicable,
   "type.return.method": notApplicable,
@@ -263,11 +267,8 @@ export const luaScopeSupport: LanguageScopeSupportFacetMap = {
   // Resource syntax
   "statement.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "interior.resource": notApplicable,
 
   // Keyword argument
diff --git a/packages/common/src/scopeSupportFacets/markdown.ts b/packages/common/src/scopeSupportFacets/markdown.ts
index eec0283d8e..e963210ec6 100644
--- a/packages/common/src/scopeSupportFacets/markdown.ts
+++ b/packages/common/src/scopeSupportFacets/markdown.ts
@@ -152,6 +152,10 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -277,11 +281,8 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Single-line string
   "string.singleLine": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/properties.ts b/packages/common/src/scopeSupportFacets/properties.ts
index b624c2089c..ef00dd6532 100644
--- a/packages/common/src/scopeSupportFacets/properties.ts
+++ b/packages/common/src/scopeSupportFacets/properties.ts
@@ -136,6 +136,10 @@ export const propertiesScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -242,11 +246,8 @@ export const propertiesScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Pattern destructuring
   "statement.variable.destructuring": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts
index 3dfba3c307..70dfe729ef 100644
--- a/packages/common/src/scopeSupportFacets/python.ts
+++ b/packages/common/src/scopeSupportFacets/python.ts
@@ -6,7 +6,6 @@ const { supported, notApplicable } = ScopeSupportFacetLevel;
 export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": supported,
   "name.resource": supported,
-  "name.resource.iteration": supported,
   "name.argument.actual": supported,
   "name.argument.actual.iteration": supported,
   "name.argument.formal": supported,
@@ -15,6 +14,8 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.argument.catch": supported,
   "name.assignment": supported,
   "name.assignment.destructuring": supported,
@@ -33,8 +34,6 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
 
   "value.foreach": supported,
   "value.yield": supported,
-  "value.resource": supported,
-  "value.resource.iteration": supported,
   "value.argument.actual": supported,
   "value.argument.actual.iteration": supported,
   "value.argument.formal": supported,
@@ -64,6 +63,8 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "type.argument.formal": supported,
   "type.argument.catch": supported,
   "type.class": supported,
@@ -275,7 +276,6 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "type.interface": notApplicable,
   "type.field.interface": notApplicable,
   "type.iteration.interface": notApplicable,
-  "type.resource.iteration": notApplicable,
   "type.resource": notApplicable,
 
   // Type alias
@@ -337,6 +337,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.misc": notApplicable,
   "statement.package": notApplicable,
   "statement.update": notApplicable,
+  "value.resource": notApplicable,
   environment: notApplicable,
   regularExpression: notApplicable,
   selector: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/r.ts b/packages/common/src/scopeSupportFacets/r.ts
index 0cf51e5bff..5a1f796544 100644
--- a/packages/common/src/scopeSupportFacets/r.ts
+++ b/packages/common/src/scopeSupportFacets/r.ts
@@ -113,7 +113,6 @@ export const rScopeSupport: LanguageScopeSupportFacetMap = {
   "type.interface": notApplicable,
   "type.return": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "type.iteration.class": notApplicable,
   "type.typeArgument": notApplicable,
   "type.typeArgument.iteration": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/rust.ts b/packages/common/src/scopeSupportFacets/rust.ts
index 7dba3f4963..8ee45dfc93 100644
--- a/packages/common/src/scopeSupportFacets/rust.ts
+++ b/packages/common/src/scopeSupportFacets/rust.ts
@@ -118,6 +118,8 @@ export const rustScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.assignment": supported,
   "name.assignment.destructuring": supported,
   "name.assignment.compound": supported,
@@ -163,6 +165,8 @@ export const rustScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.class": supported,
   "type.enum": supported,
   "type.field.class": supported,
@@ -266,11 +270,8 @@ export const rustScopeSupport: LanguageScopeSupportFacetMap = {
   // Resource syntax
   "statement.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "interior.resource": notApplicable,
 
   // Keyword argument
diff --git a/packages/common/src/scopeSupportFacets/scala.ts b/packages/common/src/scopeSupportFacets/scala.ts
index 4ecb009599..2ad667db80 100644
--- a/packages/common/src/scopeSupportFacets/scala.ts
+++ b/packages/common/src/scopeSupportFacets/scala.ts
@@ -145,6 +145,8 @@ export const scalaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": supported,
   "name.argument.formal.method": supported,
   "name.argument.formal.method.iteration": supported,
+  "name.argument.formal.lambda": supported,
+  "name.argument.formal.lambda.iteration": supported,
   "name.argument.formal.constructor": supported,
   "name.argument.formal.constructor.iteration": supported,
   "name.argument.catch": supported,
@@ -200,6 +202,8 @@ export const scalaScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.argument.formal.constructor": supported,
   "type.argument.formal.constructor.iteration": supported,
   "type.argument.catch": supported,
@@ -271,11 +275,8 @@ export const scalaScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Branches and conditions
   "branch.ternary": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts
index 08ac3335af..292b94c75d 100644
--- a/packages/common/src/scopeSupportFacets/scm.ts
+++ b/packages/common/src/scopeSupportFacets/scm.ts
@@ -153,6 +153,10 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -274,11 +278,8 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Map
   map: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
index 436153e72a..5d5e364e00 100644
--- a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
+++ b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -725,11 +725,6 @@ export const scopeSupportFacetInfos: Record<
     description: "Name in a 'with' / 'use' / 'using' statement",
     scopeType: "name",
   },
-  "name.resource.iteration": iteration(
-    "name",
-    "names in a 'with' / 'use' / 'using' statement",
-    "the resource list. The domain should be the entire statement",
-  ),
   "name.argument.actual": {
     description: "Name of a (keyword) argument in a function call",
     scopeType: "name",
@@ -737,7 +732,7 @@ export const scopeSupportFacetInfos: Record<
   "name.argument.actual.iteration": iteration(
     "name",
     "names of (keyword) arguments in a function call",
-    "the argument list.",
+    "the argument list",
   ),
   "name.argument.formal": {
     description: "Name of a parameter in a function declaration",
@@ -746,7 +741,7 @@ export const scopeSupportFacetInfos: Record<
   "name.argument.formal.iteration": iteration(
     "name",
     "names of formal parameters in a function declaration",
-    "the parameters list. The domain should be the entire function",
+    "the parameters list",
   ),
   "name.argument.formal.method": {
     description: "Name of a parameter in a class method declaration",
@@ -755,7 +750,16 @@ export const scopeSupportFacetInfos: Record<
   "name.argument.formal.method.iteration": iteration(
     "name",
     "names of formal parameters in a method declaration",
-    "the parameters list. The domain should be the entire method",
+    "the parameters list",
+  ),
+  "name.argument.formal.lambda": {
+    description: "Name of a parameter in a lambda declaration",
+    scopeType: "name",
+  },
+  "name.argument.formal.lambda.iteration": iteration(
+    "name",
+    "names of formal parameters in a lambda declaration",
+    "the parameters list",
   ),
   "name.argument.formal.constructor": {
     description: "The name of a parameter in a constructor declaration",
@@ -764,7 +768,7 @@ export const scopeSupportFacetInfos: Record<
   "name.argument.formal.constructor.iteration": iteration(
     "name",
     "names of formal parameters in a constructor declaration",
-    "the parameters list. The domain should be the entire constructor",
+    "the parameters list",
   ),
   "name.argument.catch": {
     description: "Name of a parameter in a catch clause",
@@ -871,11 +875,6 @@ export const scopeSupportFacetInfos: Record<
     description: "Value of a 'with' / 'use' / 'using' statement",
     scopeType: "value",
   },
-  "value.resource.iteration": iteration(
-    "value",
-    "values in a 'with' / 'use' / 'using' statement",
-    "the resource list. The domain should be the entire statement",
-  ),
   "value.argument.actual": {
     description: "The value of a (keyword) argument in a function call",
     scopeType: "value",
@@ -883,7 +882,7 @@ export const scopeSupportFacetInfos: Record<
   "value.argument.actual.iteration": iteration(
     "value",
     "values of (keyword) arguments in a function call",
-    "the arguments list.",
+    "the arguments list",
   ),
   "value.argument.formal": {
     description: "The value of a (keyword) argument in a function declaration",
@@ -892,7 +891,7 @@ export const scopeSupportFacetInfos: Record<
   "value.argument.formal.iteration": iteration(
     "value",
     "values of formal parameters in a function declaration",
-    "the parameters list. The domain should be the entire function",
+    "the parameters list",
   ),
   "value.argument.formal.method": {
     description: "The value of a parameter in a class method declaration",
@@ -901,7 +900,7 @@ export const scopeSupportFacetInfos: Record<
   "value.argument.formal.method.iteration": iteration(
     "value",
     "values of formal parameters in a method declaration",
-    "the parameters list. The domain should be the entire method",
+    "the parameters list",
   ),
   "value.argument.formal.constructor": {
     description: "The value of a parameter in a constructor declaration",
@@ -910,7 +909,7 @@ export const scopeSupportFacetInfos: Record<
   "value.argument.formal.constructor.iteration": iteration(
     "value",
     "values of formal parameters in a constructor declaration",
-    "the parameters list. The domain should be the entire constructor",
+    "the parameters list",
   ),
   "value.typeAlias": {
     description: "Value of a type alias declaration",
@@ -936,7 +935,7 @@ export const scopeSupportFacetInfos: Record<
   "type.argument.formal.iteration": iteration(
     "type",
     "types of formal parameters in a function declaration",
-    "the parameters list. The domain should be the entire function",
+    "the parameters list",
   ),
   "type.argument.formal.method": {
     description: "Type of a formal parameter in a class method declaration",
@@ -945,7 +944,16 @@ export const scopeSupportFacetInfos: Record<
   "type.argument.formal.method.iteration": iteration(
     "type",
     "types of formal parameters in a method declaration",
-    "the parameters list. The domain should be the entire method",
+    "the parameters list",
+  ),
+  "type.argument.formal.lambda": {
+    description: "Type of a formal parameter in a lambda declaration",
+    scopeType: "type",
+  },
+  "type.argument.formal.lambda.iteration": iteration(
+    "type",
+    "types of formal parameters in a lambda declaration",
+    "the parameters list",
   ),
   "type.argument.formal.constructor": {
     description: "Type of a formal parameter in a constructor declaration",
@@ -954,7 +962,7 @@ export const scopeSupportFacetInfos: Record<
   "type.argument.formal.constructor.iteration": iteration(
     "type",
     "types of formal parameters in a constructor declaration",
-    "the parameters list. The domain should be the entire constructor",
+    "the parameters list",
   ),
   "type.argument.catch": {
     description: "Type of a parameter in a catch clause",
@@ -1014,11 +1022,6 @@ export const scopeSupportFacetInfos: Record<
     description: "Type in a 'with' / 'use' / 'using' statement",
     scopeType: "type",
   },
-  "type.resource.iteration": iteration(
-    "type",
-    "types in a 'with' / 'use' / 'using' statement",
-    "the resource list. The domain should be the entire statement",
-  ),
   "type.iteration.block": blockIter("type", "types"),
   "type.iteration.class": classIter("type", "types"),
   "type.iteration.interface": interfaceIter("type", "types"),
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
index a7cd3c13f0..ffbd2a7768 100644
--- a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
+++ b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -203,13 +203,14 @@ export const scopeSupportFacets = [
   "name.field.interface",
   "name.field.enum",
   "name.resource",
-  "name.resource.iteration",
   "name.argument.actual",
   "name.argument.actual.iteration",
   "name.argument.formal",
   "name.argument.formal.iteration",
   "name.argument.formal.method",
   "name.argument.formal.method.iteration",
+  "name.argument.formal.lambda",
+  "name.argument.formal.lambda.iteration",
   "name.argument.formal.constructor",
   "name.argument.formal.constructor.iteration",
   "name.argument.catch",
@@ -244,7 +245,6 @@ export const scopeSupportFacets = [
   "value.switch",
   "value.typeAlias",
   "value.resource",
-  "value.resource.iteration",
   "value.argument.actual",
   "value.argument.actual.iteration",
   "value.argument.formal",
@@ -272,13 +272,14 @@ export const scopeSupportFacets = [
   "type.interface",
   "type.enum",
   "type.resource",
-  "type.resource.iteration",
   "type.typeArgument",
   "type.typeArgument.iteration",
   "type.argument.formal",
   "type.argument.formal.iteration",
   "type.argument.formal.method",
   "type.argument.formal.method.iteration",
+  "type.argument.formal.lambda",
+  "type.argument.formal.lambda.iteration",
   "type.argument.formal.constructor",
   "type.argument.formal.constructor.iteration",
   "type.argument.catch",
diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts
index 676ae02c07..66fe30e4de 100644
--- a/packages/common/src/scopeSupportFacets/talon.ts
+++ b/packages/common/src/scopeSupportFacets/talon.ts
@@ -160,6 +160,10 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -266,11 +270,8 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Pattern destructuring
   "statement.variable.destructuring": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/talonList.ts b/packages/common/src/scopeSupportFacets/talonList.ts
index 68238265a9..f3f698348d 100644
--- a/packages/common/src/scopeSupportFacets/talonList.ts
+++ b/packages/common/src/scopeSupportFacets/talonList.ts
@@ -139,6 +139,10 @@ export const talonListScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -245,11 +249,8 @@ export const talonListScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Pattern destructuring
   "statement.variable.destructuring": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/typescript.ts b/packages/common/src/scopeSupportFacets/typescript.ts
index 784fd5dbc4..ae08f0d7e2 100644
--- a/packages/common/src/scopeSupportFacets/typescript.ts
+++ b/packages/common/src/scopeSupportFacets/typescript.ts
@@ -11,6 +11,8 @@ export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.iteration": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.method.iteration": supported,
+  "type.argument.formal.lambda": supported,
+  "type.argument.formal.lambda.iteration": supported,
   "type.argument.formal.constructor": supported,
   "type.argument.formal.constructor.iteration": supported,
   "type.argument.catch": supported,
diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts
index 60feaba508..7f2f70c1d7 100644
--- a/packages/common/src/scopeSupportFacets/xml.ts
+++ b/packages/common/src/scopeSupportFacets/xml.ts
@@ -148,6 +148,10 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -274,11 +278,8 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Map
   map: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/yaml.ts b/packages/common/src/scopeSupportFacets/yaml.ts
index 0d091463fe..6ae04ee70a 100644
--- a/packages/common/src/scopeSupportFacets/yaml.ts
+++ b/packages/common/src/scopeSupportFacets/yaml.ts
@@ -157,6 +157,10 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal.lambda.singleLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.iteration": notApplicable,
+  "name.argument.formal.lambda": notApplicable,
+  "name.argument.formal.lambda.iteration": notApplicable,
+  "type.argument.formal.lambda": notApplicable,
+  "type.argument.formal.lambda.iteration": notApplicable,
   "value.return.lambda": notApplicable,
   "interior.lambda": notApplicable,
 
@@ -282,11 +286,8 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.resource": notApplicable,
   "interior.resource": notApplicable,
   "name.resource": notApplicable,
-  "name.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "type.resource.iteration": notApplicable,
   "value.resource": notApplicable,
-  "value.resource.iteration": notApplicable,
 
   // Block comment
   "comment.block": notApplicable,
diff --git a/queries/kotlin.scm b/queries/kotlin.scm
index 36d9ea6761..9ccd72f015 100644
--- a/queries/kotlin.scm
+++ b/queries/kotlin.scm
@@ -46,13 +46,19 @@
 
 ;;!! { }
 ;;!   ^
-(_
-  "{" @statement.iteration.start.endOf @namedFunction.iteration.start.endOf
-  "}" @statement.iteration.end.startOf @namedFunction.iteration.end.startOf
+(
+  (_
+    "{" @statement.iteration.start.endOf @namedFunction.iteration.start.endOf
+    "}" @statement.iteration.end.startOf @namedFunction.iteration.end.startOf
+  ) @_dummy
+  (#not-type? @_dummy lambda_literal)
 )
-(_
-  "{" @name.iteration.start.endOf @value.iteration.start.endOf @type.iteration.start.endOf
-  "}" @name.iteration.end.startOf @value.iteration.end.startOf @type.iteration.end.startOf
+(
+  (_
+    "{" @name.iteration.start.endOf @value.iteration.start.endOf @type.iteration.start.endOf
+    "}" @name.iteration.end.startOf @value.iteration.end.startOf @type.iteration.end.startOf
+  ) @_dummy
+  (#not-type? @_dummy lambda_literal)
 )
 
 ;;!! { }
@@ -540,6 +546,10 @@
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
+;;!! { aaa, bbb -> }
+;;!    ^^^^^^^^
+(lambda_parameters) @name.iteration @type.iteration
+
 ;;!! { -> }
 (lambda_literal
   "{" @argumentList.start.endOf @argumentList.removal.start.endOf
diff --git a/queries/python.scm b/queries/python.scm
index 0f03f84bfc..5ea4529068 100644
--- a/queries/python.scm
+++ b/queries/python.scm
@@ -181,82 +181,9 @@
 
 ;;!! with aaa:
 ;;!       ^^^
-;;!  --------
-(
-  (with_statement
-    (with_clause
-      (with_item)? @_.leading.endOf
-      .
-      (with_item
-        value: (_) @value @name
-      )
-      .
-      (with_item)? @_.trailing.startOf
-    )
-  ) @_.domain
-  (#not-type? @value "as_pattern")
-  (#allow-multiple! @value @name)
-)
-
-;;!! with aaa:
-;;!       ^^^
-;;!  --------
-(
-  (with_statement
-    (with_clause
-      (with_item)? @_.leading.endOf
-      .
-      (with_item
-        value: (_) @value @name
-      )
-      .
-      (with_item)? @_.trailing.startOf
-    ) @_with_clause
-  )
-  (#not-type? @value "as_pattern")
-  (#has-multiple-children-of-type? @_with_clause "with_item")
-  (#allow-multiple! @value @name)
-)
-
-;;!! with aaa as bbb:
-;;!       ^^^        <~~ value
-;;!              ^^^ <~~ name
-;;!  ----------------
-(
-  (with_statement
-    (with_clause
-      (with_item
-        value: (as_pattern
-          (_) @value @name.leading.endOf
-          alias: (_) @name @value.trailing.startOf
-        )
-      )
-    )
-  ) @_.domain
-  (#allow-multiple! @value @name)
-)
-
-;;!! with aaa as ccc, bbb:
-;;!       ^^^         ^^^
-;;!       ----------  ---
-(
-  (with_statement
-    (with_clause
-      (with_item
-        value: (as_pattern
-          (_) @value @name.leading.endOf
-          alias: (_) @name @value.trailing.startOf
-        )
-      ) @_.domain
-    ) @_with_clause
-  )
-  (#has-multiple-children-of-type? @_with_clause "with_item")
-  (#allow-multiple! @value @name)
-)
-
 (with_statement
-  (with_clause) @name.iteration @value.iteration
-) @name.iteration.domain @value.iteration.domain
+  (with_clause) @name
+) @name.domain
 
 ;;!! lambda str: len(str) > 0
 ;;!              ^^^^^^^^^^^^
@@ -686,14 +613,21 @@
 ;;!  ^^^^^^^^^^^^^^
 (lambda) @anonymousFunction
 
-;;!! lambda a, b: pass
-;;!         ^^^^
+;;!! lambda aaa, bbb: pass
+;;!         ^^^^^^^^
 (lambda
-  (lambda_parameters) @argumentList @argumentOrParameter.iteration
+  (lambda_parameters) @argumentList @argumentOrParameter.iteration @name.iteration
   (#insertion-delimiter! @argumentList ", ")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
+;;!! lambda aaa, bbb: pass
+;;!         ^^^  ^^^
+(lambda_parameters
+  (_) @name
+)
+
 ;;!! lambda: pass
+;;!        ><
 (lambda
   .
   "lambda" @argumentList.start.endOf