diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.kt b/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
index 122e19df15f..b4862b43c83 100644
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
+++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
@@ -4,7 +4,7 @@ fun text() {
     "direct:a" on {it.body == "<hello/>"} to "mock:a"
     "direct:a" on {it -> it.body == "<hello/>"} to "mock:a"
     bar <!NI;TYPE_MISMATCH!><!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!>1}<!>
-    bar <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!><!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!><!UNRESOLVED_REFERENCE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1<!>}
+    bar <!NI;TYPE_MISMATCH!><!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!><!UNRESOLVED_REFERENCE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1}<!>
     bar {it, <!UNUSED_ANONYMOUS_PARAMETER!>it1<!> -> it}
 
     bar1 {1}
diff --git a/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt b/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
index f9620dae68d..fffe1dd919d 100644
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
+++ b/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 fun test() {
-  if (<!UNRESOLVED_REFERENCE!>x<!> <!NI;COMPARE_TO_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!> 0) {
+  if (<!UNRESOLVED_REFERENCE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!> 0) {
 
   }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt b/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt
index 39b468e726b..50ba3ee2313 100644
--- a/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt
+++ b/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt
@@ -1,7 +1,7 @@
 package
 
 public interface T {
-    public open val a: kotlin.Any?
+    public open val a: [ERROR : <ERROR FUNCTION RETURN TYPE>]
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
index d2fb5511921..b6b63869a51 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
@@ -26,13 +26,13 @@ fun <T> fooT2() : (t : T) -> T {
 fun main(args : Array<String>) {
     args.foo()()
     args.foo1()(<!NO_VALUE_FOR_PARAMETER!>)<!>
-    <!NI;FUNCTION_EXPECTED!><!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()<!>()
-    <!NI;FUNCTION_EXPECTED!><!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()<!>(<!UNRESOLVED_REFERENCE!>a<!>)
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()()
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
 
     args.foo1()(1)
     args.foo1()(<!TYPE_MISMATCH!>"1"<!>)
-    <!NI;FUNCTION_EXPECTED!><!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()<!>("1")
-    <!NI;FUNCTION_EXPECTED!><!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()<!>(<!UNRESOLVED_REFERENCE!>a<!>)
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()("1")
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
 
     foo2()({})
     foo2()<!TOO_MANY_ARGUMENTS!>{}<!>
diff --git a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt
index 8be0de8da56..cadd24ca7df 100644
--- a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt
+++ b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt
@@ -21,7 +21,7 @@ public final class B {
 
 public final class C {
     public constructor C()
-    public final val bar: kotlin.Any?
+    public final val bar: [ERROR : <ERROR FUNCTION RETURN TYPE>]
     public final val test: [ERROR : Type for bar()]
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
index 74fb7939f7e..fe2e2ca4e0c 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
@@ -23,5 +23,5 @@ fun main(args : Array<String>) {
     <!INVISIBLE_MEMBER!>System<!>()
     (<!NO_COMPANION_OBJECT!>System<!>)
     foo@ <!NO_COMPANION_OBJECT!>System<!>
-    null <!NI;RESULT_TYPE_MISMATCH!>in<!> <!NO_COMPANION_OBJECT!>System<!>
+    null in <!NO_COMPANION_OBJECT!>System<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt b/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt
index e5f5ea61402..de8c2b4fa90 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt
@@ -1,18 +1,18 @@
 package
 
 package a {
-    public val foo: kotlin.Any?
+    public val foo: [ERROR : Error function type]
     public fun bar(): [ERROR : Error function type]
 }
 
 package b {
     public fun bar(): [ERROR : Error function type]
-    public fun foo(): kotlin.Any?
+    public fun foo(): [ERROR : Error function type]
 }
 
 package c {
-    public fun bar(): kotlin.Any?
-    public fun bazz(): kotlin.Any?
+    public fun bar(): [ERROR : Error function type]
+    public fun bazz(): [ERROR : Error function type]
     public fun foo(): [ERROR : Error function type]
 }
 
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
index 9b99cab215d..f7ad5897fce 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
@@ -28,7 +28,7 @@ abstract class My(<!WRONG_ANNOTATION_TARGET!>@Field<!> arg: Int, @Field val w: I
     fun foo() {}
 
     <!WRONG_ANNOTATION_TARGET!>@Field<!>
-    val v: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_MISSING!><!UNRESOLVED_REFERENCE!>Delegates<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>lazy<!> { 42 }<!>
+    val v: Int by <!UNRESOLVED_REFERENCE!>Delegates<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>lazy<!> { 42 }
 }
 
 enum class Your {
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.ni.txt b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.ni.txt
index 3deb20fc81f..a4550a556ef 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.ni.txt
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.ni.txt
@@ -1,6 +1,6 @@
 package
 
-public fun test(/*0*/ tr: Tr): Tr
+public fun test(/*0*/ tr: Tr): [ERROR : G]
 
 public interface G</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt
index 3bce43c89ff..d4efbab6dc9 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt
@@ -29,7 +29,7 @@ private fun <T> lazy(init: () -> T): kotlin.<!UNRESOLVED_REFERENCE!>Lazy<!><T> {
 }
 
 object DefaultHttpClientWithBy : HttpClient by client {
-    val client by <!NI;DELEGATE_SPECIAL_FUNCTION_MISSING!>lazy { HttpClientImpl() }<!>
+    val client by lazy { HttpClientImpl() }
 }
 
 object DefaultFqHttpClient : HttpClient by DefaultFqHttpClient.<!UNINITIALIZED_VARIABLE!>client<!> {
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt
index cada8d78115..3a7cf50c0e1 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt
@@ -21,7 +21,7 @@ public object DefaultHttpClient : HttpClient {
 
 public object DefaultHttpClientWithBy : HttpClient {
     private constructor DefaultHttpClientWithBy()
-    public final val client: [ERROR : Type from delegate]
+    public final val client: [ERROR : <ERROR FUNCTION RETURN TYPE>]
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unresolvedReference.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unresolvedReference.kt
index 13ce6a2d403..8ca621d279d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unresolvedReference.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unresolvedReference.kt
@@ -1,4 +1,6 @@
+// !WITH_NEW_INFERENCE
 // See KT-6665: unresolved reference (v.bar) should not produce "unreachable code" after it
+
 fun foo(): Int {
     val v = 1
     val <!UNUSED_VARIABLE!>c<!> = v.<!UNRESOLVED_REFERENCE!>bar<!> ?: return 0
@@ -27,14 +29,14 @@ fun foo3(): Int {
 fun bar(): Int {
     val v = 1
     val c = v.<!UNRESOLVED_REFERENCE!>bar<!> ?: 42
-    return c
+    return <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>c<!>
 }
 
 fun bar2(): Int {
     val v = 1
     val c = if (true) v.<!UNRESOLVED_REFERENCE!>bar<!> else 3
-    val b = c
-    return b
+    val b = <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>c<!>
+    return <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
 }
 
 fun bar3(): Int {
@@ -43,6 +45,6 @@ fun bar3(): Int {
         true -> v.<!UNRESOLVED_REFERENCE!>bar<!>
         else -> 3
     }
-    val b = c
-    return b
+    val b = <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>c<!>
+    return <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
index af5f7e11bbf..4215add1e0d 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
@@ -1,8 +1,8 @@
 // !WITH_NEW_INFERENCE
 fun useDeclaredVariables() {
     for ((a, b)<!SYNTAX!><!>) {
-        <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNUSED_EXPRESSION!>a<!>
-        <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNUSED_EXPRESSION!>b<!>
+        <!UNUSED_EXPRESSION, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>
+        <!UNUSED_EXPRESSION, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt
index dd4bb974523..eda496595bc 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt
@@ -1,9 +1,10 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
+// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 import kotlin.reflect.KProperty
 
 var a: Int by A()
-var a1 by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>A()<!>
+var a1 by <!OI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>A()<!>
 
 var b: Int by B()
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
index d2fc415c51e..c03053ddd7e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
@@ -8,7 +8,7 @@ val a by <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;TYPECHECKER_HAS_RUN_INTO_RE
 
 val b by Delegate(<!OI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>b<!>)
 
-val c by <!NI;DELEGATE_SPECIAL_FUNCTION_MISSING, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>d<!>
+val c by <!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>d<!>
 val d by <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>c<!>
 
 class Delegate(i: Int) {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt
index cb65f7f9106..a1da67a0de6 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt
@@ -1,9 +1,9 @@
 package
 
-public val a: kotlin.Any?
+public val a: [ERROR : <ERROR FUNCTION RETURN TYPE>]
 public val b: kotlin.Int
-public val c: [ERROR : Type from delegate]
-public val d: kotlin.Any?
+public val c: [ERROR : <ERROR FUNCTION RETURN TYPE>]
+public val d: [ERROR : <ERROR FUNCTION RETURN TYPE>]
 
 public final class Delegate {
     public constructor Delegate(/*0*/ i: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
index beb3fdd1e18..852a7c91dba 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
@@ -2,6 +2,6 @@
 enum class E : Cloneable {
     A;
     <!OVERRIDING_FINAL_MEMBER!>override<!> fun clone(): Any {
-        return <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>clone<!>()<!><!>
+        return <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>clone<!>()
     }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt
index da688cdb353..39b118e1314 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt
@@ -10,7 +10,7 @@ val returnTypeWithParameter = { (<!COMPONENT_FUNCTION_MISSING!><!UNUSED_DESTRUCT
 
 val receiverWithFunctionType = { ((Int)<!SYNTAX!><!> <!SYNTAX!>-> Int).() -><!> }
 
-val parenthesizedParameters = { <!CANNOT_INFER_PARAMETER_TYPE!>(<!NI;TYPE_MISMATCH!><!UNUSED_DESTRUCTURED_PARAMETER_ENTRY!>a<!>: Int<!>)<!> -> }
+val parenthesizedParameters = { <!CANNOT_INFER_PARAMETER_TYPE!>(<!UNUSED_DESTRUCTURED_PARAMETER_ENTRY!>a<!>: Int)<!> -> }
 val parenthesizedParameters2 = { <!CANNOT_INFER_PARAMETER_TYPE!>(<!UNUSED_DESTRUCTURED_PARAMETER_ENTRY!>b<!>)<!> -> }
 
 val none = { -> }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
index c8482754035..fe723635302 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
@@ -25,7 +25,7 @@ fun bar() {
 
     y2 checkType { _<(A) -> Unit>() }
 
-    val z = { <!CANNOT_INFER_PARAMETER_TYPE!>(<!NI;TYPE_MISMATCH!>a: Int<!>, <!NI;TYPE_MISMATCH!>b: String<!>)<!> ->
+    val z = { <!CANNOT_INFER_PARAMETER_TYPE!>(a: Int, b: String)<!> ->
         <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
         <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt
index 037dec7797e..0ad96640de8 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt
@@ -1,18 +1,18 @@
 // !WITH_NEW_INFERENCE
 fun test() {
     run {<!RETURN_NOT_ALLOWED!>return<!>}
-    <!NI;UNREACHABLE_CODE!>run {}<!>
+    run {}
 }
 
 fun test2() {
     run {<!RETURN_NOT_ALLOWED!>return@test2<!>}
-    <!NI;UNREACHABLE_CODE!>run {}<!>
+    run {}
 }
 
 fun test3() {
     fun test4() {
         run {<!RETURN_NOT_ALLOWED!>return@test3<!>}
-        <!NI;UNREACHABLE_CODE!>run {}<!>
+        run {}
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
index 79c0bc89597..3995f1a3d6a 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
@@ -72,5 +72,5 @@ fun test(b: B) {
     b_3.m2()
 
     val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>B<!>()
-    <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b_4<!>.<!NI;UNRESOLVED_REFERENCE, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>m2<!>()
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b_4<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>m2<!>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/imports/Imports.kt b/compiler/testData/diagnostics/tests/imports/Imports.kt
index 9ae3f76b170..7eebbd7e862 100644
--- a/compiler/testData/diagnostics/tests/imports/Imports.kt
+++ b/compiler/testData/diagnostics/tests/imports/Imports.kt
@@ -82,7 +82,7 @@ object C {
 }
 
 fun foo() {
-    if (<!UNRESOLVED_REFERENCE!>i<!> <!NI;RESULT_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
+    if (<!UNRESOLVED_REFERENCE!>i<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
 }
 
 //FILE:d.kt
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
index 8366e50d48d..8bda41d1e59 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
@@ -3,7 +3,7 @@ package a
 
 fun foo() {
     val a = <!UNRESOLVED_REFERENCE!>getErrorType<!>()
-    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!NI;RESULT_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> null) { //no senseless comparison
+    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> null) { //no senseless comparison
 
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
index 6094d93b1d6..3913636d7a1 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
@@ -4,5 +4,5 @@ package bar
 fun main(args : Array<String>) {
     class Some
 
-    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_COMPANION_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!NI;UNRESOLVED_REFERENCE, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_COMPANION_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
index 029c77abb9d..032505c6c2f 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
@@ -3,7 +3,7 @@ fun foo() {
     fun bar1() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>bar1<!>()<!>
 
     fun bar2() = 1 <!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>bar2<!>()<!>
-    fun <!NI;IMPLICIT_NOTHING_RETURN_TYPE!>bar3<!>() = id(<!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>bar3<!>()<!>)
+    fun bar3() = id(<!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>bar3<!>()<!>)
 }
 
 fun <T> id(x: T) = x
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
index 74f8f68504b..cb201d14604 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
@@ -10,4 +10,4 @@ fun <T, Q> List<T>.map1(f: (T)-> Q): List<T>? = tail!!.map1(f)
 
 fun <T, Q> List<T>.map2(f: (T)-> Q): List<T>? = tail.sure().map2(f)
 
-fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!NI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>tail<!>.<!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>sure<!><<!OI;UPPER_BOUND_VIOLATED!>T<!>>().<!NI;TYPE_MISMATCH!><!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)<!><!>
\ No newline at end of file
+fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!OI;TYPE_MISMATCH!>tail<!>.<!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>sure<!><<!OI;UPPER_BOUND_VIOLATED!>T<!>>().<!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/infos/SmartCasts.kt b/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
index 6ff4b5e4432..44c4bb3c84a 100644
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
+++ b/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
@@ -202,7 +202,7 @@ fun mergeSmartCasts(a: Any?) {
     val <!UNUSED_VARIABLE!>i<!>: Int = <!DEBUG_INFO_SMARTCAST!>a<!>.compareTo("")
   }
   if (a is String && <!DEBUG_INFO_SMARTCAST!>a<!>.compareTo("") == 0) {}
-  if (a is String || a.<!UNRESOLVED_REFERENCE!>compareTo<!>("") <!NI;RESULT_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 0) {}
+  if (a is String || a.<!UNRESOLVED_REFERENCE!>compareTo<!>("") <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 0) {}
 }
 
 //mutability
diff --git a/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt b/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt
index 7e9b5cea405..21856dbc5a7 100644
--- a/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt
+++ b/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt
@@ -18,16 +18,16 @@ public final class Outer : Trait {
 
     public final class Nested {
         public constructor Nested()
-        public final val s: kotlin.Any?
-        public final val t: kotlin.Any?
+        public final val s: [ERROR : <ERROR FUNCTION RETURN TYPE>]
+        public final val t: [ERROR : <ERROR FUNCTION RETURN TYPE>]
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         public final inner class NestedInner {
             public constructor NestedInner()
-            public final val s: kotlin.Any?
-            public final val t: kotlin.Any?
+            public final val s: [ERROR : <ERROR FUNCTION RETURN TYPE>]
+            public final val t: [ERROR : <ERROR FUNCTION RETURN TYPE>]
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt
index 5ef8f1d81a4..f426fc18b7c 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt
@@ -35,7 +35,7 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final fun f(): [ERROR : Error function type]
         public final fun g(): [ERROR : Error function type]
-        public final fun h(): kotlin.Any?
+        public final fun h(): [ERROR : <ERROR FUNCTION RETURN TYPE>]
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public final fun i(): [ERROR : <ERROR PROPERTY TYPE>]
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt
index a896e6d9ab7..61b8006ba3f 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt
@@ -37,7 +37,7 @@ fun test() {
         takeNotNull(dependOn(dependOn(x) as? String) <!NI;USELESS_ELVIS!>?: ""<!>)
     }
 
-    takeNotNull(<!NI;TYPE_MISMATCH!>bar()!!<!>)
+    takeNotNull(bar()!!)
 }
 
 inline fun <reified T : Any> reifiedNull(): T? = null
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt
index 14150d08944..1db96fa7660 100644
--- a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt
+++ b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt
@@ -1,7 +1,7 @@
 package
 
 package localObjects {
-    public val bb: kotlin.Any?
+    public val bb: [ERROR : <ERROR FUNCTION RETURN TYPE>]
     public fun test(): kotlin.Unit
 
     public object A {
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
index 3a0ed4efc32..c8b19ee5d91 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -SENSELESS_COMPARISON, -UNUSED_PARAMETER
+// !WITH_NEW_INFERENCE
 
 // FILE: J.java
 
@@ -61,7 +62,7 @@ fun test() {
     takeNotNull(J.getNAny() ?: J())
 
     val x = <!UNRESOLVED_REFERENCE!>unresolved<!> ?: null
-    <!UNREACHABLE_CODE!>val y =<!> <!UNRESOLVED_REFERENCE!>unresolved<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo<!> ?: return
+    <!OI;UNREACHABLE_CODE!>val y =<!> <!UNRESOLVED_REFERENCE!>unresolved<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo<!> ?: return
 }
 
 fun takeNotNull(s: J) {}
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
index 632b8a87ad9..fdaa7e1e5c0 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
@@ -10,7 +10,7 @@ class A {
     val a get() = <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
     val b get() = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>
 
-    val <!NI;IMPLICIT_NOTHING_PROPERTY_TYPE!>z1<!> get() = id(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z1<!>)
+    val z1 get() = id(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z1<!>)
     val z2 get() = l(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z2<!>)
 
     val u get() = <!UNRESOLVED_REFERENCE!>field<!>
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt
index ed4126242a5..1efd38b174b 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt
@@ -10,8 +10,8 @@ public final class A {
     public final val b: [ERROR : Error function type]
     public final val u: [ERROR : Error function type]
     public final val y: [ERROR : Error function type]
-    public final val z1: kotlin.Nothing
-    public final val z2: kotlin.collections.List<kotlin.Nothing>
+    public final val z1: [ERROR : Error type for ParseError-argument VALUE_ARGUMENT]
+    public final val z2: kotlin.collections.List<[ERROR : Error type for ParseError-argument VALUE_ARGUMENT]>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
index 8ce4d3641d2..5d95e0c3bae 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -UNREACHABLE_CODE
+// !WITH_NEW_INFERENCE
 
 class A {
     class B {
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
index 6b1b3e45daf..31bea1ed20a 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
@@ -1,2 +1,2 @@
 // !WITH_NEW_INFERENCE
-val unwrapped = <!UNRESOLVED_REFERENCE!>some<!><!NI;COMPARE_TO_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>sdf<!>()()<out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
\ No newline at end of file
+val unwrapped = <!UNRESOLVED_REFERENCE!>some<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>sdf<!>()()<out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt
index 6903f370368..d67025dfa37 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt
@@ -1,3 +1,3 @@
 package
 
-public val unwrapped: kotlin.Any?
+public val unwrapped: [ERROR : <ERROR FUNCTION RETURN TYPE>]
diff --git a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
index 0149c20db43..9f7d93ffd66 100644
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
+++ b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
@@ -8,9 +8,9 @@ fun composite() {
 }
 
 fun html() {
-    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!NI;COMPARE_TO_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!><!SYNTAX!><!>
+    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!><!SYNTAX!><!>
 }
 
 fun html1() {
-    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!NI;COMPARE_TO_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!><!FUNCTION_CALL_EXPECTED!>html<!>
+    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!><!FUNCTION_CALL_EXPECTED!>html<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10243.kt b/compiler/testData/diagnostics/tests/regressions/kt10243.kt
index 6aa663ce675..6ab2a6061de 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10243.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10243.kt
@@ -4,7 +4,7 @@ private fun doUpdateRegularTasks() {
     try {
         while (f) {
             val xmlText = <!UNRESOLVED_REFERENCE!>getText<!>()
-            if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!> <!NI;RESULT_TYPE_MISMATCH, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> null) {}
+            if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> null) {}
             else {
                 <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>value<!> = 0 // !!!
             }
diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt
index 3ad4ff95d90..15f5eef9160 100644
--- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt
+++ b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt
@@ -2,7 +2,7 @@ package
 
 package i {
     public val i.C.bar: i.C.D
-    public val kotlin.String.bd: kotlin.Any?
+    public val kotlin.String.bd: [ERROR : <ERROR FUNCTION RETURN TYPE>]
     public val kotlin.String.bd1: kotlin.String
     public val i.A.foo: [ERROR : Type for ii]
     public val i.C.foo: i.C.D
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
index 906039eceeb..89be6466f8a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
@@ -12,7 +12,7 @@ operator fun Long?.inc() = this?.let { it + 1 }
 fun bar(arg: Long?): Long {
     var i = arg
     if (i++ == 5L) {
-        return <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>i<!UNSAFE_CALL!>--<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> i<!>
+        return i<!UNSAFE_CALL!>--<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> i
     }
     if (i++ == 7L) {
         return i++ <!NI;NONE_APPLICABLE, OI;UNSAFE_OPERATOR_CALL!>+<!> <!OI;TYPE_MISMATCH!>i<!>
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
index a24a85c20a0..b8ba8255065 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
@@ -14,7 +14,7 @@ class GenericDerivedClass<T> : GenericBaseClass<T>(), GenericBaseInterface<T> {
     override fun bar(x: T): T = super.bar(x)
 
     override fun ambiguous(x: T): T =
-            <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)<!><!>
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
 }
 
 class <!CONFLICTING_JVM_DECLARATIONS!>SpecializedDerivedClass<!> : GenericBaseClass<Int>(), GenericBaseInterface<String> {
@@ -22,9 +22,9 @@ class <!CONFLICTING_JVM_DECLARATIONS!>SpecializedDerivedClass<!> : GenericBaseCl
     override fun bar(x: String): String = super.bar(x)
 
     override fun ambiguous(x: String): String =
-            <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)<!><!>
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
     override fun ambiguous(x: Int): Int =
-            <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)<!><!>
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
 }
 
 class <!CONFLICTING_JVM_DECLARATIONS!>MixedDerivedClass<!><T> : GenericBaseClass<Int>(), GenericBaseInterface<T> {
@@ -32,7 +32,7 @@ class <!CONFLICTING_JVM_DECLARATIONS!>MixedDerivedClass<!><T> : GenericBaseClass
     override fun bar(x: T): T = super.bar(x)
 
     override fun ambiguous(x: Int): Int =
-            <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)<!><!>
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
     <!CONFLICTING_JVM_DECLARATIONS!>override fun ambiguous(x: T): T<!> =
-            <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)<!><!>
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
index 1e12c1dcf49..402593c0a80 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
@@ -14,7 +14,7 @@ interface InterfaceWithFun {
 
 class DerivedUsingFun : BaseWithCallableProp(), InterfaceWithFun {
     fun foo(): String =
-    <!NI;TYPE_MISMATCH!><!AMBIGUOUS_SUPER!>super<!>.<!NI;TYPE_MISMATCH!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fn<!>()<!><!>
+    <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fn<!>()
 
     override fun bar(): String =
             super.bar()
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt
index ffaeb7635c7..bcc2798d9f6 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt
@@ -3,7 +3,7 @@ package
 public val c: [ERROR : Type for C.Self.Self()]
 public val ic: [ERROR : Type for C.Self.InCompanion()]
 public val n: [ERROR : Type for C.Self.Nested()]
-public val n2: kotlin.Any?
+public val n2: [ERROR : <ERROR FUNCTION RETURN TYPE>]
 public val ok: kotlin.String = "OK"
 public val x: [ERROR : Type for C.Self.X]