diff --git a/plugins/stream-debugger/testData/debug/outs/accessToPrivateClass.out b/plugins/stream-debugger/testData/debug/outs/accessToPrivateClass.out
index d6f10b149b02..d753230238bd 100644
--- a/plugins/stream-debugger/testData/debug/outs/accessToPrivateClass.out
+++ b/plugins/stream-debugger/testData/debug/outs/accessToPrivateClass.out
@@ -6,9 +6,6 @@ Stream.generate(() -> new MyClass())
 .mapToInt(x -> x.field)
 .limit(10)
 .count()
-Stream.generate
-    before: nothing
-    after: 1,4,7,10,13,16,19,22,25,28
 mapToInt
     before: 1,4,7,10,13,16,19,22,25,28
     after: 2,5,8,11,14,17,20,23,26,29
@@ -18,20 +15,6 @@ limit
 count
     before: 3,6,9,12,15,18,21,24,27,30
     after: nothing
-mappings for Stream.generate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 4
-    nothing <- 7
-    nothing <- 10
-    nothing <- 13
-    nothing <- 16
-    nothing <- 19
-    nothing <- 22
-    nothing <- 25
-    nothing <- 28
 mappings for mapToInt
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassInStaticContext.out b/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassInStaticContext.out
index 065f715865dc..91e5988941de 100644
--- a/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassInStaticContext.out
+++ b/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassInStaticContext.out
@@ -6,9 +6,6 @@ Stream.generate(() -> new MyClass())
 .mapToInt(x -> x.field)
 .limit(10)
 .count()
-Stream.generate
-    before: nothing
-    after: 1,4,7,10,13,16,19,22,25,28
 mapToInt
     before: 1,4,7,10,13,16,19,22,25,28
     after: 2,5,8,11,14,17,20,23,26,29
@@ -18,20 +15,6 @@ limit
 count
     before: 3,6,9,12,15,18,21,24,27,30
     after: nothing
-mappings for Stream.generate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 4
-    nothing <- 7
-    nothing <- 10
-    nothing <- 13
-    nothing <- 16
-    nothing <- 19
-    nothing <- 22
-    nothing <- 25
-    nothing <- 28
 mappings for mapToInt
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassWithMethodReference.out b/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassWithMethodReference.out
index 5aab024de54d..193fffa6afaf 100644
--- a/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassWithMethodReference.out
+++ b/plugins/stream-debugger/testData/debug/outs/accessToPrivateClassWithMethodReference.out
@@ -6,9 +6,6 @@ Stream.generate(MyClass::new)
 .mapToInt(x -> x.field)
 .limit(10)
 .count()
-Stream.generate
-    before: nothing
-    after: 1,4,7,10,13,16,19,22,25,28
 mapToInt
     before: 1,4,7,10,13,16,19,22,25,28
     after: 2,5,8,11,14,17,20,23,26,29
@@ -18,20 +15,6 @@ limit
 count
     before: 3,6,9,12,15,18,21,24,27,30
     after: nothing
-mappings for Stream.generate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 4
-    nothing <- 7
-    nothing <- 10
-    nothing <- 13
-    nothing <- 16
-    nothing <- 19
-    nothing <- 22
-    nothing <- 25
-    nothing <- 28
 mappings for mapToInt
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethods.out b/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethods.out
index a5bab7150273..871aaf0b5f12 100644
--- a/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethods.out
+++ b/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethods.out
@@ -7,9 +7,6 @@ Stream.generate(() -> 1)
 .filter(x -> method(x))
 .mapToInt(x -> x * 2)
 .count()
-Stream.generate
-    before: nothing
-    after: 1,5,9,13,17,21,25,29,33,37
 limit
     before: 1,5,9,13,17,21,25,29,33,37
     after: 2,6,10,14,18,22,26,30,34,38
@@ -22,20 +19,6 @@ mapToInt
 count
     before: 4,8,12,16,20,24,28,32,36,40
     after: nothing
-mappings for Stream.generate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 5
-    nothing <- 9
-    nothing <- 13
-    nothing <- 17
-    nothing <- 21
-    nothing <- 25
-    nothing <- 29
-    nothing <- 33
-    nothing <- 37
 mappings for limit
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethodsInStaticContext.out b/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethodsInStaticContext.out
index d81e0998d918..b19f2f71db2f 100644
--- a/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethodsInStaticContext.out
+++ b/plugins/stream-debugger/testData/debug/outs/accessToPrivateMethodsInStaticContext.out
@@ -7,9 +7,6 @@ Stream.generate(() -> 1)
 .peek(x -> method(x))
 .filter(x -> x % 2 == 0)
 .count()
-Stream.generate
-    before: nothing
-    after: 1,4,7,10,13,16,19,22,25,28
 limit
     before: 1,4,7,10,13,16,19,22,25,28
     after: 2,5,8,11,14,17,20,23,26,29
@@ -22,20 +19,6 @@ filter
 count
     before: nothing
     after: nothing
-mappings for Stream.generate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 4
-    nothing <- 7
-    nothing <- 10
-    nothing <- 13
-    nothing <- 16
-    nothing <- 19
-    nothing <- 22
-    nothing <- 25
-    nothing <- 28
 mappings for limit
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/allMatchExtraCalls.out b/plugins/stream-debugger/testData/debug/outs/allMatchExtraCalls.out
index bea758bed59b..63e9eed6d458 100644
--- a/plugins/stream-debugger/testData/debug/outs/allMatchExtraCalls.out
+++ b/plugins/stream-debugger/testData/debug/outs/allMatchExtraCalls.out
@@ -7,17 +7,9 @@ Stream.of(2)
       System.out.println("called");
       return false;
     })
-Stream.of
-    before: nothing
-    after: 1
 allMatch
     before: 1
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for allMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/allMatchMappingFalse.out b/plugins/stream-debugger/testData/debug/outs/allMatchMappingFalse.out
index b2df09276758..cf5639891bf9 100644
--- a/plugins/stream-debugger/testData/debug/outs/allMatchMappingFalse.out
+++ b/plugins/stream-debugger/testData/debug/outs/allMatchMappingFalse.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 AllMatchMappingFalse.java:6
 Stream.of(1, 2, 3)
 .allMatch(x -> x % 2 == 0)
-Stream.of
-    before: nothing
-    after: 1
 allMatch
     before: 1
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for allMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/allMatchMappingTrue.out b/plugins/stream-debugger/testData/debug/outs/allMatchMappingTrue.out
index 8859ddf8058e..2eaab4ef124d 100644
--- a/plugins/stream-debugger/testData/debug/outs/allMatchMappingTrue.out
+++ b/plugins/stream-debugger/testData/debug/outs/allMatchMappingTrue.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 AllMatchMappingTrue.java:6
 Stream.of(1, 2, 3)
 .allMatch(x -> x > 0)
-Stream.of
-    before: nothing
-    after: 1,2,3
 allMatch
     before: 1,2,3
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for allMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/anyMatchExtraCalls.out b/plugins/stream-debugger/testData/debug/outs/anyMatchExtraCalls.out
index 2dc47e68ed1c..097372c7a286 100644
--- a/plugins/stream-debugger/testData/debug/outs/anyMatchExtraCalls.out
+++ b/plugins/stream-debugger/testData/debug/outs/anyMatchExtraCalls.out
@@ -7,17 +7,9 @@ Stream.of(1)
       System.out.println("called");
       return false;
     })
-Stream.of
-    before: nothing
-    after: 1
 anyMatch
     before: 1
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for anyMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/anyMatchMappingFalse.out b/plugins/stream-debugger/testData/debug/outs/anyMatchMappingFalse.out
index f57531bbcb53..c62e8069873b 100644
--- a/plugins/stream-debugger/testData/debug/outs/anyMatchMappingFalse.out
+++ b/plugins/stream-debugger/testData/debug/outs/anyMatchMappingFalse.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 AnyMatchMappingFalse.java:6
 Stream.of(1, 2, 3)
 .anyMatch(x -> x == 5)
-Stream.of
-    before: nothing
-    after: 1,2,3
 anyMatch
     before: 1,2,3
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for anyMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/anyMatchMappingTrue.out b/plugins/stream-debugger/testData/debug/outs/anyMatchMappingTrue.out
index 89144d4d951f..beafa4db40e5 100644
--- a/plugins/stream-debugger/testData/debug/outs/anyMatchMappingTrue.out
+++ b/plugins/stream-debugger/testData/debug/outs/anyMatchMappingTrue.out
@@ -4,21 +4,11 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 AnyMatchMappingTrue.java:6
 Stream.of(1, 2)
 .anyMatch(x -> x % 2 == 0)
-Stream.of
-    before: nothing
-    after: 1,2
 anyMatch
     before: 2
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
 mappings for anyMatch
   direct:
-    1 -> nothing
     2 -> 2147483647
   reverse:
     2 <- 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/distinctEquals.out b/plugins/stream-debugger/testData/debug/outs/distinctEquals.out
index 8a335559b07f..ab71304c27a8 100644
--- a/plugins/stream-debugger/testData/debug/outs/distinctEquals.out
+++ b/plugins/stream-debugger/testData/debug/outs/distinctEquals.out
@@ -5,22 +5,12 @@ DistinctEquals.java:22
 Stream.of(Id.create(), Id.create(), Id.create())
 .distinct()
 .count()
-Stream.of
-    before: nothing
-    after: 1,3,4
 distinct
     before: 1,3,4
     after: 2
 count
     before: 2
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 4
 mappings for distinct
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/distinctHardCase.out b/plugins/stream-debugger/testData/debug/outs/distinctHardCase.out
index 922d338f4f1a..d00a82d83c75 100644
--- a/plugins/stream-debugger/testData/debug/outs/distinctHardCase.out
+++ b/plugins/stream-debugger/testData/debug/outs/distinctHardCase.out
@@ -5,22 +5,12 @@ DistinctHardCase.java:6
 Stream.of(new Integer(1), new Integer(2), new Integer(1))
 .distinct()
 .count()
-Stream.of
-    before: nothing
-    after: 1,3,5
 distinct
     before: 1,3,5
     after: 2,4
 count
     before: 2,4
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
 mappings for distinct
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/distinctHardPrimitive.out b/plugins/stream-debugger/testData/debug/outs/distinctHardPrimitive.out
index d7b68d936925..eb371e4f1b2d 100644
--- a/plugins/stream-debugger/testData/debug/outs/distinctHardPrimitive.out
+++ b/plugins/stream-debugger/testData/debug/outs/distinctHardPrimitive.out
@@ -5,22 +5,12 @@ DistinctHardPrimitive.java:6
 IntStream.of(1, 2, 1)
 .distinct()
 .count()
-IntStream.of
-    before: nothing
-    after: 1,3,5
 distinct
     before: 1,3,5
     after: 2,4
 count
     before: 2,4
     after: nothing
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
 mappings for distinct
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/distinctPrimitive.out b/plugins/stream-debugger/testData/debug/outs/distinctPrimitive.out
index 965c81b4dda6..b31c21f42514 100644
--- a/plugins/stream-debugger/testData/debug/outs/distinctPrimitive.out
+++ b/plugins/stream-debugger/testData/debug/outs/distinctPrimitive.out
@@ -5,22 +5,12 @@ DistinctPrimitive.java:6
 LongStream.of(1, 1, 1)
 .distinct()
 .count()
-LongStream.of
-    before: nothing
-    after: 1,3,4
 distinct
     before: 1,3,4
     after: 2
 count
     before: 2
     after: nothing
-mappings for LongStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 4
 mappings for distinct
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/distinctSame.out b/plugins/stream-debugger/testData/debug/outs/distinctSame.out
index 2aa5dc842f7c..3703c7b5664f 100644
--- a/plugins/stream-debugger/testData/debug/outs/distinctSame.out
+++ b/plugins/stream-debugger/testData/debug/outs/distinctSame.out
@@ -5,22 +5,12 @@ DistinctSame.java:7
 Stream.of(obj, obj, obj)
 .distinct()
 .count()
-Stream.of
-    before: nothing
-    after: 1,3,4
 distinct
     before: 1,3,4
     after: 2
 count
     before: 2
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 4
 mappings for distinct
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/exceptionAsStreamResult.out b/plugins/stream-debugger/testData/debug/outs/exceptionAsStreamResult.out
index 708fbafdd85d..383132eb9c5d 100644
--- a/plugins/stream-debugger/testData/debug/outs/exceptionAsStreamResult.out
+++ b/plugins/stream-debugger/testData/debug/outs/exceptionAsStreamResult.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 ExceptionAsStreamResult.java:6
 Stream.of(new Throwable())
 .reduce(new Throwable(), (l, r) -> l)
-Stream.of
-    before: nothing
-    after: 1
 reduce
     before: 1
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for reduce
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/exceptionInIntermediateCall.out b/plugins/stream-debugger/testData/debug/outs/exceptionInIntermediateCall.out
index 82659a59c0fb..b4dfe1a46644 100644
--- a/plugins/stream-debugger/testData/debug/outs/exceptionInIntermediateCall.out
+++ b/plugins/stream-debugger/testData/debug/outs/exceptionInIntermediateCall.out
@@ -10,21 +10,12 @@ Stream.of(1, 2, 3)
       throw new RuntimeException();
     })
 .collect(Collectors.toList())
-Stream.of
-    before: nothing
-    after: 1,3
 map
     before: 1,3
     after: 2
 collect
     before: 2
     after: 3
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
 mappings for map
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/exceptionInProducerCall.out b/plugins/stream-debugger/testData/debug/outs/exceptionInProducerCall.out
index 84078d264397..9ff9b4183b84 100644
--- a/plugins/stream-debugger/testData/debug/outs/exceptionInProducerCall.out
+++ b/plugins/stream-debugger/testData/debug/outs/exceptionInProducerCall.out
@@ -7,20 +7,12 @@ Stream.generate(() -> {
     })
 .map(Function.identity())
 .toArray()
-Stream.generate
-    before: nothing
-    after: nothing
 map
     before: nothing
     after: nothing
 toArray
     before: nothing
     after: nothing
-mappings for Stream.generate
-  direct:
-    no
-  reverse:
-    empty
 mappings for map
   direct:
     empty
diff --git a/plugins/stream-debugger/testData/debug/outs/exceptionInStreamWithPrimitiveResult.out b/plugins/stream-debugger/testData/debug/outs/exceptionInStreamWithPrimitiveResult.out
index 2121b5c4240a..109294a22c48 100644
--- a/plugins/stream-debugger/testData/debug/outs/exceptionInStreamWithPrimitiveResult.out
+++ b/plugins/stream-debugger/testData/debug/outs/exceptionInStreamWithPrimitiveResult.out
@@ -7,20 +7,12 @@ IntStream.of(1, 2, 3, 4)
       throw new RuntimeException();
     })
 .reduce(0, (l, r) -> l + r)
-IntStream.of
-    before: nothing
-    after: 1
 peek
     before: 1
     after: nothing
 reduce
     before: nothing
     after: nothing
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for peek
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/exceptionInTerminatorCall.out b/plugins/stream-debugger/testData/debug/outs/exceptionInTerminatorCall.out
index bad57b6ba39a..0fdb1a968d97 100644
--- a/plugins/stream-debugger/testData/debug/outs/exceptionInTerminatorCall.out
+++ b/plugins/stream-debugger/testData/debug/outs/exceptionInTerminatorCall.out
@@ -6,17 +6,9 @@ Stream.of(1, 2, 3)
 .reduce(0, (l, r) -> {
       throw new RuntimeException();
     })
-Stream.of
-    before: nothing
-    after: 1
 reduce
     before: 1
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for reduce
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/filter.out b/plugins/stream-debugger/testData/debug/outs/filter.out
index df284251d451..b019c90fa0d2 100644
--- a/plugins/stream-debugger/testData/debug/outs/filter.out
+++ b/plugins/stream-debugger/testData/debug/outs/filter.out
@@ -5,23 +5,12 @@ Filter.java:8
 Stream.of(1, 2, 3, 4)
 .filter(x -> x % 2 == 1)
 .count()
-Stream.of
-    before: nothing
-    after: 1,3,4,6
 filter
     before: 1,3,4,6
     after: 2,5
 count
     before: 2,5
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 4
-    nothing <- 6
 mappings for filter
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/filterPrimitive.out b/plugins/stream-debugger/testData/debug/outs/filterPrimitive.out
index 4e6a75181f6e..a4446ebaf87d 100644
--- a/plugins/stream-debugger/testData/debug/outs/filterPrimitive.out
+++ b/plugins/stream-debugger/testData/debug/outs/filterPrimitive.out
@@ -5,23 +5,12 @@ FilterPrimitive.java:6
 LongStream.of(1, 2, 3, 4)
 .filter(x -> x % 2 == 0)
 .count()
-LongStream.of
-    before: nothing
-    after: 1,2,4,5
 filter
     before: 1,2,4,5
     after: 3,6
 count
     before: 3,6
     after: nothing
-mappings for LongStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 4
-    nothing <- 5
 mappings for filter
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/findAnyMappingNone.out b/plugins/stream-debugger/testData/debug/outs/findAnyMappingNone.out
index b4c71582abeb..baec15ceac4e 100644
--- a/plugins/stream-debugger/testData/debug/outs/findAnyMappingNone.out
+++ b/plugins/stream-debugger/testData/debug/outs/findAnyMappingNone.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 FindAnyMappingNone.java:7
 Stream.empty()
 .findAny()
-Stream.empty
-    before: nothing
-    after: nothing
 findAny
     before: nothing
     after: nothing
-mappings for Stream.empty
-  direct:
-    no
-  reverse:
-    empty
 mappings for findAny
   direct:
     empty
diff --git a/plugins/stream-debugger/testData/debug/outs/findAnyMappingPresent.out b/plugins/stream-debugger/testData/debug/outs/findAnyMappingPresent.out
index f20640638efe..eaeee03d7fbb 100644
--- a/plugins/stream-debugger/testData/debug/outs/findAnyMappingPresent.out
+++ b/plugins/stream-debugger/testData/debug/outs/findAnyMappingPresent.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 FindAnyMappingPresent.java:10
 Stream.of(1, 2, 3)
 .findAny()
-Stream.of
-    before: nothing
-    after: 1
 findAny
     before: 1
     after: 2147483646
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for findAny
   direct:
     1 -> 2147483646
diff --git a/plugins/stream-debugger/testData/debug/outs/findFirstMappingNone.out b/plugins/stream-debugger/testData/debug/outs/findFirstMappingNone.out
index f22e07de9c65..6ec109dc8d42 100644
--- a/plugins/stream-debugger/testData/debug/outs/findFirstMappingNone.out
+++ b/plugins/stream-debugger/testData/debug/outs/findFirstMappingNone.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 FindFirstMappingNone.java:7
 Stream.empty()
 .findFirst()
-Stream.empty
-    before: nothing
-    after: nothing
 findFirst
     before: nothing
     after: nothing
-mappings for Stream.empty
-  direct:
-    no
-  reverse:
-    empty
 mappings for findFirst
   direct:
     empty
diff --git a/plugins/stream-debugger/testData/debug/outs/findFirstMappingPresent.out b/plugins/stream-debugger/testData/debug/outs/findFirstMappingPresent.out
index 06c08ddaba26..ca87ee44eb62 100644
--- a/plugins/stream-debugger/testData/debug/outs/findFirstMappingPresent.out
+++ b/plugins/stream-debugger/testData/debug/outs/findFirstMappingPresent.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 FindFirstMappingPresent.java:7
 Stream.of(1, 2, 3)
 .findFirst()
-Stream.of
-    before: nothing
-    after: 1
 findFirst
     before: 1
     after: 2147483646
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for findFirst
   direct:
     1 -> 2147483646
diff --git a/plugins/stream-debugger/testData/debug/outs/flatMap.out b/plugins/stream-debugger/testData/debug/outs/flatMap.out
index 1af2b358d7cb..33f25bfee735 100644
--- a/plugins/stream-debugger/testData/debug/outs/flatMap.out
+++ b/plugins/stream-debugger/testData/debug/outs/flatMap.out
@@ -5,21 +5,12 @@ FlatMap.java:6
 Stream.of(1, 4)
 .flatMap(x -> Stream.of(x + 1, x + 2))
 .count()
-Stream.of
-    before: nothing
-    after: 1,4
 flatMap
     before: 1,4
     after: 2,3,5,6
 count
     before: 2,3,5,6
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 4
 mappings for flatMap
   direct:
     1 -> 2,3
diff --git a/plugins/stream-debugger/testData/debug/outs/flatMapPrimitive.out b/plugins/stream-debugger/testData/debug/outs/flatMapPrimitive.out
index eb4a28518def..0de9552f69ac 100644
--- a/plugins/stream-debugger/testData/debug/outs/flatMapPrimitive.out
+++ b/plugins/stream-debugger/testData/debug/outs/flatMapPrimitive.out
@@ -5,22 +5,12 @@ FlatMapPrimitive.java:7
 Stream.of(1, 5, 9)
 .flatMapToDouble(x -> DoubleStream.of(x + 1, x + 2, x + 3))
 .toArray()
-Stream.of
-    before: nothing
-    after: 1,5,9
 flatMapToDouble
     before: 1,5,9
     after: 2,3,4,6,7,8,10,11,12
 toArray
     before: 2,3,4,6,7,8,10,11,12
     after: 13,14,15,16,17,18,19,20,21
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 5
-    nothing <- 9
 mappings for flatMapToDouble
   direct:
     1 -> 2,3,4
diff --git a/plugins/stream-debugger/testData/debug/outs/forEach.out b/plugins/stream-debugger/testData/debug/outs/forEach.out
index 325176c138d7..d2bd1b36c51b 100644
--- a/plugins/stream-debugger/testData/debug/outs/forEach.out
+++ b/plugins/stream-debugger/testData/debug/outs/forEach.out
@@ -2,22 +2,11 @@ LineBreakpoint created at ForEach.java:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!RT_JAR! ForEach
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 ForEach.java:6
-Stream.of(1, 2, 3, 4)
+Stream.of(1,2,3,4)
 .forEach(System.out::println)
-Stream.of
-    before: nothing
-    after: 1,2,3,4
 forEach
     before: 1,2,3,4
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
-    nothing <- 4
 mappings for forEach
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/forEachOrdered.out b/plugins/stream-debugger/testData/debug/outs/forEachOrdered.out
index d08468dac5fb..cae5c38aabf0 100644
--- a/plugins/stream-debugger/testData/debug/outs/forEachOrdered.out
+++ b/plugins/stream-debugger/testData/debug/outs/forEachOrdered.out
@@ -2,22 +2,11 @@ LineBreakpoint created at ForEachOrdered.java:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!RT_JAR! ForEachOrdered
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 ForEachOrdered.java:6
-Stream.of(1, 2, 3, 4)
+Stream.of(1,2,3,4)
 .forEachOrdered(System.out::println)
-Stream.of
-    before: nothing
-    after: 1,2,3,4
 forEachOrdered
     before: 1,2,3,4
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
-    nothing <- 4
 mappings for forEachOrdered
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/limit.out b/plugins/stream-debugger/testData/debug/outs/limit.out
index 0c3e963367b6..1b94a925d413 100644
--- a/plugins/stream-debugger/testData/debug/outs/limit.out
+++ b/plugins/stream-debugger/testData/debug/outs/limit.out
@@ -5,20 +5,12 @@ Limit.java:6
 Stream.of(1, 2, 3)
 .limit(1)
 .count()
-Stream.of
-    before: nothing
-    after: 1
 limit
     before: 1
     after: 2
 count
     before: 2
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for limit
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/linkedFirstChain.out b/plugins/stream-debugger/testData/debug/outs/linkedFirstChain.out
index 243a8fe5c768..0fcf3a559a2d 100644
--- a/plugins/stream-debugger/testData/debug/outs/linkedFirstChain.out
+++ b/plugins/stream-debugger/testData/debug/outs/linkedFirstChain.out
@@ -6,27 +6,12 @@ Stream
       .of(1, 2, 3, 4, 5, 6)
 .map(x -> x * x)
 .collect(Collectors.toList())
-Stream
-      .of
-    before: nothing
-    after: 1,3,5,7,9,11
 map
     before: 1,3,5,7,9,11
     after: 2,4,6,8,10,12
 collect
     before: 2,4,6,8,10,12
     after: 13,14,15,16,17,18
-mappings for Stream
-      .of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
-    nothing <- 7
-    nothing <- 9
-    nothing <- 11
 mappings for map
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/linkedFourChain.out b/plugins/stream-debugger/testData/debug/outs/linkedFourChain.out
index 99390a4b17c3..894df0a2862e 100644
--- a/plugins/stream-debugger/testData/debug/outs/linkedFourChain.out
+++ b/plugins/stream-debugger/testData/debug/outs/linkedFourChain.out
@@ -9,30 +9,12 @@ Stream
       .stream()
 .distinct()
 .collect(Collectors.toList())
-Stream
-      .of(1, 2, 3, 4, 5, 6).map(x -> x * x).collect(Collectors.toList())
-      .stream().filter(x -> x % 2 == 0).collect(Collectors.toList())
-      .stream().sorted().collect(Collectors.toList())
-      .stream
-    before: nothing
-    after: 1,3,5
 distinct
     before: 1,3,5
     after: 2,4,6
 collect
     before: 2,4,6
     after: 7,8,9
-mappings for Stream
-      .of(1, 2, 3, 4, 5, 6).map(x -> x * x).collect(Collectors.toList())
-      .stream().filter(x -> x % 2 == 0).collect(Collectors.toList())
-      .stream().sorted().collect(Collectors.toList())
-      .stream
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
 mappings for distinct
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/linkedSecondChain.out b/plugins/stream-debugger/testData/debug/outs/linkedSecondChain.out
index fd44311d4319..14bdb9c95754 100644
--- a/plugins/stream-debugger/testData/debug/outs/linkedSecondChain.out
+++ b/plugins/stream-debugger/testData/debug/outs/linkedSecondChain.out
@@ -7,29 +7,12 @@ Stream
       .stream()
 .filter(x -> x % 2 == 0)
 .collect(Collectors.toList())
-Stream
-      .of(1, 2, 3, 4, 5, 6).map(x -> x * x).collect(Collectors.toList())
-      .stream
-    before: nothing
-    after: 1,2,4,5,7,8
 filter
     before: 1,2,4,5,7,8
     after: 3,6,9
 collect
     before: 3,6,9
     after: 10,11,12
-mappings for Stream
-      .of(1, 2, 3, 4, 5, 6).map(x -> x * x).collect(Collectors.toList())
-      .stream
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 4
-    nothing <- 5
-    nothing <- 7
-    nothing <- 8
 mappings for filter
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/linkedThirdChain.out b/plugins/stream-debugger/testData/debug/outs/linkedThirdChain.out
index dba877746053..ef90573d91e4 100644
--- a/plugins/stream-debugger/testData/debug/outs/linkedThirdChain.out
+++ b/plugins/stream-debugger/testData/debug/outs/linkedThirdChain.out
@@ -8,28 +8,12 @@ Stream
       .stream()
 .sorted()
 .collect(Collectors.toList())
-Stream
-      .of(1, 2, 3, 4, 5, 6).map(x -> x * x).collect(Collectors.toList())
-      .stream().filter(x -> x % 2 == 0).collect(Collectors.toList())
-      .stream
-    before: nothing
-    after: 1,2,3
 sorted
     before: 1,2,3
     after: 4,5,6
 collect
     before: 4,5,6
     after: 7,8,9
-mappings for Stream
-      .of(1, 2, 3, 4, 5, 6).map(x -> x * x).collect(Collectors.toList())
-      .stream().filter(x -> x % 2 == 0).collect(Collectors.toList())
-      .stream
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for sorted
   direct:
     1 -> 4
diff --git a/plugins/stream-debugger/testData/debug/outs/map.out b/plugins/stream-debugger/testData/debug/outs/map.out
index 29fb450fa84d..af17baae83ec 100644
--- a/plugins/stream-debugger/testData/debug/outs/map.out
+++ b/plugins/stream-debugger/testData/debug/outs/map.out
@@ -5,22 +5,12 @@ Map.java:6
 Stream.of(1, 2, 3)
 .map(x -> x * x)
 .count()
-Stream.of
-    before: nothing
-    after: 1,3,5
 map
     before: 1,3,5
     after: 2,4,6
 count
     before: 2,4,6
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
 mappings for map
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/mapNullToValue.out b/plugins/stream-debugger/testData/debug/outs/mapNullToValue.out
index c63b92d4c0e1..3af97f854ebd 100644
--- a/plugins/stream-debugger/testData/debug/outs/mapNullToValue.out
+++ b/plugins/stream-debugger/testData/debug/outs/mapNullToValue.out
@@ -5,20 +5,12 @@ MapNullToValue.java:7
 Stream.of(null, null)
 .map(x -> new Object())
 .findAny()
-Stream.of
-    before: nothing
-    after: 1
 map
     before: 1
     after: 2
 findAny
     before: 2
     after: 2147483646
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for map
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/mapPrimitive.out b/plugins/stream-debugger/testData/debug/outs/mapPrimitive.out
index 4e4433d18573..5b4f0c7df4dc 100644
--- a/plugins/stream-debugger/testData/debug/outs/mapPrimitive.out
+++ b/plugins/stream-debugger/testData/debug/outs/mapPrimitive.out
@@ -5,23 +5,12 @@ MapPrimitive.java:6
 LongStream.of(1, 2, 3, 4)
 .map(x -> x - 1)
 .sum()
-LongStream.of
-    before: nothing
-    after: 1,3,5,7
 map
     before: 1,3,5,7
     after: 2,4,6,8
 sum
     before: 2,4,6,8
     after: nothing
-mappings for LongStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
-    nothing <- 7
 mappings for map
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/mapToNull.out b/plugins/stream-debugger/testData/debug/outs/mapToNull.out
index cb478afa4c5b..33806fad351e 100644
--- a/plugins/stream-debugger/testData/debug/outs/mapToNull.out
+++ b/plugins/stream-debugger/testData/debug/outs/mapToNull.out
@@ -6,9 +6,6 @@ Stream.of(1)
 .map(x -> null)
 .filter(x -> x != null)
 .findAny()
-Stream.of
-    before: nothing
-    after: 1
 map
     before: 1
     after: 2
@@ -18,11 +15,6 @@ filter
 findAny
     before: nothing
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for map
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/maxMappingNone.out b/plugins/stream-debugger/testData/debug/outs/maxMappingNone.out
index b393d15981f5..a8b959fc25b9 100644
--- a/plugins/stream-debugger/testData/debug/outs/maxMappingNone.out
+++ b/plugins/stream-debugger/testData/debug/outs/maxMappingNone.out
@@ -5,20 +5,12 @@ MaxMappingNone.java:8
 Stream.of(1)
 .skip(1)
 .max(Comparator.comparingInt(x -> -x))
-Stream.of
-    before: nothing
-    after: 1
 skip
     before: 1
     after: nothing
 max
     before: nothing
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for skip
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/maxMappingPresent.out b/plugins/stream-debugger/testData/debug/outs/maxMappingPresent.out
index 748c2567e6a2..39fbdbeb5fa7 100644
--- a/plugins/stream-debugger/testData/debug/outs/maxMappingPresent.out
+++ b/plugins/stream-debugger/testData/debug/outs/maxMappingPresent.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 MaxMappingPresent.java:8
 Stream.of(1, 2, 3)
 .max(Comparator.comparingInt(x -> -x))
-Stream.of
-    before: nothing
-    after: 1,2,3
 max
     before: 1,2,3
     after: 2147483646
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for max
   direct:
     1 -> 2147483646
diff --git a/plugins/stream-debugger/testData/debug/outs/minMappingNone.out b/plugins/stream-debugger/testData/debug/outs/minMappingNone.out
index c1d70e1de61a..441eb7d98959 100644
--- a/plugins/stream-debugger/testData/debug/outs/minMappingNone.out
+++ b/plugins/stream-debugger/testData/debug/outs/minMappingNone.out
@@ -5,20 +5,12 @@ MinMappingNone.java:8
 Stream.of(1)
 .skip(1)
 .max(Comparator.comparingInt(x -> -x))
-Stream.of
-    before: nothing
-    after: 1
 skip
     before: 1
     after: nothing
 max
     before: nothing
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for skip
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/minMappingPresent.out b/plugins/stream-debugger/testData/debug/outs/minMappingPresent.out
index d4b57f134fb6..568c1c28d35a 100644
--- a/plugins/stream-debugger/testData/debug/outs/minMappingPresent.out
+++ b/plugins/stream-debugger/testData/debug/outs/minMappingPresent.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 MinMappingPresent.java:8
 Stream.of(1, 2, 3)
 .min(Comparator.comparingInt(x -> -x))
-Stream.of
-    before: nothing
-    after: 1,2,3
 min
     before: 1,2,3
     after: 2147483646
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for min
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/noneMatchExtraCalls.out b/plugins/stream-debugger/testData/debug/outs/noneMatchExtraCalls.out
index ea7c4a0f2c43..d00cd80e10d7 100644
--- a/plugins/stream-debugger/testData/debug/outs/noneMatchExtraCalls.out
+++ b/plugins/stream-debugger/testData/debug/outs/noneMatchExtraCalls.out
@@ -7,17 +7,9 @@ Stream.of(3)
       System.out.println("called");
       return false;
     })
-Stream.of
-    before: nothing
-    after: 1
 noneMatch
     before: 1
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for noneMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/noneMatchMappingFalse.out b/plugins/stream-debugger/testData/debug/outs/noneMatchMappingFalse.out
index 06551efda8ff..9933afb77331 100644
--- a/plugins/stream-debugger/testData/debug/outs/noneMatchMappingFalse.out
+++ b/plugins/stream-debugger/testData/debug/outs/noneMatchMappingFalse.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 NoneMatchMappingFalse.java:6
 Stream.of(1, 2, 3)
 .noneMatch(Integer.class::isInstance)
-Stream.of
-    before: nothing
-    after: 1
 noneMatch
     before: 1
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for noneMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/noneMatchMappingTrue.out b/plugins/stream-debugger/testData/debug/outs/noneMatchMappingTrue.out
index 1f3577d5fe60..2d13806c7b4d 100644
--- a/plugins/stream-debugger/testData/debug/outs/noneMatchMappingTrue.out
+++ b/plugins/stream-debugger/testData/debug/outs/noneMatchMappingTrue.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 NoneMatchMappingTrue.java:6
 Stream.of(1, 2, 3)
 .noneMatch(x -> x == 5)
-Stream.of
-    before: nothing
-    after: 1,2,3
 noneMatch
     before: 1,2,3
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for noneMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/notImportedLambdaResult.out b/plugins/stream-debugger/testData/debug/outs/notImportedLambdaResult.out
index af749df354c1..40db32c2927c 100644
--- a/plugins/stream-debugger/testData/debug/outs/notImportedLambdaResult.out
+++ b/plugins/stream-debugger/testData/debug/outs/notImportedLambdaResult.out
@@ -6,9 +6,6 @@ Stream.of(1)
 .flatMapToInt(x -> Arrays.stream(new int[] {1}))
 .limit(1)
 .toArray()
-Stream.of
-    before: nothing
-    after: 1
 flatMapToInt
     before: 1
     after: 2
@@ -18,11 +15,6 @@ limit
 toArray
     before: 3
     after: 4
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for flatMapToInt
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/nulls.out b/plugins/stream-debugger/testData/debug/outs/nulls.out
index 7bdec5c743f4..5e9a44a407e2 100644
--- a/plugins/stream-debugger/testData/debug/outs/nulls.out
+++ b/plugins/stream-debugger/testData/debug/outs/nulls.out
@@ -4,18 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 Nulls.java:6
 Stream.of(null, null)
 .count()
-Stream.of
-    before: nothing
-    after: 1,2
 count
     before: 1,2
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
 mappings for count
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/parallelStream.out b/plugins/stream-debugger/testData/debug/outs/parallelStream.out
index 64987a6fcdd5..2a786f8f9bbd 100644
--- a/plugins/stream-debugger/testData/debug/outs/parallelStream.out
+++ b/plugins/stream-debugger/testData/debug/outs/parallelStream.out
@@ -6,9 +6,6 @@ ints.stream()
 .parallel()
 .sorted()
 .toArray(Integer[]::new)
-ints.stream
-    before: nothing
-    after: 1,3,5,7,9,11,13,15,17,19,21,23,25,27
 parallel
     before: 1,3,5,7,9,11,13,15,17,19,21,23,25,27
     after: 2,4,6,8,10,12,14,16,18,20,22,24,26,28
@@ -18,24 +15,6 @@ sorted
 toArray
     before: 29,30,31,32,33,34,35,36,37,38,39,40,41,42
     after: 43,44,45,46,47,48,49,50,51,52,53,54,55,56
-mappings for ints.stream
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
-    nothing <- 7
-    nothing <- 9
-    nothing <- 11
-    nothing <- 13
-    nothing <- 15
-    nothing <- 17
-    nothing <- 19
-    nothing <- 21
-    nothing <- 23
-    nothing <- 25
-    nothing <- 27
 mappings for parallel
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/peek.out b/plugins/stream-debugger/testData/debug/outs/peek.out
index 5e535e8a41cd..feacb5132c0d 100644
--- a/plugins/stream-debugger/testData/debug/outs/peek.out
+++ b/plugins/stream-debugger/testData/debug/outs/peek.out
@@ -5,22 +5,12 @@ Peek.java:6
 Stream.of(1, 2, 3)
 .peek(x -> {})
 .count()
-Stream.of
-    before: nothing
-    after: 1,3,5
 peek
     before: 1,3,5
     after: 2,4,6
 count
     before: 2,4,6
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
 mappings for peek
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveAllMatchMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveAllMatchMapping.out
index e933826c2f51..661b42959b83 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveAllMatchMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveAllMatchMapping.out
@@ -5,24 +5,12 @@ PrimitiveAllMatchMapping.java:6
 IntStream.iterate(0, x -> x + 1)
 .limit(5)
 .allMatch(x -> x >= 0)
-IntStream.iterate
-    before: nothing
-    after: 1,3,5,7,9
 limit
     before: 1,3,5,7,9
     after: 2,4,6,8,10
 allMatch
     before: 2,4,6,8,10
     after: 2147483647
-mappings for IntStream.iterate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
-    nothing <- 7
-    nothing <- 9
 mappings for limit
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveAnyMatchMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveAnyMatchMapping.out
index 506266574493..43600c8a0472 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveAnyMatchMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveAnyMatchMapping.out
@@ -5,24 +5,12 @@ PrimitiveAnyMatchMapping.java:6
 IntStream.iterate(0, x -> x + 1)
 .limit(5)
 .anyMatch(x -> x < 0)
-IntStream.iterate
-    before: nothing
-    after: 1,3,5,7,9
 limit
     before: 1,3,5,7,9
     after: 2,4,6,8,10
 anyMatch
     before: 2,4,6,8,10
     after: 2147483647
-mappings for IntStream.iterate
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 3
-    nothing <- 5
-    nothing <- 7
-    nothing <- 9
 mappings for limit
   direct:
     1 -> 2
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveFindAnyMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveFindAnyMapping.out
index 48662a11fcd7..b4965db4f1be 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveFindAnyMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveFindAnyMapping.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 PrimitiveFindAnyMapping.java:7
 IntStream.of(1, 2)
 .findAny()
-IntStream.of
-    before: nothing
-    after: 1
 findAny
     before: 1
     after: 2147483646
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for findAny
   direct:
     1 -> 2147483646
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveFindFirstMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveFindFirstMapping.out
index ff4bc4cbbba4..156dddea8285 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveFindFirstMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveFindFirstMapping.out
@@ -5,21 +5,12 @@ PrimitiveFindFirstMapping.java:7
 IntStream.of(1, 2)
 .skip(2)
 .findAny()
-IntStream.of
-    before: nothing
-    after: 1,2
 skip
     before: 1,2
     after: nothing
 findAny
     before: nothing
     after: nothing
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
 mappings for skip
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveMaxMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveMaxMapping.out
index 2b8f465f239b..10621bc0c1e2 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveMaxMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveMaxMapping.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 PrimitiveMaxMapping.java:7
 LongStream.of(1, 2, 3)
 .max()
-LongStream.of
-    before: nothing
-    after: 1,2,3
 max
     before: 1,2,3
     after: 2147483646
-mappings for LongStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for max
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveMinMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveMinMapping.out
index f231b880610c..613dee3bf808 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveMinMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveMinMapping.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 PrimitiveMinMapping.java:7
 DoubleStream.of(1., 2., 10.)
 .min()
-DoubleStream.of
-    before: nothing
-    after: 1,2,3
 min
     before: 1,2,3
     after: 2147483646
-mappings for DoubleStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for min
   direct:
     1 -> 2147483646
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveNoneMatchMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveNoneMatchMapping.out
index 33e74adf7a1e..ca3f71dc966e 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveNoneMatchMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveNoneMatchMapping.out
@@ -4,17 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 PrimitiveNoneMatchMapping.java:6
 DoubleStream.of(1., 4.)
 .noneMatch(x -> x > 0)
-DoubleStream.of
-    before: nothing
-    after: 1
 noneMatch
     before: 1
     after: 2147483647
-mappings for DoubleStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for noneMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveResultBoolean.out b/plugins/stream-debugger/testData/debug/outs/primitiveResultBoolean.out
index c5013cae17c5..b7d66cdc7ec3 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveResultBoolean.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveResultBoolean.out
@@ -6,17 +6,9 @@ Stream.of(1)
 .anyMatch(x -> x == 2)
 Result type:boolean
 value = false
-Stream.of
-    before: nothing
-    after: 1
 anyMatch
     before: 1
     after: 2147483647
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
 mappings for anyMatch
   direct:
     1 -> 2147483647
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveResultDouble.out b/plugins/stream-debugger/testData/debug/outs/primitiveResultDouble.out
index 38b6a5104340..654530fb0caa 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveResultDouble.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveResultDouble.out
@@ -6,19 +6,9 @@ DoubleStream.of(1, 2, 3)
 .sum()
 Result type:double
 value = 6.0
-DoubleStream.of
-    before: nothing
-    after: 1,2,3
 sum
     before: 1,2,3
     after: nothing
-mappings for DoubleStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for sum
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveResultInt.out b/plugins/stream-debugger/testData/debug/outs/primitiveResultInt.out
index 9a9fdba6b36f..3cf4ec2f3c54 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveResultInt.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveResultInt.out
@@ -6,18 +6,9 @@ IntStream.of(1, 2)
 .sum()
 Result type:int
 value = 3
-IntStream.of
-    before: nothing
-    after: 1,2
 sum
     before: 1,2
     after: nothing
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
 mappings for sum
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveResultLong.out b/plugins/stream-debugger/testData/debug/outs/primitiveResultLong.out
index 2a0864b4c781..d73dfc1bf7ba 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveResultLong.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveResultLong.out
@@ -6,18 +6,9 @@ IntStream.of(1, 2)
 .count()
 Result type:long
 value = 2
-IntStream.of
-    before: nothing
-    after: 1,2
 count
     before: 1,2
     after: nothing
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
 mappings for count
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/primitiveToArrayMapping.out b/plugins/stream-debugger/testData/debug/outs/primitiveToArrayMapping.out
index f72765bbdeda..33748b5a0472 100644
--- a/plugins/stream-debugger/testData/debug/outs/primitiveToArrayMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/primitiveToArrayMapping.out
@@ -4,20 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 PrimitiveToArrayMapping.java:6
 IntStream.of(1, 2, 3, 4)
 .toArray()
-IntStream.of
-    before: nothing
-    after: 1,2,3,4
 toArray
     before: 1,2,3,4
     after: 5,6,7,8
-mappings for IntStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
-    nothing <- 4
 mappings for toArray
   direct:
     1 -> 5
diff --git a/plugins/stream-debugger/testData/debug/outs/shortCircuitingAfterSorted.out b/plugins/stream-debugger/testData/debug/outs/shortCircuitingAfterSorted.out
index 996a50c5cc06..18ed67bbad47 100644
--- a/plugins/stream-debugger/testData/debug/outs/shortCircuitingAfterSorted.out
+++ b/plugins/stream-debugger/testData/debug/outs/shortCircuitingAfterSorted.out
@@ -5,22 +5,12 @@ ShortCircuitingAfterSorted.java:6
 Stream.of(3, 2, 1)
 .sorted()
 .findFirst()
-Stream.of
-    before: nothing
-    after: 1,2,3
 sorted
     before: 1,2,3
     after: 4
 findFirst
     before: 4
     after: 2147483646
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for sorted
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/skip.out b/plugins/stream-debugger/testData/debug/outs/skip.out
index 33443c785cdc..73bd80ad3d0b 100644
--- a/plugins/stream-debugger/testData/debug/outs/skip.out
+++ b/plugins/stream-debugger/testData/debug/outs/skip.out
@@ -5,22 +5,12 @@ Skip.java:6
 Stream.of(1, 2, 3)
 .skip(2)
 .count()
-Stream.of
-    before: nothing
-    after: 1,2,3
 skip
     before: 1,2,3
     after: 4
 count
     before: 4
     after: nothing
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for skip
   direct:
     1 -> nothing
diff --git a/plugins/stream-debugger/testData/debug/outs/sorted.out b/plugins/stream-debugger/testData/debug/outs/sorted.out
index 104bf8dd75cd..36d398d8f135 100644
--- a/plugins/stream-debugger/testData/debug/outs/sorted.out
+++ b/plugins/stream-debugger/testData/debug/outs/sorted.out
@@ -5,33 +5,12 @@ Sorted.java:6
 Stream.of(3, 1, 2, 3, 3, 3, 3, 1, 2, 2, 3, 4, 5, 2)
 .sorted()
 .toArray()
-Stream.of
-    before: nothing
-    after: 1,2,3,4,5,6,7,8,9,10,11,12,13,14
 sorted
     before: 1,2,3,4,5,6,7,8,9,10,11,12,13,14
     after: 15,16,17,18,19,20,21,22,23,24,25,26,27,28
 toArray
     before: 15,16,17,18,19,20,21,22,23,24,25,26,27,28
     after: 29,30,31,32,33,34,35,36,37,38,39,40,41,42
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
-    nothing <- 4
-    nothing <- 5
-    nothing <- 6
-    nothing <- 7
-    nothing <- 8
-    nothing <- 9
-    nothing <- 10
-    nothing <- 11
-    nothing <- 12
-    nothing <- 13
-    nothing <- 14
 mappings for sorted
   direct:
     1 -> 21
diff --git a/plugins/stream-debugger/testData/debug/outs/sortedPrimitive.out b/plugins/stream-debugger/testData/debug/outs/sortedPrimitive.out
index e064767a6947..752d7be135f4 100644
--- a/plugins/stream-debugger/testData/debug/outs/sortedPrimitive.out
+++ b/plugins/stream-debugger/testData/debug/outs/sortedPrimitive.out
@@ -5,33 +5,12 @@ SortedPrimitive.java:6
 LongStream.of(3, 1, 2, 3, 3, 3, 3, 1, 2, 2, 3, 4, 5, 2)
 .sorted()
 .toArray()
-LongStream.of
-    before: nothing
-    after: 1,2,3,4,5,6,7,8,9,10,11,12,13,14
 sorted
     before: 1,2,3,4,5,6,7,8,9,10,11,12,13,14
     after: 15,16,17,18,19,20,21,22,23,24,25,26,27,28
 toArray
     before: 15,16,17,18,19,20,21,22,23,24,25,26,27,28
     after: 29,30,31,32,33,34,35,36,37,38,39,40,41,42
-mappings for LongStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
-    nothing <- 4
-    nothing <- 5
-    nothing <- 6
-    nothing <- 7
-    nothing <- 8
-    nothing <- 9
-    nothing <- 10
-    nothing <- 11
-    nothing <- 12
-    nothing <- 13
-    nothing <- 14
 mappings for sorted
   direct:
     1 -> 21
diff --git a/plugins/stream-debugger/testData/debug/outs/sortedSignedDoubleZeros.out b/plugins/stream-debugger/testData/debug/outs/sortedSignedDoubleZeros.out
index bc6c3d00c6bd..51d6937e9f2e 100644
--- a/plugins/stream-debugger/testData/debug/outs/sortedSignedDoubleZeros.out
+++ b/plugins/stream-debugger/testData/debug/outs/sortedSignedDoubleZeros.out
@@ -5,21 +5,12 @@ SortedSignedDoubleZeros.java:6
 DoubleStream.of(0., -0.)
 .sorted()
 .sum()
-DoubleStream.of
-    before: nothing
-    after: 1,2
 sorted
     before: 1,2
     after: 3,4
 sum
     before: 3,4
     after: nothing
-mappings for DoubleStream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
 mappings for sorted
   direct:
     1 -> 4
diff --git a/plugins/stream-debugger/testData/debug/outs/toArrayMapping.out b/plugins/stream-debugger/testData/debug/outs/toArrayMapping.out
index 38df8f3d6ec3..e67b4025f1e0 100644
--- a/plugins/stream-debugger/testData/debug/outs/toArrayMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/toArrayMapping.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 ToArrayMapping.java:6
 Stream.of(10, 11, 12)
 .toArray(Integer[]::new)
-Stream.of
-    before: nothing
-    after: 1,2,3
 toArray
     before: 1,2,3
     after: 4,5,6
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for toArray
   direct:
     1 -> 4
diff --git a/plugins/stream-debugger/testData/debug/outs/toListMapping.out b/plugins/stream-debugger/testData/debug/outs/toListMapping.out
index bf00cd196a17..26745ec23b9b 100644
--- a/plugins/stream-debugger/testData/debug/outs/toListMapping.out
+++ b/plugins/stream-debugger/testData/debug/outs/toListMapping.out
@@ -4,19 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 ToListMapping.java:8
 Stream.of(new Object(), new Object(), new Object())
 .collect(Collectors.toList())
-Stream.of
-    before: nothing
-    after: 1,2,3
 collect
     before: 1,2,3
     after: 4,5,6
-mappings for Stream.of
-  direct:
-    no
-  reverse:
-    nothing <- 1
-    nothing <- 2
-    nothing <- 3
 mappings for collect
   direct:
     1 -> 4