diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
index e37d25bf1b0..b402577517f 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
@@ -63,7 +63,7 @@ class BodyGenerator(
     private fun generateAsStatement(statement: IrExpression) {
         generateExpression(statement)
         if (statement.type != wasmSymbols.voidType) {
-            body.buildDrop(statement.getSourceLocation())
+            body.buildDrop(SourceLocation.NoLocation("DROP"))
         }
     }
 
diff --git a/compiler/testData/debug/stepping/IfTrueThenFalse.kt b/compiler/testData/debug/stepping/IfTrueThenFalse.kt
index 3a6217c9be0..9f4d362c461 100644
--- a/compiler/testData/debug/stepping/IfTrueThenFalse.kt
+++ b/compiler/testData/debug/stepping/IfTrueThenFalse.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 fun cond() = false
 
diff --git a/compiler/testData/debug/stepping/assertion.kt b/compiler/testData/debug/stepping/assertion.kt
index e8ca7cb7e1c..55542629499 100644
--- a/compiler/testData/debug/stepping/assertion.kt
+++ b/compiler/testData/debug/stepping/assertion.kt
@@ -54,7 +54,7 @@ fun box(): String {
 // test.kt:31 box
 
 // EXPECTATIONS WASM
-// test.kt:26 $box (4, 12, 4)
+// test.kt:26 $box (4, 12)
 // test.kt:17 $box (57, 57, 57, 57)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8)
@@ -71,7 +71,7 @@ fun box(): String {
 // String.kt:149 $kotlin.stringLiteral (11, 4, 11, 4)
 // test.kt:18 $box
 // test.kt:19 $box (13, 12)
-// test.kt:27 $box (4, 12, 4)
+// test.kt:27 $box (4, 12)
 // test.kt:8 $box
 // test.kt:9 $box (13, 12)
 // test.kt:31 $box (11, 11, 11, 11, 4)
@@ -91,7 +91,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -103,21 +103,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/callWithCallInArguments.kt b/compiler/testData/debug/stepping/callWithCallInArguments.kt
index 4d2985f4305..009b8195360 100644
--- a/compiler/testData/debug/stepping/callWithCallInArguments.kt
+++ b/compiler/testData/debug/stepping/callWithCallInArguments.kt
@@ -53,6 +53,6 @@ fun box() {
 // test.kt:12 $box (24, 20)
 // test.kt:6 $bar (16, 16, 19, 16, 16, 19, 16, 16, 19)
 // test.kt:11 $box
-// test.kt:10 $box (4, 4)
+// test.kt:10 $box
 
 // test.kt:15 $box
diff --git a/compiler/testData/debug/stepping/callWithReceiver.kt b/compiler/testData/debug/stepping/callWithReceiver.kt
index 8739b6c4f38..2951723a444 100644
--- a/compiler/testData/debug/stepping/callWithReceiver.kt
+++ b/compiler/testData/debug/stepping/callWithReceiver.kt
@@ -41,7 +41,7 @@ fun box() {
 // test.kt:11 $box
 // test.kt:12 $box (6, 6)
 // test.kt:5 $A.foo (16, 20)
-// test.kt:15 $box (6, 6)
+// test.kt:15 $box
 // test.kt:14 $box
 // test.kt:6 $box (23, 27)
 // test.kt:16 $box
diff --git a/compiler/testData/debug/stepping/callableReference.kt b/compiler/testData/debug/stepping/callableReference.kt
index c229bd23aec..863a68c4cba 100644
--- a/compiler/testData/debug/stepping/callableReference.kt
+++ b/compiler/testData/debug/stepping/callableReference.kt
@@ -43,7 +43,7 @@ fun f(block: () -> Unit) {
 // Runtime.kt:73 $kotlin.wasm.internal.getBoxedBoolean (8, 35)
 // Standard.kt:71 $kotlin.wasm.internal.getBoxedBoolean (0, 0, 0, 0)
 // Standard.kt:95 $kotlin.wasm.internal.getBoxedBoolean (4, 4)
-// Standard.kt:98 $kotlin.wasm.internal.getBoxedBoolean (4, 10, 4, 4, 10, 4)
+// Standard.kt:98 $kotlin.wasm.internal.getBoxedBoolean (4, 10, 4, 10)
 // Standard.kt:74 $kotlin.wasm.internal.getBoxedBoolean (15, 7)
 // Standard.kt:99 $kotlin.wasm.internal.getBoxedBoolean (11, 4, 11, 4)
 // Runtime.kt:74 $kotlin.wasm.internal.getBoxedBoolean (5, 5)
diff --git a/compiler/testData/debug/stepping/chainCall.kt b/compiler/testData/debug/stepping/chainCall.kt
index c03e201cd86..10677f44adc 100644
--- a/compiler/testData/debug/stepping/chainCall.kt
+++ b/compiler/testData/debug/stepping/chainCall.kt
@@ -45,7 +45,7 @@ fun box() {
 // test.kt:11 $box (4, 6)
 // test.kt:5 $A.foo (16, 20, 16, 20)
 // test.kt:12 $box (9, 9)
-// test.kt:15 $box (9, 9)
+// test.kt:15 $box
 // test.kt:14 $box (6, 4)
 // test.kt:6 $box (23, 27, 23, 27)
 // test.kt:16 $box
diff --git a/compiler/testData/debug/stepping/classObject.kt b/compiler/testData/debug/stepping/classObject.kt
index 96ebe310e32..6a4d3c8b8b3 100644
--- a/compiler/testData/debug/stepping/classObject.kt
+++ b/compiler/testData/debug/stepping/classObject.kt
@@ -53,6 +53,6 @@ fun box() {
 // EXPECTATIONS WASM
 // test.kt:15 $box
 // test.kt:16 $box
-// test.kt:17 $box (6, 6)
+// test.kt:17 $box
 // test.kt:9 $Companion.foo (19, 27, 19, 12)
 // test.kt:18 $box
diff --git a/compiler/testData/debug/stepping/commentBeforeClass.kt b/compiler/testData/debug/stepping/commentBeforeClass.kt
index 610bd2c3cc9..b5374c5b998 100644
--- a/compiler/testData/debug/stepping/commentBeforeClass.kt
+++ b/compiler/testData/debug/stepping/commentBeforeClass.kt
@@ -22,6 +22,6 @@ class A {
 // test.kt:6 box
 
 // EXPECTATIONS WASM
-// test.kt:5 $box (4, 4, 4)
+// test.kt:5 $box (4, 4)
 // test.kt:11 $A.<init>
 // test.kt:6 $box
diff --git a/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt b/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt
index 3f7674c5d50..dc25878bd8c 100644
--- a/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt
+++ b/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt
@@ -21,7 +21,7 @@ fun box() {
 // test.kt:11 box
 
 // EXPECTATIONS WASM
-// test.kt:10 $box (4, 4, 4, 4, 4)
+// test.kt:10 $box (4, 4, 4, 4)
 // test.kt:5 $foo$default (0, 17, 17, 17, 17, 0)
 // test.kt:6 $foo (11, 4)
 // test.kt:11 $box
diff --git a/compiler/testData/debug/stepping/constantConditions.kt b/compiler/testData/debug/stepping/constantConditions.kt
index a3f10807732..dd59a05c111 100644
--- a/compiler/testData/debug/stepping/constantConditions.kt
+++ b/compiler/testData/debug/stepping/constantConditions.kt
@@ -30,7 +30,7 @@ fun test(): Long {
 // test.kt:7 box
 
 // EXPECTATIONS WASM
-// test.kt:6 $box (4, 4)
+// test.kt:6 $box
 // test.kt:11 $test
 // test.kt:12 $test (15, 8)
 // test.kt:7 $box
diff --git a/compiler/testData/debug/stepping/constructorCall.kt b/compiler/testData/debug/stepping/constructorCall.kt
index aad1c97fca3..d0d84a98cc7 100644
--- a/compiler/testData/debug/stepping/constructorCall.kt
+++ b/compiler/testData/debug/stepping/constructorCall.kt
@@ -54,6 +54,6 @@ fun box() {
 // test.kt:8 $box (4, 4, 4)
 // test.kt:9 $box
 // test.kt:11 $box (4, 6, 4, 4)
-// test.kt:13 $box (4, 4, 4)
+// test.kt:13 $box (4, 4)
 // test.kt:14 $box
 // test.kt:15 $box
diff --git a/compiler/testData/debug/stepping/constructors.kt b/compiler/testData/debug/stepping/constructors.kt
index e47c34f0fdf..0829d283dc7 100644
--- a/compiler/testData/debug/stepping/constructors.kt
+++ b/compiler/testData/debug/stepping/constructors.kt
@@ -199,18 +199,18 @@ class O<T>(i: T) {
 // test.kt:6 $box (4, 6, 4, 4)
 // test.kt:21 $C.<init> (8, 19)
 // test.kt:7 $box (4, 4, 4)
-// test.kt:23 $D.<init> (4, 4, 17)
+// test.kt:23 $D.<init> (4, 17)
 // test.kt:24 $D.<init>
 // test.kt:8 $box (4, 6, 4, 4)
-// test.kt:26 $E.<init> (4, 4, 23)
+// test.kt:26 $E.<init> (4, 23)
 // test.kt:27 $E.<init>
 // test.kt:9 $box (4, 4, 4)
-// test.kt:29 $F.<init> (4, 4)
+// test.kt:29 $F.<init>
 // test.kt:32 $F.<init>
 // test.kt:30 $F.<init> (16, 8)
 // test.kt:31 $F.<init>
 // test.kt:10 $box (4, 6, 4, 4)
-// test.kt:34 $G.<init> (4, 4)
+// test.kt:34 $G.<init>
 // test.kt:37 $G.<init>
 // test.kt:35 $G.<init> (16, 8)
 // test.kt:36 $G.<init>
@@ -221,28 +221,28 @@ class O<T>(i: T) {
 // test.kt:43 $K.<init> (8, 19)
 // test.kt:45 $K.<init> (16, 8)
 // test.kt:13 $box (4, 4, 4)
-// test.kt:49 $L.<init> (4, 4)
+// test.kt:49 $L.<init>
 // test.kt:54 $L.<init> (16, 8)
 // test.kt:56 $L.<init>
 // test.kt:50 $L.<init> (16, 8)
 // test.kt:51 $L.<init>
 // test.kt:14 $box (4, 4, 4)
-// test.kt:58 $M.<init> (24, 19, 19)
-// test.kt:62 $M.<init> (4, 4)
+// test.kt:58 $M.<init> (24, 19)
+// test.kt:62 $M.<init>
 // test.kt:64 $M.<init>
 // test.kt:63 $M.<init>
 // test.kt:59 $M.<init> (16, 8)
 // test.kt:60 $M.<init>
 // test.kt:15 $box (4, 6, 4, 4)
-// test.kt:66 $N.<init> (25, 25)
-// test.kt:70 $N.<init> (4, 4)
+// test.kt:66 $N.<init>
+// test.kt:70 $N.<init>
 // test.kt:72 $N.<init>
 // test.kt:71 $N.<init>
 // test.kt:67 $N.<init> (16, 8)
 // test.kt:68 $N.<init>
 // test.kt:16 $box (4, 6, 6, 6, 6, 4, 4)
 // test.kt:73 $O.<init> (16, 16)
-// test.kt:17 $box (4, 6, 9, 9, 9, 9, 4, 4)
+// test.kt:17 $box (4, 6, 9, 9, 9, 9, 4)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8)
 // ThrowHelpers.kt:29 $kotlin.wasm.internal.rangeCheck (6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19)
@@ -256,6 +256,6 @@ class O<T>(i: T) {
 // Array.kt:75 $kotlin.Array.set (8, 20, 27, 16)
 // Array.kt:76 $kotlin.Array.set
 // String.kt:149 $kotlin.stringLiteral (11, 4)
-// test.kt:74 $O.<init> (36, 31, 31)
+// test.kt:74 $O.<init> (36, 31)
 // test.kt:75 $O.<init>
 // test.kt:18 $box
diff --git a/compiler/testData/debug/stepping/continue.kt b/compiler/testData/debug/stepping/continue.kt
index 26ff518d367..6a7fd96e06b 100644
--- a/compiler/testData/debug/stepping/continue.kt
+++ b/compiler/testData/debug/stepping/continue.kt
@@ -128,7 +128,7 @@ fun box() {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -140,21 +140,21 @@ fun box() {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/dataClass.kt b/compiler/testData/debug/stepping/dataClass.kt
index 0bb8852da76..a67f3c610cb 100644
--- a/compiler/testData/debug/stepping/dataClass.kt
+++ b/compiler/testData/debug/stepping/dataClass.kt
@@ -204,7 +204,7 @@ fun box() {
 // String.kt:63 $kotlin.String.hashCode
 // String.kt:66 $kotlin.String.hashCode (15, 8)
 // String.kt:127 $kotlin.String.hashCode (19, 8)
-// String.kt:128 $kotlin.String.hashCode (8, 8)
+// String.kt:128 $kotlin.String.hashCode
 // Standard.kt:136 $kotlin.String.hashCode (18, 52, 61, 52, 66, 51, 51, 44)
 // Standard.kt:152 $kotlin.String.hashCode
 // Standard.kt:154 $kotlin.String.hashCode (18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4)
@@ -215,8 +215,8 @@ fun box() {
 // String.kt:131 $kotlin.String.hashCode (20, 8)
 // String.kt:132 $kotlin.String.hashCode (15, 8)
 // test.kt:17 $box (4, 6, 6)
-// StringBuilder.kt:17 $kotlin.text.StringBuilder.<init> (39, 34, 34, 42)
-// StringBuilder.kt:20 $kotlin.text.StringBuilder.<init> (52, 62, 52, 47, 47, 72)
+// StringBuilder.kt:17 $kotlin.text.StringBuilder.<init> (39, 34, 42)
+// StringBuilder.kt:20 $kotlin.text.StringBuilder.<init> (52, 62, 52, 47, 72)
 // Arrays.kt:95 $kotlin.CharArray.<init> (12, 19, 12, 12, 19, 12)
 // Arrays.kt:96 $kotlin.CharArray.<init> (8, 32, 18, 8, 8, 32, 18, 8)
 // Arrays.kt:139 $kotlin.CharArray.<init> (1, 1)
@@ -236,7 +236,7 @@ fun box() {
 // StringBuilder.kt:697 $kotlin.text.StringBuilder.ensureExtraCapacity (5, 5, 5, 5, 5)
 // StringBuilder.kt:227 $kotlin.text.StringBuilder.append (8, 32, 39, 48, 19, 8, 8, 8, 32, 39, 48, 19, 8, 8, 8, 32, 39, 48, 19, 8, 8, 8, 32, 39, 48, 19, 8, 8)
 // StringBuilder.kt:915 $kotlin.text.insertString (21, 28, 35, 42, 45, 51, 8, 58, 21, 28, 35, 42, 45, 51, 8, 58, 21, 28, 35, 42, 45, 51, 8, 58, 21, 28, 35, 42, 45, 51, 8, 58)
-// StringBuilderWasm.kt:41 $kotlin.text.insertString (4, 4, 4, 4, 4, 4, 4, 4, 4, 4)
+// StringBuilderWasm.kt:41 $kotlin.text.insertString (4, 4, 4, 4, 4)
 // _WasmArrays.kt:62 $kotlin.text.insertString (53, 47, 60, 66, 53, 47, 60, 66, 53, 47, 60, 66, 53, 47, 60, 66, 53, 47, 60, 66)
 // _WasmArrays.kt:79 $kotlin.text.insertString (21, 21, 21, 21, 21)
 // _WasmArrays.kt:83 $kotlin.text.insertString (10, 3, 10, 3, 10, 3, 10, 3, 10, 3)
@@ -265,7 +265,7 @@ fun box() {
 // AbstractList.kt:125 $kotlin.collections.Companion.checkRangeIndexes (9, 9)
 // _ArraysWasm.kt:1229 $kotlin.collections.copyInto (20, 31, 20, 4)
 // _ArraysWasm.kt:1230 $kotlin.collections.copyInto (35, 54, 74, 54, 85, 97, 17)
-// _ArraysWasm.kt:1231 $kotlin.collections.copyInto (25, 25)
+// _ArraysWasm.kt:1231 $kotlin.collections.copyInto
 // _WasmArrays.kt:244 $kotlin.collections.copyInto (42869, 42874, 42883, 42895, 42904, 42916, 42935)
 // _WasmArrays.kt:88 $kotlin.collections.copyInto (35, 48, 66, 74, 87, 4)
 // _ArraysWasm.kt:1232 $kotlin.collections.copyInto (11, 4)
@@ -352,7 +352,7 @@ fun box() {
 // StringBuilder.kt:180 $kotlin.text.StringBuilder.append (15, 8)
 // StringBuilder.kt:499 $kotlin.text.StringBuilder.toString (64, 71, 74, 38, 82)
 // StringBuilderWasm.kt:46 $kotlin.text.unsafeStringFromCharArray (29, 15, 4)
-// StringBuilderWasm.kt:47 $kotlin.text.unsafeStringFromCharArray (4, 4)
+// StringBuilderWasm.kt:47 $kotlin.text.unsafeStringFromCharArray
 // _WasmArrays.kt:73 $kotlin.text.unsafeStringFromCharArray (3, 9, 18, 24, 31)
 // _WasmArrays.kt:74 $kotlin.text.unsafeStringFromCharArray
 // _WasmArrays.kt:88 $kotlin.text.unsafeStringFromCharArray (35, 48, 66, 74, 87, 4)
@@ -370,6 +370,6 @@ fun box() {
 // test.kt:23 $box (4, 6, 6)
 // test.kt:7 $E.toString (30, 30, 30, 30, 34)
 // test.kt:24 $box (19, 9, 9, 19, 13, 13)
-// test.kt:25 $box (4, 6, 6)
+// test.kt:25 $box (4, 6)
 // test.kt:10 $E.copy (17, 19, 22, 17, 24)
 // test.kt:26 $box
diff --git a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt
index e70d62f1ce3..a33aac6ffc2 100644
--- a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt
+++ b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt
@@ -42,7 +42,7 @@ inline fun foo(f: () -> Unit) {
 // test.kt:13 box
 
 // EXPECTATIONS WASM
-// test.kt:6 $box (4, 4)
+// test.kt:6 $box
 // test.kt:16 $box (12, 4, 12, 4)
 // test.kt:17 $box (4, 4)
 // test.kt:7 $box (20, 12)
diff --git a/compiler/testData/debug/stepping/functionInAnotherFile.kt b/compiler/testData/debug/stepping/functionInAnotherFile.kt
index 18317d97466..b38b5152af1 100644
--- a/compiler/testData/debug/stepping/functionInAnotherFile.kt
+++ b/compiler/testData/debug/stepping/functionInAnotherFile.kt
@@ -47,7 +47,7 @@ fun bar(x: Int) =
 // test.kt:15 box
 
 // EXPECTATIONS WASM
-// test.kt:14 $box (8, 4, 4)
+// test.kt:14 $box (8, 4)
 // foo.kt:5 $foo (8, 13, 8, 8, 13, 8)
 // foo.kt:8 $foo (15, 11, 4)
 // test.kt:18 $bar (8, 12, 8)
diff --git a/compiler/testData/debug/stepping/implicitThisOnInvoke.kt b/compiler/testData/debug/stepping/implicitThisOnInvoke.kt
index aac735d8f1f..099f15a91d4 100644
--- a/compiler/testData/debug/stepping/implicitThisOnInvoke.kt
+++ b/compiler/testData/debug/stepping/implicitThisOnInvoke.kt
@@ -48,7 +48,7 @@ fun test(b: B) {
 // test.kt:5 $box (9, 11, 11, 9, 4)
 // test.kt:8 $A.<init>
 // test.kt:10 $B.<init> (8, 17)
-// test.kt:15 $test (4, 4)
+// test.kt:15 $test
 // Standard.kt:3 $test (51, 64)
 // Standard.kt:67 $test
 // Standard.kt:70 $test (20, 11, 20, 4)
diff --git a/compiler/testData/debug/stepping/initBlocks.kt b/compiler/testData/debug/stepping/initBlocks.kt
index bdabf9b2dbc..9d238086df2 100644
--- a/compiler/testData/debug/stepping/initBlocks.kt
+++ b/compiler/testData/debug/stepping/initBlocks.kt
@@ -148,7 +148,7 @@ fun box() {
 // String.kt:143 $kotlin.stringLiteral (15, 8)
 // test.kt:30 $Boo.<init> (16, 8)
 // test.kt:32 $Boo.<init>
-// test.kt:52 $box (4, 4, 4)
+// test.kt:52 $box (4, 4)
 // test.kt:35 $Zoo.<init> (19, 11)
 // test.kt:37 $Zoo.<init> (19, 11)
 // test.kt:40 $Zoo.<init> (16, 8)
diff --git a/compiler/testData/debug/stepping/inlineCallableReference.kt b/compiler/testData/debug/stepping/inlineCallableReference.kt
index c27d5123f26..158dab0bde1 100644
--- a/compiler/testData/debug/stepping/inlineCallableReference.kt
+++ b/compiler/testData/debug/stepping/inlineCallableReference.kt
@@ -44,7 +44,7 @@ inline fun f(block: () -> Unit) {
 
 // EXPECTATIONS WASM
 // test.kt:4 $box (12, 4)
-// test.kt:5 $box (4, 4)
+// test.kt:5 $box
 // test.kt:16 $box (4, 4)
 // test.kt:6 $box (12, 8)
 // test.kt:9 $box
diff --git a/compiler/testData/debug/stepping/inlineSimpleCall.kt b/compiler/testData/debug/stepping/inlineSimpleCall.kt
index cfa5134b6a2..b0b9985d724 100644
--- a/compiler/testData/debug/stepping/inlineSimpleCall.kt
+++ b/compiler/testData/debug/stepping/inlineSimpleCall.kt
@@ -55,10 +55,10 @@ fun box() {
 // test.kt:25 box
 
 // EXPECTATIONS WASM
-// test.kt:10 $box (4, 4)
+// test.kt:10 $box
 // test.kt:6 $box (4, 4, 4, 4)
 // test.kt:11 $box
-// test.kt:14 $box (4, 4)
+// test.kt:14 $box
 // test.kt:15 $box
 // test.kt:18 $box
 // test.kt:19 $box
diff --git a/compiler/testData/debug/stepping/kt15259.kt b/compiler/testData/debug/stepping/kt15259.kt
index df6fc1ce056..f1c890b8f19 100644
--- a/compiler/testData/debug/stepping/kt15259.kt
+++ b/compiler/testData/debug/stepping/kt15259.kt
@@ -29,7 +29,7 @@ fun box() {
 // test.kt:13 box
 
 // EXPECTATIONS WASM
-// test.kt:12 $box (4, 4)
+// test.kt:12 $box
 // test.kt:6 $makeFace (25, 25)
 // test.kt:8 $<no name provided>.<init>
 // test.kt:9 $<no name provided>.<init>
diff --git a/compiler/testData/debug/stepping/lambdaStepInline.kt b/compiler/testData/debug/stepping/lambdaStepInline.kt
index 9a041951c19..2202bfeca3e 100644
--- a/compiler/testData/debug/stepping/lambdaStepInline.kt
+++ b/compiler/testData/debug/stepping/lambdaStepInline.kt
@@ -30,7 +30,7 @@ fun box(): String {
 
 // EXPECTATIONS WASM
 // test.kt:9 $box (4, 10, 10, 10, 10, 15)
-// test.kt:5 $box (11, 11, 4, 11, 11, 4)
+// test.kt:5 $box (11, 4, 11, 4)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
 // ThrowHelpers.kt:29 $kotlin.wasm.internal.rangeCheck (6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19)
@@ -64,7 +64,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -76,21 +76,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt
index 2677a91dcce..28ea317336a 100644
--- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt
+++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt
@@ -35,7 +35,7 @@ fun box(): String {
 
 // EXPECTATIONS WASM
 // test.kt:15 $box
-// test.kt:4 $box (11, 11, 4)
+// test.kt:4 $box (11, 4)
 // test.kt:3 $box (45, 45, 45, 45, 49)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
@@ -51,7 +51,7 @@ fun box(): String {
 // Array.kt:76 $kotlin.Array.set
 // String.kt:149 $kotlin.stringLiteral (11, 4)
 // test.kt:16 $box
-// test.kt:11 $box (11, 11, 4)
+// test.kt:11 $box (11, 4)
 // test.kt:8 $box (4, 4, 4, 4, 8)
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8)
 // test.kt:17 $box (11, 11, 11, 11, 4)
@@ -71,7 +71,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -83,21 +83,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/lineNumberAfterInline.kt b/compiler/testData/debug/stepping/lineNumberAfterInline.kt
index 97a4a842990..3ecf7945ed4 100644
--- a/compiler/testData/debug/stepping/lineNumberAfterInline.kt
+++ b/compiler/testData/debug/stepping/lineNumberAfterInline.kt
@@ -50,7 +50,7 @@ fun box() {
 
 // EXPECTATIONS WASM
 // test.kt:23 $box
-// test.kt:13 $test1 (4, 4)
+// test.kt:13 $test1
 // test.kt:9 $test1 (4, 4, 4, 4)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
diff --git a/compiler/testData/debug/stepping/localProperty.kt b/compiler/testData/debug/stepping/localProperty.kt
index c895b4b368a..24629f022fd 100644
--- a/compiler/testData/debug/stepping/localProperty.kt
+++ b/compiler/testData/debug/stepping/localProperty.kt
@@ -70,13 +70,13 @@ fun box(): String {
 // String.kt:51 $kotlin.String.foldChars (41, 59, 41, 59)
 // String.kt:52 $kotlin.String.foldChars (39, 62, 12, 39, 62, 12)
 // String.kt:53 $kotlin.String.foldChars (12, 33, 12, 12, 12, 33, 12, 12)
-// String.kt:54 $kotlin.String.foldChars (12, 12, 12, 12)
+// String.kt:54 $kotlin.String.foldChars (12, 12)
 // _WasmArrays.kt:68 $kotlin.String.foldChars (0, 0)
 // _WasmArrays.kt:70 $kotlin.String.foldChars (21, 21)
 // _WasmArrays.kt:71 $kotlin.String.foldChars (1, 4, 23, 1, 4, 23)
 // _WasmArrays.kt:88 $kotlin.String.foldChars (35, 48, 66, 74, 87, 4, 35, 48, 66, 74, 87, 4)
 // String.kt:55 $kotlin.String.foldChars (32, 50, 12, 32, 50, 12)
-// String.kt:57 $kotlin.String.foldChars (8, 8)
+// String.kt:57 $kotlin.String.foldChars
 // Preconditions.kt:77 $kotlin.String.foldChars (2, 2)
 // Preconditions.kt:78 $kotlin.String.foldChars
 // Preconditions.kt:80 $kotlin.String.foldChars
@@ -94,7 +94,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -106,21 +106,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/multiModule.kt b/compiler/testData/debug/stepping/multiModule.kt
index bd1434f92ee..d4372e48d77 100644
--- a/compiler/testData/debug/stepping/multiModule.kt
+++ b/compiler/testData/debug/stepping/multiModule.kt
@@ -48,6 +48,6 @@ fun box() {
 // Array.kt:75 $kotlin.Array.set (8, 20, 27, 16, 8, 20, 27, 16)
 // Array.kt:76 $kotlin.Array.set (5, 5)
 // String.kt:149 $kotlin.stringLiteral (11, 4, 11, 4)
-// test.kt:16 $box (4, 4)
+// test.kt:16 $box
 // b.kt:9 $b (10, 10, 10, 10, 13)
 // test.kt:17 $box
diff --git a/compiler/testData/debug/stepping/multilineExpression.kt b/compiler/testData/debug/stepping/multilineExpression.kt
index 3bcc8cbfcf2..67eb0f0315e 100644
--- a/compiler/testData/debug/stepping/multilineExpression.kt
+++ b/compiler/testData/debug/stepping/multilineExpression.kt
@@ -27,7 +27,7 @@ fun test(a: Boolean, b: Boolean, c: Boolean): Boolean {
 // test.kt:7 box
 
 // EXPECTATIONS WASM
-// test.kt:6 $box (9, 15, 21, 4, 4)
+// test.kt:6 $box (9, 15, 21, 4)
 // test.kt:10 $test (11, 4)
 // test.kt:11 $test
 // test.kt:12 $test
diff --git a/compiler/testData/debug/stepping/nestedInline.kt b/compiler/testData/debug/stepping/nestedInline.kt
index 877dbd37272..cb6282235e9 100644
--- a/compiler/testData/debug/stepping/nestedInline.kt
+++ b/compiler/testData/debug/stepping/nestedInline.kt
@@ -89,7 +89,7 @@ inline fun html(init: () -> Unit) {
 // Array.kt:75 $kotlin.Array.set (8, 20, 27, 16, 8, 20, 27, 16)
 // Array.kt:76 $kotlin.Array.set (5, 5)
 // String.kt:149 $kotlin.stringLiteral (11, 4, 11, 4)
-// test.kt:10 $box (4, 3, 4)
+// test.kt:10 $box (4, 3)
 // test.kt:25 $box (124, 49, 72, 65, 117)
 // test.kt:5 $box
 // test.kt:11 $box
@@ -112,7 +112,7 @@ inline fun html(init: () -> Unit) {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -124,21 +124,21 @@ inline fun html(init: () -> Unit) {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt
index 5d03050252b..1d0ae2d23fe 100644
--- a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt
+++ b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt
@@ -30,6 +30,6 @@ inline fun lookAtMe(f: () -> Int) {
 // EXPECTATIONS WASM
 // test.kt:6 $box
 // test.kt:12 $box
-// test.kt:13 $box (4, 8, 4, 4)
+// test.kt:13 $box (4, 8, 4)
 // test.kt:7 $box (8, 10)
 // test.kt:9 $box
diff --git a/compiler/testData/debug/stepping/nullcheck.kt b/compiler/testData/debug/stepping/nullcheck.kt
index 23c48e57dbe..d19ba982990 100644
--- a/compiler/testData/debug/stepping/nullcheck.kt
+++ b/compiler/testData/debug/stepping/nullcheck.kt
@@ -79,5 +79,5 @@ fun testExpressionBody(nullable: String?) =
 // String.kt:143 $kotlin.stringLiteral (15, 8)
 // test.kt:20 $testExpressionBody (4, 4)
 // test.kt:22 $testExpressionBody (12, 21, 31, 12, 32, 32)
-// test.kt:10 $box (23, 4, 4)
+// test.kt:10 $box (23, 4)
 // test.kt:11 $box
diff --git a/compiler/testData/debug/stepping/primitiveNullChecks.kt b/compiler/testData/debug/stepping/primitiveNullChecks.kt
index 559a67f1b2d..327ff661d16 100644
--- a/compiler/testData/debug/stepping/primitiveNullChecks.kt
+++ b/compiler/testData/debug/stepping/primitiveNullChecks.kt
@@ -51,7 +51,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -63,21 +63,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/propertyAccessor.kt b/compiler/testData/debug/stepping/propertyAccessor.kt
index 70a28a817be..42e414331be 100644
--- a/compiler/testData/debug/stepping/propertyAccessor.kt
+++ b/compiler/testData/debug/stepping/propertyAccessor.kt
@@ -28,7 +28,7 @@ fun box() {
 // test.kt:13 box
 
 // EXPECTATIONS WASM
-// test.kt:12 $box (4, 4, 8, 8)
+// test.kt:12 $box (4, 4, 8)
 // test.kt:9 $A.<init>
 // test.kt:7 $A.<get-prop> (19, 12)
 // test.kt:13 $box
diff --git a/compiler/testData/debug/stepping/simpleDefaultArg.kt b/compiler/testData/debug/stepping/simpleDefaultArg.kt
index 8f2f674ee5f..dc86031134e 100644
--- a/compiler/testData/debug/stepping/simpleDefaultArg.kt
+++ b/compiler/testData/debug/stepping/simpleDefaultArg.kt
@@ -53,7 +53,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -65,21 +65,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt
index c49f6818dff..160dd88a7a7 100644
--- a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt
+++ b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt
@@ -66,7 +66,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -78,21 +78,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
index 67af76d9cec..bea0df1c64e 100644
--- a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
+++ b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
@@ -56,7 +56,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -68,21 +68,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt
index 3a60e98e742..8b08d245b24 100644
--- a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt
@@ -72,7 +72,7 @@ fun fail() : String {
 // String.kt:29 $kotlin.String.plus (15, 15, 15, 15, 22, 28, 33, 42, 48, 28, 62, 56, 15, 8, 15, 15, 15, 15, 22, 28, 33, 42, 48, 28, 62, 56, 15, 8)
 // String.kt:63 $kotlin.String.plus (12, 12)
 // String.kt:66 $kotlin.String.plus (15, 8, 15, 8)
-// test.kt:10 $box (4, 4, 4)
+// test.kt:10 $box (4, 4)
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8)
 // test.kt:11 $box
 // test.kt:12 $box
diff --git a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt
index d11b6f48cbe..19636a8f824 100644
--- a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt
@@ -64,6 +64,6 @@ fun fail() : String {
 // test.kt:6 $box
 // test.kt:21 $fail (11, 11, 11, 11, 4, 11, 11, 11, 11, 4)
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8, 15, 8, 15, 8, 15, 8, 15, 8)
-// test.kt:8 $box (4, 9, 4)
+// test.kt:8 $box (4, 9)
 // test.kt:9 $box (16, 21, 21, 21, 21, 26, 26, 26, 26)
 // test.kt:10 $box
diff --git a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt
index 14ce4f5d245..83ad206c73d 100644
--- a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt
@@ -64,7 +64,7 @@ fun fail() : String {
 // String.kt:29 $kotlin.String.plus (15, 15, 15, 15, 22, 28, 33, 42, 48, 28, 62, 56, 15, 8, 15, 15, 15, 15, 22, 28, 33, 42, 48, 28, 62, 56, 15, 8)
 // String.kt:63 $kotlin.String.plus (12, 12)
 // String.kt:66 $kotlin.String.plus (15, 8, 15, 8)
-// test.kt:8 $box (4, 4, 4)
+// test.kt:8 $box (4, 4)
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8)
 // test.kt:9 $box
 // test.kt:10 $box
diff --git a/compiler/testData/debug/stepping/stringSwitches.kt b/compiler/testData/debug/stepping/stringSwitches.kt
index cad21562e63..e4d7fa0d500 100644
--- a/compiler/testData/debug/stepping/stringSwitches.kt
+++ b/compiler/testData/debug/stepping/stringSwitches.kt
@@ -142,7 +142,7 @@ fun box() {
 // String.kt:63 $kotlin.String.hashCode (12, 12, 12, 12)
 // String.kt:66 $kotlin.String.hashCode (15, 8, 15, 8, 15, 8, 15, 8)
 // String.kt:127 $kotlin.String.hashCode (19, 8, 19, 8, 19, 8, 19, 8)
-// String.kt:128 $kotlin.String.hashCode (8, 8, 8, 8, 8, 8, 8, 8)
+// String.kt:128 $kotlin.String.hashCode (8, 8, 8, 8)
 // Standard.kt:136 $kotlin.String.hashCode (18, 52, 61, 52, 66, 51, 51, 44, 18, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 18, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 18, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44)
 // Standard.kt:152 $kotlin.String.hashCode (4, 4, 4, 4)
 // Standard.kt:154 $kotlin.String.hashCode (18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4)
diff --git a/compiler/testData/debug/stepping/stringSwitchesSmall.kt b/compiler/testData/debug/stepping/stringSwitchesSmall.kt
index 5192422575e..77a1dd39180 100644
--- a/compiler/testData/debug/stepping/stringSwitchesSmall.kt
+++ b/compiler/testData/debug/stepping/stringSwitchesSmall.kt
@@ -127,7 +127,7 @@ fun box() {
 // String.kt:63 $kotlin.String.hashCode (12, 12, 12)
 // String.kt:66 $kotlin.String.hashCode (15, 8, 15, 8, 15, 8)
 // String.kt:127 $kotlin.String.hashCode (19, 8, 19, 8, 19, 8)
-// String.kt:128 $kotlin.String.hashCode (8, 8, 8, 8, 8, 8)
+// String.kt:128 $kotlin.String.hashCode (8, 8, 8)
 // Standard.kt:136 $kotlin.String.hashCode (18, 52, 61, 52, 66, 51, 51, 44, 18, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 18, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44, 52, 61, 52, 66, 51, 51, 44)
 // Standard.kt:152 $kotlin.String.hashCode (4, 4, 4)
 // Standard.kt:154 $kotlin.String.hashCode (18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 4, 26, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4, 18, 9, 18, 4, 26, 4, 4)
diff --git a/compiler/testData/debug/stepping/throwException.kt b/compiler/testData/debug/stepping/throwException.kt
index 342eb762e02..b73f6d8ca64 100644
--- a/compiler/testData/debug/stepping/throwException.kt
+++ b/compiler/testData/debug/stepping/throwException.kt
@@ -46,10 +46,10 @@ fun throwIfLess(a: Int, b: Int) {
 // test.kt:7 $box (20, 23, 8)
 // test.kt:15 $throwIfLess (8, 10, 8, 8, 10, 8)
 // test.kt:16 $throwIfLess (14, 14, 8, 14, 14, 8)
-// Exceptions.kt:37 $kotlin.IllegalStateException.<init> (34, 34, 4, 4, 41, 34, 34, 4, 4, 41)
-// Exceptions.kt:23 $kotlin.RuntimeException.<init> (34, 34, 4, 4, 41, 34, 34, 4, 4, 41)
-// Exceptions.kt:16 $kotlin.Exception.<init> (34, 34, 4, 4, 41, 34, 34, 4, 4, 41)
-// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 27, 43, 32, 38, 27, 27, 43)
+// Exceptions.kt:37 $kotlin.IllegalStateException.<init> (34, 4, 41, 34, 4, 41)
+// Exceptions.kt:23 $kotlin.RuntimeException.<init> (34, 4, 41, 34, 4, 41)
+// Exceptions.kt:16 $kotlin.Exception.<init> (34, 4, 41, 34, 4, 41)
+// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 43, 32, 38, 27, 43)
 // Throwable.kt:18 $kotlin.Throwable.<init> (28, 62, 28, 62)
 // Throwable.kt:25 $kotlin.Throwable.<init> (50, 50)
 // ExternalWrapper.kt:226 $kotlin.wasm.internal.jsCheckIsNullOrUndefinedAdapter (18, 8, 32, 33, 18, 8, 32, 33, 18, 8, 32, 33)
@@ -103,7 +103,7 @@ fun throwIfLess(a: Int, b: Int) {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -115,21 +115,21 @@ fun throwIfLess(a: Int, b: Int) {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/topLevel.kt b/compiler/testData/debug/stepping/topLevel.kt
index f0f1e359bbd..b4e790475de 100644
--- a/compiler/testData/debug/stepping/topLevel.kt
+++ b/compiler/testData/debug/stepping/topLevel.kt
@@ -21,6 +21,6 @@ fun box() {
 // test.kt:10 box
 
 // EXPECTATIONS WASM
-// test.kt:9 $box (4, 4)
+// test.kt:9 $box
 // test.kt:4 $foo (12, 16)
 // test.kt:10 $box
diff --git a/compiler/testData/debug/stepping/tryCatch.kt b/compiler/testData/debug/stepping/tryCatch.kt
index c480983a9a5..0141c24b050 100644
--- a/compiler/testData/debug/stepping/tryCatch.kt
+++ b/compiler/testData/debug/stepping/tryCatch.kt
@@ -61,8 +61,8 @@ fun box() {
 // String.kt:149 $kotlin.stringLiteral (11, 4)
 // test.kt:11 $foo (1, 1)
 // test.kt:15 $box (8, 4)
-// Exceptions.kt:16 $kotlin.Exception.<init> (34, 34, 4, 4, 41)
-// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 27, 43)
+// Exceptions.kt:16 $kotlin.Exception.<init> (34, 4, 41)
+// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 43)
 // Throwable.kt:18 $kotlin.Throwable.<init> (28, 62)
 // Throwable.kt:25 $kotlin.Throwable.<init>
 // ExternalWrapper.kt:226 $kotlin.wasm.internal.jsCheckIsNullOrUndefinedAdapter (18, 8, 32, 33)
diff --git a/compiler/testData/debug/stepping/tryCatchExpression.kt b/compiler/testData/debug/stepping/tryCatchExpression.kt
index b02f54720e9..c6ad1a2e332 100644
--- a/compiler/testData/debug/stepping/tryCatchExpression.kt
+++ b/compiler/testData/debug/stepping/tryCatchExpression.kt
@@ -171,8 +171,8 @@ fun box() {
 // test.kt:22 $foo
 // test.kt:43 $box (13, 4)
 // test.kt:44 $box
-// Exceptions.kt:16 $kotlin.Exception.<init> (34, 34, 4, 4, 41, 34, 34, 4, 4, 41, 34, 34, 4, 4, 41)
-// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 27, 43, 32, 38, 27, 27, 43, 32, 38, 27, 27, 43)
+// Exceptions.kt:16 $kotlin.Exception.<init> (34, 4, 41, 34, 4, 41, 34, 4, 41)
+// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 43, 32, 38, 27, 43, 32, 38, 27, 43)
 // Throwable.kt:18 $kotlin.Throwable.<init> (28, 62, 28, 62, 28, 62)
 // Throwable.kt:25 $kotlin.Throwable.<init> (50, 50, 50)
 // ExternalWrapper.kt:226 $kotlin.wasm.internal.jsCheckIsNullOrUndefinedAdapter (18, 8, 32, 33, 18, 8, 32, 33, 18, 8, 32, 33)
diff --git a/compiler/testData/debug/stepping/tryCatchFinally.kt b/compiler/testData/debug/stepping/tryCatchFinally.kt
index 2dae849137c..dc673afae9c 100644
--- a/compiler/testData/debug/stepping/tryCatchFinally.kt
+++ b/compiler/testData/debug/stepping/tryCatchFinally.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun foo() {
@@ -135,7 +135,14 @@ fun box() {
 // test.kt:6 $foo (8, 8, 8)
 // test.kt:26 $mightThrow (8, 8, 8, 22, 22, 16)
 // test.kt:27 $mightThrow (1, 1)
+
+// EXPECTATIONS FIR WASM
+// test.kt:5 $foo (4, 4, 4, 4, 4, 4)
+
+// EXPECTATIONS ClassicFrontend WASM
 // test.kt:5 $foo (4, 4, 4)
+
+// EXPECTATIONS WASM
 // test.kt:10 $foo (8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
@@ -159,8 +166,8 @@ fun box() {
 // test.kt:35 $box (13, 4)
 // test.kt:36 $box
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8, 15, 8, 15, 8, 15, 8)
-// Exceptions.kt:16 $kotlin.Exception.<init> (34, 34, 4, 4, 41, 34, 34, 4, 4, 41, 34, 34, 4, 4, 41)
-// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 27, 43, 32, 38, 27, 27, 43, 32, 38, 27, 27, 43)
+// Exceptions.kt:16 $kotlin.Exception.<init> (34, 4, 41, 34, 4, 41, 34, 4, 41)
+// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 43, 32, 38, 27, 43, 32, 38, 27, 43)
 // Throwable.kt:18 $kotlin.Throwable.<init> (28, 62, 28, 62, 28, 62)
 // Throwable.kt:25 $kotlin.Throwable.<init> (50, 50, 50)
 // ExternalWrapper.kt:226 $kotlin.wasm.internal.jsCheckIsNullOrUndefinedAdapter (18, 8, 32, 33, 18, 8, 32, 33, 18, 8, 32, 33)
diff --git a/compiler/testData/debug/stepping/tryFinally.kt b/compiler/testData/debug/stepping/tryFinally.kt
index c6235450de8..742523953a5 100644
--- a/compiler/testData/debug/stepping/tryFinally.kt
+++ b/compiler/testData/debug/stepping/tryFinally.kt
@@ -112,8 +112,8 @@ fun box() {
 // test.kt:31 $box (13, 4)
 // test.kt:32 $box
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8)
-// Exceptions.kt:16 $kotlin.Exception.<init> (34, 34, 4, 4, 41)
-// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 27, 43)
+// Exceptions.kt:16 $kotlin.Exception.<init> (34, 4, 41)
+// Throwable.kt:23 $kotlin.Throwable.<init> (32, 38, 27, 43)
 // Throwable.kt:18 $kotlin.Throwable.<init> (28, 62)
 // Throwable.kt:25 $kotlin.Throwable.<init>
 // ExternalWrapper.kt:226 $kotlin.wasm.internal.jsCheckIsNullOrUndefinedAdapter (18, 8, 32, 33, 18, 8, 32, 33)
@@ -149,7 +149,7 @@ fun box() {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -161,21 +161,21 @@ fun box() {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/voidLambdaStepInline.kt b/compiler/testData/debug/stepping/voidLambdaStepInline.kt
index 5a03d5542c5..b7161363acd 100644
--- a/compiler/testData/debug/stepping/voidLambdaStepInline.kt
+++ b/compiler/testData/debug/stepping/voidLambdaStepInline.kt
@@ -24,7 +24,7 @@ fun box(): String {
 // EXPECTATIONS WASM
 // test.kt:5 $box
 // Standard.kt:41 $box (4, 4)
-// Standard.kt:44 $box (11, 11, 11, 4, 11, 11, 11, 4)
+// Standard.kt:44 $box (11, 11, 4, 11, 11, 4)
 // Standard.kt:2 $box (46, 46, 46, 46, 55, 76, 76, 76, 76, 85)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
@@ -58,7 +58,7 @@ fun box(): String {
 // MemoryAllocation.kt:56 $kotlin.wasm.internal.kotlinToJsStringAdapter (20, 4)
 // MemoryAllocation.kt:69 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (20, 38, 20)
 // MemoryAllocation.kt:70 $kotlin.wasm.unsafe.createAllocatorInTheNewScope (8, 30, 68, 8)
-// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init> (4, 4)
+// MemoryAllocation.kt:88 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:24 $kotlin.wasm.unsafe.MemoryAllocator.<init>
 // MemoryAllocation.kt:86 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
 // MemoryAllocation.kt:90 $kotlin.wasm.unsafe.ScopedMemoryAllocator.<init>
@@ -70,21 +70,21 @@ fun box(): String {
 // MemoryAllocation.kt:58 $kotlin.wasm.internal.kotlinToJsStringAdapter (8, 14)
 // MemoryAllocation.kt:160 $kotlin.wasm.internal.kotlinToJsStringAdapter (828, 739, 758, 784, 771, 803, 758, 739, 749, 749, 749, 820, 8580, 8584, 723, 882, 845, 915, 895, 932, 948, 963, 948, 932, 932, 932, 1251, 1261, 1276, 1291, 1276, 1306, 1220, 1353, 1364, 1379, 1364, 1394, 1332, 1325, 1325)
 // _Ranges.kt:1321 $kotlin.ranges.coerceAtMost (15, 22, 15, 54, 4)
-// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:99 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // PreconditionsWasm.kt:29 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (2303, 2302, 2388, 2387, 2728, 2737, 2728, 2742, 2751, 2742, 2760, 2742)
 // PreconditionsWasm.kt:17 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 4, 4)
 // PreconditionsWasm.kt:20 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (9, 8, 9, 8, 9, 8)
-// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:100 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:104 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (20, 8)
 // MemoryAllocation.kt:105 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (22, 41, 22, 49, 22, 68, 21, 8)
 // Primitives.kt:93 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (50, 58, 50)
 // Primitives.kt:1281 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 17, 13, 20)
-// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:106 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // MemoryAllocation.kt:108 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (16, 28, 12, 47, 12)
 // MemoryAllocation.kt:112 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (27, 36, 27, 8)
 // MemoryAllocation.kt:114 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (29, 48, 29, 8)
 // MemoryAllocation.kt:115 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (12, 32, 12)
-// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (8, 8)
+// MemoryAllocation.kt:125 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:144 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (456, 475, 494, 475, 456)
 // Preconditions.kt:80 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate
 // Preconditions.kt:83 $kotlin.wasm.unsafe.ScopedMemoryAllocator.allocate (4, 10)
diff --git a/compiler/testData/debug/stepping/whenConstant.kt b/compiler/testData/debug/stepping/whenConstant.kt
index 3893e3435a1..29af7376729 100644
--- a/compiler/testData/debug/stepping/whenConstant.kt
+++ b/compiler/testData/debug/stepping/whenConstant.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun box() {
diff --git a/compiler/testData/debug/stepping/whenExpr.kt b/compiler/testData/debug/stepping/whenExpr.kt
index 20076749cb6..fd603ea24af 100644
--- a/compiler/testData/debug/stepping/whenExpr.kt
+++ b/compiler/testData/debug/stepping/whenExpr.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun box() {
diff --git a/compiler/testData/debug/stepping/whenMultiLine.kt b/compiler/testData/debug/stepping/whenMultiLine.kt
index d076c01481a..2f455fa9fbd 100644
--- a/compiler/testData/debug/stepping/whenMultiLine.kt
+++ b/compiler/testData/debug/stepping/whenMultiLine.kt
@@ -84,7 +84,7 @@ fun box() {
 // test.kt:28 $box (8, 4, 4)
 // test.kt:9 $foo
 // test.kt:18 $foo
-// test.kt:29 $box (8, 4, 4)
+// test.kt:29 $box (8, 4)
 // test.kt:11 $foo
 // test.kt:20 $foo
 // test.kt:30 $box
diff --git a/compiler/testData/debug/stepping/whenMultiLineSubject.kt b/compiler/testData/debug/stepping/whenMultiLineSubject.kt
index 53df52245b2..96e6f686998 100644
--- a/compiler/testData/debug/stepping/whenMultiLineSubject.kt
+++ b/compiler/testData/debug/stepping/whenMultiLineSubject.kt
@@ -86,7 +86,7 @@ fun box() {
 // test.kt:28 $box (8, 4, 4)
 // test.kt:9 $foo
 // test.kt:18 $foo
-// test.kt:29 $box (8, 4, 4)
+// test.kt:29 $box (8, 4)
 // test.kt:11 $foo
 // test.kt:20 $foo
 // test.kt:30 $box
diff --git a/compiler/testData/debug/stepping/whenNullalbeSubject.kt b/compiler/testData/debug/stepping/whenNullalbeSubject.kt
index 0bbac28c646..301381e3bf5 100644
--- a/compiler/testData/debug/stepping/whenNullalbeSubject.kt
+++ b/compiler/testData/debug/stepping/whenNullalbeSubject.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun box() {