diff --git a/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.txt b/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.txt
index dde638e9a37..1def4d8ae4a 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.txt
@@ -87,7 +87,7 @@ FILE fqName:test fileName:/boundInnerGenericConstructor.kt
           <B>: kotlin.String
           a: CONST String type=kotlin.String value="O"
           b: CONST String type=kotlin.String value="K"
-          x: FUNCTION_REFERENCE 'public constructor <init> (a: T of test.Foo, b: P of test.Foo.Inner) [primary] declared in test.Foo.Inner' type=kotlin.reflect.KFunction2<@[ParameterName(name = 'a')] kotlin.String, @[ParameterName(name = 'b')] kotlin.String, test.Foo.Inner<kotlin.String, kotlin.String>> origin=null reflectionTarget=<same>
+          x: FUNCTION_REFERENCE 'public constructor <init> (a: T of test.Foo, b: P of test.Foo.Inner) [primary] declared in test.Foo.Inner' type=kotlin.reflect.KFunction2<kotlin.String, kotlin.String, test.Foo.Inner<kotlin.String, kotlin.String>> origin=null reflectionTarget=<same>
             <P>: kotlin.String
             $this: GET_VAR 'val z: test.Foo<kotlin.String> [val] declared in test.box' type=test.Foo<kotlin.String> origin=null
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in test'
diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt
index 52ea5ad093e..9ccc6e2e734 100644
--- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt
+++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt
@@ -10,11 +10,11 @@ FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testJava (): <root>.J1.J2<kotlin.Double, kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> <Y2> () declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Double, kotlin.Int> origin=null
-          <class: X2>: kotlin.Double
-          <Y2>: kotlin.CharSequence
+          <class: X2>: kotlin.Double?
+          <Y2>: kotlin.CharSequence?
           $outer: CONSTRUCTOR_CALL 'public constructor <init> <Y1> () declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
-            <class: X1>: kotlin.Int
-            <Y1>: kotlin.String
+            <class: X1>: kotlin.Int?
+            <Y1>: kotlin.String?
   CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1<T1 of <root>.K1>
     TYPE_PARAMETER name:T1 index:0 variance: superTypes:[kotlin.Number]
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt
index fff76479eb2..390eea3c281 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt
@@ -36,11 +36,11 @@ FILE fqName:<root> fileName:/implicitCastToTypeParameter.kt
       $receiver: VALUE_PARAMETER name:<this> type:<root>.Foo<T of <root>.<get-asT>>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-asT> <T> (): T of <root>.<get-asT>? [inline] declared in <root>'
-          WHEN type=T of <root>.<get-asT>? origin=IF
+          WHEN type=kotlin.Any? origin=IF
             BRANCH
               if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=T of <root>.<get-asT>
                 GET_VAR '<this>: <root>.Foo<T of <root>.<get-asT>> declared in <root>.<get-asT>' type=<root>.Foo<T of <root>.<get-asT>> origin=null
-              then: TYPE_OP type=T of <root>.<get-asT> origin=IMPLICIT_CAST typeOperand=T of <root>.<get-asT>
+              then: TYPE_OP type=kotlin.Any origin=IMPLICIT_CAST typeOperand=kotlin.Any
                 GET_VAR '<this>: <root>.Foo<T of <root>.<get-asT>> declared in <root>.<get-asT>' type=<root>.Foo<T of <root>.<get-asT>> origin=null
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
diff --git a/compiler/testData/ir/irText/expressions/kt30796.txt b/compiler/testData/ir/irText/expressions/kt30796.txt
index 895798b8439..980abd4e193 100644
--- a/compiler/testData/ir/irText/expressions/kt30796.txt
+++ b/compiler/testData/ir/irText/expressions/kt30796.txt
@@ -23,18 +23,18 @@ FILE fqName:<root> fileName:/kt30796.kt
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val tmp_0: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
       VAR name:x2 type:kotlin.Any [val]
-        BLOCK type=kotlin.Any? origin=ELVIS
+        BLOCK type=kotlin.Any origin=ELVIS
           VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:T of <root>.test [val]
             GET_VAR 'value: T of <root>.test declared in <root>.test' type=T of <root>.test origin=null
-          WHEN type=kotlin.Any? origin=null
+          WHEN type=kotlin.Any origin=null
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val tmp_1: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
                 arg1: CONST Null type=kotlin.Nothing? value=null
-              then: BLOCK type=kotlin.Any? origin=ELVIS
+              then: BLOCK type=kotlin.Any origin=ELVIS
                 VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:T of <root>.test [val]
                   GET_VAR 'value2: T of <root>.test declared in <root>.test' type=T of <root>.test origin=null
-                WHEN type=kotlin.Any? origin=null
+                WHEN type=kotlin.Any origin=null
                   BRANCH
                     if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                       arg0: GET_VAR 'val tmp_2: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
@@ -110,51 +110,51 @@ FILE fqName:<root> fileName:/kt30796.kt
               then: GET_VAR 'val tmp_7: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
       VAR name:x6 type:kotlin.Any [val]
         BLOCK type=kotlin.Any origin=ELVIS
-          VAR IR_TEMPORARY_VARIABLE name:tmp_8 type:T of <root>.test [val]
-            BLOCK type=T of <root>.test origin=ELVIS
+          VAR IR_TEMPORARY_VARIABLE name:tmp_8 type:kotlin.Any? [val]
+            BLOCK type=kotlin.Any? origin=ELVIS
               VAR IR_TEMPORARY_VARIABLE name:tmp_9 type:T of <root>.test [val]
                 GET_VAR 'value: T of <root>.test declared in <root>.test' type=T of <root>.test origin=null
-              WHEN type=T of <root>.test origin=null
+              WHEN type=kotlin.Any? origin=null
                 BRANCH
                   if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                     arg0: GET_VAR 'val tmp_9: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
                     arg1: CONST Null type=kotlin.Nothing? value=null
-                  then: CALL 'public final fun magic <T> (): T of <root>.magic declared in <root>' type=T of <root>.test origin=null
-                    <T>: T of <root>.test
+                  then: CALL 'public final fun magic <T> (): T of <root>.magic declared in <root>' type=kotlin.Any? origin=null
+                    <T>: kotlin.Any?
                 BRANCH
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: GET_VAR 'val tmp_9: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
           WHEN type=kotlin.Any origin=null
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_VAR 'val tmp_8: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
+                arg0: GET_VAR 'val tmp_8: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
                 arg1: CONST Null type=kotlin.Nothing? value=null
               then: CONST Int type=kotlin.Int value=42
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: GET_VAR 'val tmp_8: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
+              then: GET_VAR 'val tmp_8: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
       VAR name:x7 type:kotlin.Any [val]
         BLOCK type=kotlin.Any origin=ELVIS
-          VAR IR_TEMPORARY_VARIABLE name:tmp_10 type:T of <root>.test [val]
-            BLOCK type=T of <root>.test origin=ELVIS
-              VAR IR_TEMPORARY_VARIABLE name:tmp_11 type:T of <root>.test? [val]
-                CALL 'public final fun magic <T> (): T of <root>.magic declared in <root>' type=T of <root>.test? origin=null
-                  <T>: T of <root>.test?
-              WHEN type=T of <root>.test origin=null
+          VAR IR_TEMPORARY_VARIABLE name:tmp_10 type:kotlin.Any? [val]
+            BLOCK type=kotlin.Any? origin=ELVIS
+              VAR IR_TEMPORARY_VARIABLE name:tmp_11 type:kotlin.Any? [val]
+                CALL 'public final fun magic <T> (): T of <root>.magic declared in <root>' type=kotlin.Any? origin=null
+                  <T>: kotlin.Any?
+              WHEN type=kotlin.Any? origin=null
                 BRANCH
                   if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                    arg0: GET_VAR 'val tmp_11: T of <root>.test? [val] declared in <root>.test' type=T of <root>.test? origin=null
+                    arg0: GET_VAR 'val tmp_11: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
                     arg1: CONST Null type=kotlin.Nothing? value=null
                   then: GET_VAR 'value: T of <root>.test declared in <root>.test' type=T of <root>.test origin=null
                 BRANCH
                   if: CONST Boolean type=kotlin.Boolean value=true
-                  then: GET_VAR 'val tmp_11: T of <root>.test? [val] declared in <root>.test' type=T of <root>.test? origin=null
+                  then: GET_VAR 'val tmp_11: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
           WHEN type=kotlin.Any origin=null
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_VAR 'val tmp_10: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
+                arg0: GET_VAR 'val tmp_10: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
                 arg1: CONST Null type=kotlin.Nothing? value=null
               then: CONST Int type=kotlin.Int value=42
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: GET_VAR 'val tmp_10: T of <root>.test [val] declared in <root>.test' type=T of <root>.test origin=null
+              then: GET_VAR 'val tmp_10: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt
index 7186077e147..a5663086194 100644
--- a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt
+++ b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt
@@ -21,10 +21,10 @@ FILE fqName:<root> fileName:/nullCheckOnLambdaReturn.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Any declared in <root>'
         CALL 'public final fun checkAny (fn: kotlin.Function0<kotlin.Any>): kotlin.Any declared in <root>' type=kotlin.Any origin=null
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String?> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String?
+          fn: FUN_EXPR type=kotlin.Function0<kotlin.Any> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String? declared in <root>.test1'
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any declared in <root>.test1'
                   TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
                     CALL 'public open fun foo (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val]
@@ -74,17 +74,17 @@ FILE fqName:<root> fileName:/nullCheckOnLambdaReturn.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test5 (): kotlin.Any? declared in <root>'
         CALL 'public final fun checkAnyN (fn: kotlin.Function0<kotlin.Any?>): kotlin.Any? declared in <root>' type=kotlin.Any? origin=null
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String?> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String?
+          fn: FUN_EXPR type=kotlin.Function0<kotlin.Any?> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any?
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String? declared in <root>.test5'
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any? declared in <root>.test5'
                   CALL 'public open fun foo (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
   FUN name:test6 visibility:public modality:FINAL <> () returnType:kotlin.Any?
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test6 (): kotlin.Any? declared in <root>'
         CALL 'public final fun checkAnyN (fn: kotlin.Function0<kotlin.Any?>): kotlin.Any? declared in <root>' type=kotlin.Any? origin=null
-          fn: FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
+          fn: FUN_EXPR type=kotlin.Function0<kotlin.Any?> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any?
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in <root>.test6'
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any? declared in <root>.test6'
                   CALL 'public open fun nnFoo (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt
index bf030eb4cb8..00f73b53f54 100644
--- a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt
+++ b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt
@@ -35,10 +35,10 @@ FILE fqName:<root> fileName:/objectReferenceInClosureInSuperConstructorCall.kt
     CONSTRUCTOR visibility:private <> () returnType:<root>.Test [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (lambda: kotlin.Function0<kotlin.Any>) [primary] declared in <root>.Base'
-          lambda: FUN_EXPR type=kotlin.Function0<<root>.Test> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:<root>.Test
+          lambda: FUN_EXPR type=kotlin.Function0<kotlin.Any> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Any
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): <root>.Test declared in <root>.Test.<init>'
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any declared in <root>.Test.<init>'
                   GET_OBJECT 'CLASS OBJECT name:Test modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Test
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Test modality:FINAL visibility:public superTypes:[<root>.Base]'
     PROPERTY FAKE_OVERRIDE name:lambda visibility:public modality:FINAL [fake_override,val]
diff --git a/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.kt b/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.kt
index 1daae108237..ec5ff5db29a 100644
--- a/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.kt
+++ b/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.kt
@@ -1,3 +1,4 @@
+// !LANGUAGE: -NewInference
 // WITH_RUNTIME
 // FILE: genericSamProjectedOut.kt
 import example.SomeJavaClass
diff --git a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt
index 2014e76a890..53df6b2d2b9 100644
--- a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt
@@ -3,9 +3,9 @@ FILE fqName:<root> fileName:/samByProjectedType.kt
     BLOCK_BODY
       CALL 'public open fun bar (j: <root>.J<*>?): kotlin.Unit declared in <root>.H' type=kotlin.Unit origin=null
         j: TYPE_OP type=<root>.J<kotlin.Any?>? origin=SAM_CONVERSION typeOperand=<root>.J<kotlin.Any?>?
-          FUN_EXPR type=kotlin.Function1<kotlin.Any, kotlin.Any> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any
+          FUN_EXPR type=kotlin.Function1<kotlin.Any, kotlin.Any?> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any?
               VALUE_PARAMETER name:x index:0 type:kotlin.Any
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.Any): kotlin.Any declared in <root>.test1'
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.Any): kotlin.Any? declared in <root>.test1'
                   GET_VAR 'x: kotlin.Any declared in <root>.test1.<anonymous>' type=kotlin.Any origin=null
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt
index cb4449b1883..bbc14df432a 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt
@@ -3,7 +3,7 @@ FILE fqName:<root> fileName:/samConversionToGeneric.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.J<kotlin.String> declared in <root>'
         TYPE_OP type=<root>.J<kotlin.String> origin=SAM_CONVERSION typeOperand=<root>.J<kotlin.String>
-          FUN_EXPR type=kotlin.Function1<kotlin.String?, kotlin.String?> origin=LAMBDA
+          FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.String?> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.String?) returnType:kotlin.String?
               VALUE_PARAMETER name:x index:0 type:kotlin.String?
               BLOCK_BODY
@@ -13,11 +13,11 @@ FILE fqName:<root> fileName:/samConversionToGeneric.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.J<kotlin.String?> declared in <root>'
         TYPE_OP type=<root>.J<kotlin.String?> origin=SAM_CONVERSION typeOperand=<root>.J<kotlin.String?>
-          FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.String> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String
+          FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.String?> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String?
               VALUE_PARAMETER name:x index:0 type:kotlin.String
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.String): kotlin.String declared in <root>.test2'
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.String): kotlin.String? declared in <root>.test2'
                   GET_VAR 'x: kotlin.String declared in <root>.test2.<anonymous>' type=kotlin.String origin=null
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
@@ -25,11 +25,11 @@ FILE fqName:<root> fileName:/samConversionToGeneric.kt
         CALL 'public open fun bar <X> (j: <root>.J<X of <root>.H.bar?>?): kotlin.Unit declared in <root>.H' type=kotlin.Unit origin=null
           <X>: kotlin.String?
           j: TYPE_OP type=<root>.J<kotlin.String?>? origin=SAM_CONVERSION typeOperand=<root>.J<kotlin.String?>?
-            FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.String> origin=LAMBDA
-              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String
+            FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.String?> origin=LAMBDA
+              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String?
                 VALUE_PARAMETER name:x index:0 type:kotlin.String
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.String): kotlin.String declared in <root>.test3'
+                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.String): kotlin.String? declared in <root>.test3'
                     GET_VAR 'x: kotlin.String declared in <root>.test3.<anonymous>' type=kotlin.String origin=null
   FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
index 8fb638dd2f3..5ec8a38dbf3 100644
--- a/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
+++ b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
@@ -10,8 +10,8 @@ FILE fqName:<root> fileName:/tryCatchWithImplicitCast.kt
             GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
       VAR name:t type:kotlin.String [val]
         TRY type=kotlin.String
-          try: BLOCK type=kotlin.String origin=null
-            TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
+          try: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
+            BLOCK type=kotlin.Any origin=null
               GET_VAR 'a: kotlin.Any declared in <root>.testImplicitCast' type=kotlin.Any origin=null
           CATCH parameter=val e: kotlin.Throwable [val] declared in <root>.testImplicitCast
             VAR CATCH_PARAMETER name:e type:kotlin.Throwable [val]
diff --git a/compiler/testData/ir/irText/expressions/when.txt b/compiler/testData/ir/irText/expressions/when.txt
index e09bfd0cf88..4414cd610fb 100644
--- a/compiler/testData/ir/irText/expressions/when.txt
+++ b/compiler/testData/ir/irText/expressions/when.txt
@@ -47,11 +47,10 @@ FILE fqName:<root> fileName:/when.kt
               then: CONST String type=kotlin.String value="!Number"
             BRANCH
               if: CALL 'public final fun contains <T> (element: T of kotlin.collections.contains): kotlin.Boolean [operator] declared in kotlin.collections' type=kotlin.Boolean origin=IN
-                <T>: kotlin.Number
+                <T>: kotlin.Any?
                 $receiver: CALL 'public final fun setOf <T> (): kotlin.collections.Set<T of kotlin.collections.setOf> [inline] declared in kotlin.collections' type=kotlin.collections.Set<kotlin.Nothing> origin=null
                   <T>: kotlin.Nothing
-                element: TYPE_OP type=kotlin.Number origin=IMPLICIT_CAST typeOperand=kotlin.Number
-                  GET_VAR 'val tmp_0: kotlin.Any? [val] declared in <root>.testWithSubject' type=kotlin.Any? origin=null
+                element: GET_VAR 'val tmp_0: kotlin.Any? [val] declared in <root>.testWithSubject' type=kotlin.Any? origin=null
               then: CONST String type=kotlin.String value="nothingness?"
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
diff --git a/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt b/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt
index 80eec40ce6c..293fd6c32aa 100644
--- a/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt
+++ b/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt
@@ -33,13 +33,14 @@ FILE fqName:<root> fileName:/nonLocalReturn.kt
         block: FUN_EXPR type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit
             BLOCK_BODY
-              CALL 'public final fun run <R> (block: kotlin.Function0<R of kotlin.run>): R of kotlin.run [inline] declared in kotlin' type=kotlin.Nothing origin=null
-                <R>: kotlin.Nothing
-                block: FUN_EXPR type=kotlin.Function0<kotlin.Nothing> origin=LAMBDA
-                  FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Nothing
-                    BLOCK_BODY
-                      RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test3'
-                        GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+              TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                CALL 'public final fun run <R> (block: kotlin.Function0<R of kotlin.run>): R of kotlin.run [inline] declared in kotlin' type=kotlin.Any? origin=null
+                  <R>: kotlin.Any?
+                  block: FUN_EXPR type=kotlin.Function0<kotlin.Nothing> origin=LAMBDA
+                    FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Nothing
+                      BLOCK_BODY
+                        RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test3'
+                          GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
   FUN name:testLrmFoo1 visibility:public modality:FINAL <> (ints:kotlin.collections.List<kotlin.Int>) returnType:kotlin.Unit
     VALUE_PARAMETER name:ints index:0 type:kotlin.collections.List<kotlin.Int>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt
index 089368b65ee..d949bd49cce 100644
--- a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt
+++ b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt
@@ -3,27 +3,27 @@ FILE fqName:<root> fileName:/javaConstructorWithTypeParameters.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.J1<kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
-          <class: T1>: kotlin.Int
+          <class: T1>: kotlin.Int?
   FUN name:test2 visibility:public modality:FINAL <> () returnType:<root>.J1<kotlin.Int>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.J1<kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> <X1> (x1: X1 of <root>.J1.<init>?) declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
-          <class: T1>: kotlin.Int
-          <X1>: kotlin.Int
+          <class: T1>: kotlin.Int?
+          <X1>: kotlin.Int?
           x1: CONST Int type=kotlin.Int value=1
   FUN name:test3 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:<root>.J1.J2<kotlin.Int, kotlin.Any>
     VALUE_PARAMETER name:j1 index:0 type:<root>.J1<kotlin.Any>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (j1: <root>.J1<kotlin.Any>): <root>.J1.J2<kotlin.Int, kotlin.Any> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Int, kotlin.Any> origin=null
-          <class: T2>: kotlin.Int
+          <class: T2>: kotlin.Int?
           $outer: GET_VAR 'j1: <root>.J1<kotlin.Any> declared in <root>.test3' type=<root>.J1<kotlin.Any> origin=null
   FUN name:test4 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:<root>.J1.J2<kotlin.Int, kotlin.Any>
     VALUE_PARAMETER name:j1 index:0 type:<root>.J1<kotlin.Any>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (j1: <root>.J1<kotlin.Any>): <root>.J1.J2<kotlin.Int, kotlin.Any> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> <X2> (x2: X2 of <root>.J1.J2.<init>?) declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Int, kotlin.Any> origin=null
-          <class: T2>: kotlin.Int
-          <X2>: kotlin.Int
+          <class: T2>: kotlin.Int?
+          <X2>: kotlin.Int?
           $outer: GET_VAR 'j1: <root>.J1<kotlin.Any> declared in <root>.test4' type=<root>.J1<kotlin.Any> origin=null
           x2: CONST Int type=kotlin.Int value=1
diff --git a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt
index 1134c1bfbee..19202e4c180 100644
--- a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt
+++ b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt
@@ -7,4 +7,5 @@ FILE fqName:<root> fileName:/jdkClassSyntheticProperty.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test> (): kotlin.Array<out java.lang.reflect.Field?>? declared in <root>'
           CALL 'public open fun getDeclaredFields (): kotlin.Array<out java.lang.reflect.Field?>? declared in java.lang.Class' type=kotlin.Array<out java.lang.reflect.Field?>? origin=GET_PROPERTY
             <1>: kotlin.Any?
-            $this: GET_VAR '<this>: java.lang.Class<*> declared in <root>.<get-test>' type=java.lang.Class<*> origin=null
+            $this: TYPE_OP type=java.lang.Class<T of java.lang.Class> origin=IMPLICIT_CAST typeOperand=java.lang.Class<T of java.lang.Class>
+              GET_VAR '<this>: java.lang.Class<*> declared in <root>.<get-test>' type=java.lang.Class<*> origin=null