[FIR] Fix enhancement of FlexibleNullability and EnhancedNullability

- Add utilities to add new attribute to ConeAttributes
- Get rid of FlexibleNullability attribute (it can be easily inferred
    for any flexible type at any moment)
- Fix determining of EnhancedNullability attribute

compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt

@@ -1,9 +1,9 @@
 public open class ArrayInGenericArguments : R|kotlin/Any| {
-    public final static field X: R|ft<@FlexibleNullability ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|
+    public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>?>!|
 
-    public final static field Y: R|ft<@FlexibleNullability ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/IntArray, kotlin/IntArray?>!>, ArrayInGenericArguments.DataKey<ft<@FlexibleNullability kotlin/IntArray, kotlin/IntArray?>!>?>!|
+    public final static field Y: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>!>, ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>!>?>!|
 
-    public final static field Z: R|ft<@FlexibleNullability ArrayInGenericArguments.DataKey<out ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!>, ArrayInGenericArguments.DataKey<out ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!>?>!|
+    public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!>?>!|
 
     public constructor(): R|ArrayInGenericArguments|
 

compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt

@@ -1,5 +1,5 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>?>!|): R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>?>!|
+    public final fun toArray(p0: R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|
 
     public constructor(): R|test/ArrayTypeVariance|
 

compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt

@@ -1,4 +1,4 @@
-public abstract class ClassWithTypePExtendsIterableP<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<@FlexibleNullability P, P?>!>| {
+public abstract class ClassWithTypePExtendsIterableP<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P, P?>!>| {
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/ClassWithTypePExtendsIterableP<P>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePP<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<@FlexibleNullability P, P?>!|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<@FlexibleNullability P, P?>!|>(): R|test/ClassWithTypePP<P, Q>|
+public final class ClassWithTypePP<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<P, P?>!|> : R|kotlin/Any| {
+    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<P, P?>!|>(): R|test/ClassWithTypePP<P, Q>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt

@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability P, P?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public constructor<R : R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability P, P?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P, P?>!>, kotlin/collections/Iterable<ft<P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
+    public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P, P?>!>, kotlin/collections/Iterable<ft<P, P?>!>?>!|, P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelf<P : R|ft<@FlexibleNullability kotlin/Enum<ft<@FlexibleNullability P, P?>!>, kotlin/Enum<ft<@FlexibleNullability P, P?>!>?>!|> : R|kotlin/Any| {
-    public constructor<P : R|ft<@FlexibleNullability kotlin/Enum<ft<@FlexibleNullability P, P?>!>, kotlin/Enum<ft<@FlexibleNullability P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelf<P>|
+public final class ClassWithTypePRefSelf<P : R|ft<kotlin/Enum<ft<P, P?>!>, kotlin/Enum<ft<P, P?>!>?>!|> : R|kotlin/Any| {
+    public constructor<P : R|ft<kotlin/Enum<ft<P, P?>!>, kotlin/Enum<ft<P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelf<P>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|ft<@FlexibleNullability test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>?>!|> : R|kotlin/Any| {
-    public constructor<P : R|ft<@FlexibleNullability test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<@FlexibleNullability P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+public final class ClassWithTypePRefSelfAndClass<P : R|ft<test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>?>!|> : R|kotlin/Any| {
+    public constructor<P : R|ft<test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>, test/ClassWithTypePRefSelfAndClass<ft<P, P?>!>?>!|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }

compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt

@@ -1,5 +1,5 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public open field files: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability java/io/File, java/io/File?>!>, kotlin/Array<out ft<@FlexibleNullability java/io/File, java/io/File?>!>?>!|
+    public open field files: R|ft<kotlin/Array<ft<java/io/File, java/io/File?>!>, kotlin/Array<out ft<java/io/File, java/io/File?>!>?>!|
 
     public constructor(): R|test/FieldOfArrayType|
 

compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt

@@ -1,5 +1,5 @@
 public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
-    public open fun staticType(): R|ft<@FlexibleNullability test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<@FlexibleNullability kotlin/Byte, kotlin/Byte?>!, ft<@FlexibleNullability kotlin/Char, kotlin/Char?>!, ft<@FlexibleNullability kotlin/Boolean, kotlin/Boolean?>!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<@FlexibleNullability kotlin/Byte, kotlin/Byte?>!, ft<@FlexibleNullability kotlin/Char, kotlin/Char?>!, ft<@FlexibleNullability kotlin/Boolean, kotlin/Boolean?>!>?>!|
+    public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>!, ft<kotlin/Char, kotlin/Char?>!, ft<kotlin/Boolean, kotlin/Boolean?>!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>!, ft<kotlin/Char, kotlin/Char?>!, ft<kotlin/Boolean, kotlin/Boolean?>!>?>!|
 
     public constructor(): R|test/InnerClassTypeMultipleGeneric|
 

compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface IntrinsicCompanionObject : R|kotlin/Any| {
-    public abstract fun testInt(i: R|ft<@FlexibleNullability kotlin/Int.Companion, kotlin/Int.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testChar(c: R|ft<@FlexibleNullability kotlin/Char.Companion, kotlin/Char.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testString(s: R|ft<@FlexibleNullability kotlin/String.Companion, kotlin/String.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testBoolean(b: R|ft<@FlexibleNullability kotlin/Boolean.Companion, kotlin/Boolean.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>!|): R|kotlin/Unit|
 
-    public abstract fun testEnum(e: R|ft<@FlexibleNullability kotlin/Enum.Companion, kotlin/Enum.Companion?>!|): R|kotlin/Unit|
+    public abstract fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open fun <T : R|ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!|> bar(): R|kotlin/Unit|
+    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>!|> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 

compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open fun <T : R|ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!|, R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|> foo(): R|kotlin/Unit|
+    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>!|, R|ft<java/lang/Runnable, java/lang/Runnable?>!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 

compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt

@@ -1,5 +1,5 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<@FlexibleNullability P, P?>!|> f(): R|kotlin/Unit|
+    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|, Q : R|ft<P, P?>!|> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePP|
 

compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithTypePRefClassP<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public final fun <Q : R|ft<@FlexibleNullability P, P?>!|> f(): R|kotlin/Unit|
+    public final fun <Q : R|ft<P, P?>!|> f(): R|kotlin/Unit|
 
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/MethodWithTypePRefClassP<P>|
 

compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt

@@ -1,5 +1,5 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|> f(p: R|ft<@FlexibleNullability P, P?>!|): R|kotlin/Unit|
+    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>!|> f(p: R|ft<P, P?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethosWithPRefTP|
 

compiler/testData/loadJava/compiledJava/MyException.fir.txt

@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(message: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, cause: R|ft<@FlexibleNullability kotlin/Throwable, kotlin/Throwable?>!|): R|test/MyException|
+    public constructor(message: R|ft<kotlin/String, kotlin/String?>!|, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>!|): R|test/MyException|
 
 }

compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt

@@ -1,11 +1,11 @@
 public open class Frame : R|kotlin/Any| {
-    public/*package*/ open field accessibleContext: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|awt/Frame|
 
 }
 public open class JFrame : R|awt/Frame| {
-    protected/*protected and package*/ open field accessibleContext: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    protected/*protected and package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JFrame|
 

compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(collection: R|ft<@FlexibleNullability kotlin/collections/MutableCollection<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/Collection<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
+    public abstract fun f(collection: R|ft<kotlin/collections/MutableCollection<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/Collection<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
 
-    public abstract fun f(comparator: R|ft<@FlexibleNullability kotlin/Comparable<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Comparable<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
+    public abstract fun f(comparator: R|ft<kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt

@@ -1,5 +1,5 @@
 public open class TopLevel$Class : R|kotlin/Any| {
-    public open fun foo(other: R|ft<@FlexibleNullability test/TopLevel$Class, test/TopLevel$Class?>!|): R|kotlin/Unit|
+    public open fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/TopLevel$Class|
 

compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt

@@ -1,7 +1,7 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public final fun foo(): R|ft<@FlexibleNullability test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>!|
+    public final fun foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>!|
 
-    public final fun collection(): R|ft<@FlexibleNullability kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>!|
+    public final fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>!|
 
     public constructor(): R|test/UnboundWildcard|
 

compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt

@@ -1,5 +1,5 @@
 public open class WildcardBounds : R|kotlin/Any| {
-    public/*package*/ open fun foo(x: R|ft<@FlexibleNullability test/WildcardBounds.A<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, test/WildcardBounds.A<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, y: R|ft<@FlexibleNullability test/WildcardBounds.A<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, test/WildcardBounds.A<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public/*package*/ open fun foo(x: R|ft<test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, y: R|ft<test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>!>, test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/WildcardBounds|
 

compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt

@@ -1,7 +1,7 @@
-public final enum class AnnotatedEnumEntry : R|kotlin/Enum<ft<@FlexibleNullability test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!>| {
-    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static enum entry E1: R|@FlexibleNullability test/AnnotatedEnumEntry|
-    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|@FlexibleNullability test/AnnotatedEnumEntry|
-    public final static enum entry E3: R|@FlexibleNullability test/AnnotatedEnumEntry|
+public final enum class AnnotatedEnumEntry : R|kotlin/Enum<ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!>| {
+    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static enum entry E1: R|@EnhancedNullability test/AnnotatedEnumEntry|
+    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|@EnhancedNullability test/AnnotatedEnumEntry|
+    public final static enum entry E3: R|@EnhancedNullability test/AnnotatedEnumEntry|
     public final static fun values(): R|kotlin/Array<test/AnnotatedEnumEntry>| {
     }
 

compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt

@@ -1,5 +1,5 @@
 public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
-    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
 

compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt

@@ -1,5 +1,5 @@
 public open class AnnotatedValueParameter : R|kotlin/Any| {
-    public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/AnnotatedValueParameter|
 

compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt

@@ -1,6 +1,6 @@
-public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<@FlexibleNullability test/EnumConstructorParameter, test/EnumConstructorParameter?>!>| {
-    public final static enum entry INSTANCE: R|@FlexibleNullability test/EnumConstructorParameter|
-    private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|test/EnumConstructorParameter|
+public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>!>| {
+    public final static enum entry INSTANCE: R|@EnhancedNullability test/EnumConstructorParameter|
+    private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>!|): R|test/EnumConstructorParameter|
 
     private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
 

compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt

@@ -1,5 +1,5 @@
 public open class JavaDocDeprecated : R|kotlin/Any| {
-    public open fun getFoo(text: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open fun getFoo(text: R|ft<kotlin/String, kotlin/String?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JavaDocDeprecated|
 

compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface StringConstantInParam : R|kotlin/Any| {
-    public final static field HEL: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(hel)
+    public final static field HEL: R|ft<kotlin/String, kotlin/String?>!| = String(hel)
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(cl: R|ft<@FlexibleNullability java/lang/Class<ft<@FlexibleNullability P, P?>!>, java/lang/Class<ft<@FlexibleNullability P, P?>!>?>!|): R|test/ConstructorGenericDeep|
+    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(cl: R|ft<java/lang/Class<ft<P, P?>!>, java/lang/Class<ft<P, P?>!>?>!|): R|test/ConstructorGenericDeep|
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(p: R|ft<@FlexibleNullability P, P?>!|): R|test/ConstructorGenericSimple|
+    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(p: R|ft<P, P?>!|): R|test/ConstructorGenericSimple|
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor<P : R|ft<@FlexibleNullability java/util/RandomAccess, java/util/RandomAccess?>!|>(p: R|ft<@FlexibleNullability P, P?>!|): R|test/ConstructorGenericUpperBound|
+    public constructor<P : R|ft<java/util/RandomAccess, java/util/RandomAccess?>!|>(p: R|ft<P, P?>!|): R|test/ConstructorGenericUpperBound|
 
 }

compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt

@@ -1,6 +1,6 @@
-public final enum class EnumMembers : R|kotlin/Enum<ft<@FlexibleNullability test/EnumMembers, test/EnumMembers?>!>| {
-    public final static enum entry FIRST: R|@FlexibleNullability test/EnumMembers|
-    public final static enum entry SECOND: R|@FlexibleNullability test/EnumMembers|
+public final enum class EnumMembers : R|kotlin/Enum<ft<test/EnumMembers, test/EnumMembers?>!>| {
+    public final static enum entry FIRST: R|@EnhancedNullability test/EnumMembers|
+    public final static enum entry SECOND: R|@EnhancedNullability test/EnumMembers|
     public final field isFirst: R|kotlin/Boolean|
 
     public open fun first(): R|kotlin/Boolean|

compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt

@@ -1,6 +1,6 @@
-public open enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<@FlexibleNullability test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>!>| {
-    public final static enum entry E1: R|@FlexibleNullability test/EnumWithSpecializedEntry|
-    public final static enum entry E2: R|@FlexibleNullability test/EnumWithSpecializedEntry|
+public open enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>!>| {
+    public final static enum entry E1: R|@EnhancedNullability test/EnumWithSpecializedEntry|
+    public final static enum entry E2: R|@EnhancedNullability test/EnumWithSpecializedEntry|
     public final static fun values(): R|kotlin/Array<test/EnumWithSpecializedEntry>| {
     }
 

compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt

@@ -1,6 +1,6 @@
-public final enum class JavaEnum : R|kotlin/Enum<ft<@FlexibleNullability test/JavaEnum, test/JavaEnum?>!>| {
-    public final static enum entry ENTRY: R|@FlexibleNullability test/JavaEnum|
-    public final static enum entry ANOTHER: R|@FlexibleNullability test/JavaEnum|
+public final enum class JavaEnum : R|kotlin/Enum<ft<test/JavaEnum, test/JavaEnum?>!>| {
+    public final static enum entry ENTRY: R|@EnhancedNullability test/JavaEnum|
+    public final static enum entry ANOTHER: R|@EnhancedNullability test/JavaEnum|
     public final static fun values(): R|kotlin/Array<test/JavaEnum>| {
     }
 

compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt

@@ -1,5 +1,5 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
-    public open fun setSomething(color: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun setSomething(color: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public open fun getSomething(): R|kotlin/Int|
 

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt

@@ -1,5 +1,5 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JavaBeanVal|
 

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt

@@ -1,7 +1,7 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>!|
 
-    public open fun setColor(string: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun setColor(string: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/JavaBeanVar|
 

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt

@@ -1,7 +1,7 @@
 public open class JavaBeanVarOfGenericType<P : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open fun getCharacters(): R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability P, P?>!>, java/util/ArrayList<ft<@FlexibleNullability P, P?>!>?>!|
+    public open fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>!>, java/util/ArrayList<ft<P, P?>!>?>!|
 
-    public open fun setCharacters(characters: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability P, P?>!>, java/util/ArrayList<ft<@FlexibleNullability P, P?>!>?>!|): R|kotlin/Unit|
+    public open fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>!>, java/util/ArrayList<ft<P, P?>!>?>!|): R|kotlin/Unit|
 
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/JavaBeanVarOfGenericType<P>|
 

compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt

@@ -1,5 +1,5 @@
 public open class TwoSetters : R|kotlin/Any| {
-    public open fun setSize(size: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
+    public open fun setSize(size: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public open fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt

@@ -1,5 +1,5 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
-    public open fun <T : R|ft<@FlexibleNullability java/io/Serializable, java/io/Serializable?>!|> foo(): R|kotlin/Unit|
+    public open fun <T : R|ft<java/io/Serializable, java/io/Serializable?>!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/AllBoundsInWhen|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt

@@ -1,5 +1,5 @@
 public open class ArrayType : R|kotlin/Any| {
-    public open fun foo(): R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
+    public open fun foo(): R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|
 
     public constructor(): R|test/ArrayType|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithNewTypeParams<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|, U : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<@FlexibleNullability U, U?>!|): R|test/ConstructorWithNewTypeParams<T>|
+    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|, U : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<U, U?>!|): R|test/ConstructorWithNewTypeParams<T>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithParentTypeParams<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<@FlexibleNullability T, T?>!|): R|test/ConstructorWithParentTypeParams<T>|
+    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(first: R|ft<T, T?>!|): R|test/ConstructorWithParentTypeParams<T>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithSeveralParams : R|kotlin/Any| {
-    public constructor(integer: R|ft<@FlexibleNullability kotlin/Int, kotlin/Int?>!|, intBasic: R|kotlin/Int|, collection: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|test/ConstructorWithSeveralParams|
+    public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>!|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|): R|test/ConstructorWithSeveralParams|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt

@@ -1,5 +1,5 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
-    public open fun foo(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|
+    public open fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>!>?>!|
 
     public constructor(): R|test/CustomProjectionKind|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|ft<@FlexibleNullability kotlin/Function1<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Function1<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|ft<@FlexibleNullability kotlin/Function0<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Function0<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
+    public open fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/Function1<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!|): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>!>, kotlin/Function0<ft<kotlin/String, kotlin/String?>!>?>!|
 
     public constructor(): R|test/MethodWithFunctionTypes|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
-    public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/MethodWithGenerics|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt

@@ -1,7 +1,7 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copy(dest: R|ft<@FlexibleNullability kotlin/collections/MutableList<in ft<@FlexibleNullability T, T?>!>, kotlin/collections/List<*>?>!|, src: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability T, T?>!>, kotlin/collections/List<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T, T?>!>, kotlin/collections/List<*>?>!|, src: R|ft<kotlin/collections/MutableList<ft<T, T?>!>, kotlin/collections/List<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copyMap(dest: R|ft<@FlexibleNullability kotlin/collections/MutableMap<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, in ft<@FlexibleNullability T, T?>!>, kotlin/collections/Map<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, *>?>!|, src: R|ft<@FlexibleNullability kotlin/collections/MutableMap<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability T, T?>!>, kotlin/collections/Map<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, in ft<T, T?>!>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, *>?>!|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithMappedClasses|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<@FlexibleNullability A, A?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<out ft<@FlexibleNullability B, B?>!>, kotlin/collections/List<out ft<@FlexibleNullability B, B?>!>?>!|, list: R|ft<@FlexibleNullability kotlin/collections/MutableList<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/List<*>?>!|): R|kotlin/Unit|
+    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>!|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>!>, kotlin/collections/List<out ft<B, B?>!>?>!|, list: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<*>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithVararg : R|kotlin/Any| {
-    public open fun foo(vararg s: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun foo(vararg s: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithVararg|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt

@@ -1,9 +1,9 @@
 public open class PropertyArrayTypes<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open field arrayOfArrays: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|
+    public open field arrayOfArrays: R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!>?>!|
 
-    public open field array: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
+    public open field array: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|
 
-    public open field genericArray: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability T, T?>!>, kotlin/Array<out ft<@FlexibleNullability T, T?>!>?>!|
+    public open field genericArray: R|ft<kotlin/Array<ft<T, T?>!>, kotlin/Array<out ft<T, T?>!>?>!|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/PropertyArrayTypes<T>|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt

@@ -1,11 +1,11 @@
 public open class PropertyComplexTypes<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open field genericType: R|ft<@FlexibleNullability T, T?>!|
+    public open field genericType: R|ft<T, T?>!|
 
-    public open field listDefinedGeneric: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
+    public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|
 
-    public open field listGeneric: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability T, T?>!>, java/util/ArrayList<ft<@FlexibleNullability T, T?>!>?>!|
+    public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!|
 
-    public open field listOfGenericList: R|ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability T, T?>!>, java/util/ArrayList<ft<@FlexibleNullability T, T?>!>?>!>, java/util/ArrayList<ft<@FlexibleNullability java/util/ArrayList<ft<@FlexibleNullability T, T?>!>, java/util/ArrayList<ft<@FlexibleNullability T, T?>!>?>!>?>!|
+    public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>?>!|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/PropertyComplexTypes<T>|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt

@@ -1,7 +1,7 @@
 public open class PropertySimpleType : R|kotlin/Any| {
-    public open field fieldOne: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open field fieldOne: R|ft<kotlin/String, kotlin/String?>!|
 
-    public open field fieldTwo: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/PropertySimpleType|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt

@@ -1,5 +1,5 @@
 public final class StarProjection : R|kotlin/Any| {
-    public final fun foo(): R|ft<@FlexibleNullability test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>!|
+    public final fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>!|
 
     public constructor(): R|test/StarProjection|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt

@@ -1,5 +1,5 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(from: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|, to: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|
+    public open fun copy(from: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>!>?>!|, to: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>!>?>!|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>!>?>!|
 
     public constructor(): R|test/WrongProjectionKind|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt

@@ -1,5 +1,5 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/WrongReturnTypeStructure|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<@FlexibleNullability A, A?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<out ft<@FlexibleNullability B, B?>!>, kotlin/collections/List<out ft<@FlexibleNullability B, B?>!>?>!|): R|kotlin/Unit|
+    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>!|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>!>, kotlin/collections/List<out ft<B, B?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt

@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/WrongValueParameterStructure1|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableCollection<ft<@FlexibleNullability E, E?>!>| {
-    public abstract operator fun iterator(): R|@FlexibleNullability kotlin/collections/MutableIterator<ft<@FlexibleNullability E, E?>!>|
+public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableCollection<ft<E, E?>!>| {
+    public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator<ft<E, E?>!>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>!|, V : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability K, K?>!, ft<@FlexibleNullability V, V?>!>| {
-    public abstract operator fun setValue(value: R|ft<@FlexibleNullability V, V?>!|): R|ft<@FlexibleNullability V, V?>!|
+public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>!|, V : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K, K?>!, ft<V, V?>!>| {
+    public abstract operator fun setValue(value: R|ft<V, V?>!|): R|ft<V, V?>!|
 
 }

compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
+    public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
 
-    public abstract fun setIterable(Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface LoadIterator<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public abstract fun getIterator(): R|ft<@FlexibleNullability kotlin/collections/MutableIterator<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterator<ft<@FlexibleNullability T, T?>!>?>!|
+    public abstract fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>!>, kotlin/collections/Iterator<ft<T, T?>!>?>!|
 
-    public abstract fun setIterator(iterator: R|ft<@FlexibleNullability kotlin/collections/MutableIterator<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterator<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>!>, kotlin/collections/Iterator<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/library/Max.fir.txt

@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    public open fun <T : R|ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!|, R|ft<@FlexibleNullability kotlin/Comparable<in ft<@FlexibleNullability T, T?>!>, kotlin/Comparable<in ft<@FlexibleNullability T, T?>!>?>!|> max(coll: R|ft<@FlexibleNullability kotlin/collections/MutableCollection<out ft<@FlexibleNullability T, T?>!>, kotlin/collections/Collection<out ft<@FlexibleNullability T, T?>!>?>!|): R|ft<@FlexibleNullability T, T?>!|
+    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>!|, R|ft<kotlin/Comparable<in ft<T, T?>!>, kotlin/Comparable<in ft<T, T?>!>?>!|> max(coll: R|ft<kotlin/collections/MutableCollection<out ft<T, T?>!>, kotlin/collections/Collection<out ft<T, T?>!>?>!|): R|ft<T, T?>!|
 
     public constructor(): R|test/Max|
 

compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt

@@ -1,4 +1,4 @@
-public open class ModalityOfFakeOverrides : R|java/util/AbstractList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| {
+public open class ModalityOfFakeOverrides : R|java/util/AbstractList<ft<kotlin/String, kotlin/String?>!>| {
     @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|test/ModalityOfFakeOverrides|

compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>?>!|
+    @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
-    @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<@FlexibleNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
+    @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
 
-    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<@FlexibleNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface LoadIterableWithConflict<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
+    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface LoadIterableWithNullability<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|()  kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|()  kotlin/collections/MutableIterable<ft<T, T?>!>|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|()  kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|()  kotlin/collections/MutableIterable<ft<T, T?>!>|): R|kotlin/Unit|
 
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|()  kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|()  kotlin/collections/Iterable<ft<T, T?>!>|
 
-    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|()  kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>|): R|kotlin/Unit|
+    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|()  kotlin/collections/Iterable<ft<T, T?>!>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface ReadOnlyExtendsWildcard : R|kotlin/Any| {
     public abstract fun bar(): R|kotlin/Unit|
 
-    public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<@FlexibleNullability kotlin/collections/List<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/List<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
+    public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt

@@ -1,5 +1,5 @@
 public open class NotNullObjectArray : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array<ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>, @EnhancedNullability kotlin/Array<out ft<@FlexibleNullability kotlin/Any, kotlin/Any?>!>>|
+    @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, @EnhancedNullability kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>>|
 
     public constructor(): R|test/NotNullObjectArray|
 

compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface Comparator<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public abstract fun compare(o1: R|ft<@FlexibleNullability T, T?>!|, o2: R|ft<@FlexibleNullability T, T?>!|): R|kotlin/Int|
+    public abstract fun compare(o1: R|ft<T, T?>!|, o2: R|ft<T, T?>!|): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface FilenameFilter : R|kotlin/Any| {
-    public abstract fun accept(dir: R|ft<@FlexibleNullability java/io/File, java/io/File?>!|, name: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|): R|kotlin/Boolean|
+    public abstract fun accept(dir: R|ft<java/io/File, java/io/File?>!|, name: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Boolean|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParameterWithSelfBound<T : R|ft<@FlexibleNullability test/GenericInterfaceParameterWithSelfBound<ft<@FlexibleNullability T, T?>!>, test/GenericInterfaceParameterWithSelfBound<ft<@FlexibleNullability T, T?>!>?>!|> : R|kotlin/Any| {
-    public abstract fun method(t: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
+public abstract interface GenericInterfaceParameterWithSelfBound<T : R|ft<test/GenericInterfaceParameterWithSelfBound<ft<T, T?>!>, test/GenericInterfaceParameterWithSelfBound<ft<T, T?>!>?>!|> : R|kotlin/Any| {
+    public abstract fun method(t: R|ft<T, T?>!|): R|ft<T, T?>!|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<@FlexibleNullability kotlin/Comparable<ft<@FlexibleNullability A, A?>!>, kotlin/Comparable<ft<@FlexibleNullability A, A?>!>?>!|, R|ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> : R|kotlin/Any| {
-    public abstract fun method(a: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability A, A?>!>, kotlin/Array<out ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
+public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A, A?>!>, kotlin/Comparable<ft<A, A?>!>?>!|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> : R|kotlin/Any| {
+    public abstract fun method(a: R|ft<kotlin/Array<ft<A, A?>!>, kotlin/Array<out ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|kotlin/Any| {
-    public abstract fun <A : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> method(a: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability A, A?>!>, kotlin/Array<out ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
+    public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> method(a: R|ft<kotlin/Array<ft<A, A?>!>, kotlin/Array<out ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt

@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterface : R|java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>| {
+public abstract interface SubstitutedSamInterface : R|java/util/Comparator<ft<kotlin/String, kotlin/String?>!>| {
 }

compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt

@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<ft<@FlexibleNullability test/SubstitutedSamInterfaceSubclassOfBuiltin, test/SubstitutedSamInterfaceSubclassOfBuiltin?>!>| {
+public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<ft<test/SubstitutedSamInterfaceSubclassOfBuiltin, test/SubstitutedSamInterfaceSubclassOfBuiltin?>!>| {
 }

compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface VarargParameter : R|kotlin/Any| {
-    public abstract fun f(vararg strings: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public abstract fun f(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt

@@ -1,7 +1,7 @@
 public open class AmbiguousAdapters : R|kotlin/Any| {
-    public open fun foo(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
+    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
-    public open fun foo(c: R|ft<@FlexibleNullability java/io/Closeable, java/io/Closeable?>!|): R|kotlin/Unit|
+    public open fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/AmbiguousAdapters|
 

compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt

@@ -1,7 +1,7 @@
 public open class Basic : R|kotlin/Any| {
-    public open fun foo(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
+    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
-    public open static fun bar(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
+    public open static fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/Basic|
 

compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt

@@ -1,4 +1,4 @@
 public open class Constructor : R|kotlin/Any| {
-    public constructor(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|test/Constructor|
+    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|test/Constructor|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithAnnotations : R|kotlin/Any| {
-    public constructor(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
+    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt

@@ -1,11 +1,11 @@
 public open class NonTrivialFunctionType : R|kotlin/Any| {
-    public open fun foo(filenameFilter: R|ft<@FlexibleNullability java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
+    public open fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
 
-    public open fun foo(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
-    public open fun wildcardUnbound(comparator: R|ft<@FlexibleNullability java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
+    public open fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
 
-    public open fun wildcardBound(comparator: R|ft<@FlexibleNullability java/util/Comparator<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, java/util/Comparator<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
+    public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>, java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/NonTrivialFunctionType|
 

compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt

@@ -1,5 +1,5 @@
 public open class PrivateSamAdapter : R|kotlin/Any| {
-    private open fun samAdapter(r: R|ft<@FlexibleNullability test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>!|): R|kotlin/Unit|
+    private open fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/PrivateSamAdapter|
 

compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface SelfAsParameter : R|kotlin/Any| {
-    public abstract fun foo(p: R|ft<@FlexibleNullability test/SelfAsParameter, test/SelfAsParameter?>!|): R|kotlin/Unit|
+    public abstract fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt

@@ -1,5 +1,5 @@
 public open class SeveralSamParameters : R|kotlin/Any| {
-    public open static fun findMaxAndInvokeCallback(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|, a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, afterRunnable: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<kotlin/String, kotlin/String?>!>?>!|, a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/String, kotlin/String?>!|, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/SeveralSamParameters|
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt

@@ -1,5 +1,5 @@
 public open class TypeParameterOfClass<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
-    public open fun foo(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/TypeParameterOfClass<T>|
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt

@@ -1,9 +1,9 @@
 public open class TypeParameterOfMethod : R|kotlin/Any| {
-    public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> max(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|, value1: R|ft<@FlexibleNullability T, T?>!|, value2: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
+    public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> max(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
 
-    public open static fun <T : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|> max2(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|, value1: R|ft<@FlexibleNullability T, T?>!|, value2: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
+    public open static fun <T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
 
-    public open static fun <A : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> method(a: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability A, A?>!>, java/util/Comparator<ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
+    public open static fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> method(a: R|ft<java/util/Comparator<ft<A, A?>!>, java/util/Comparator<ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|
 

compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt

@@ -1,5 +1,5 @@
 public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any| {
-    public abstract fun foo(): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|
+    public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!|
 
     public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/static/Enum.fir.txt

@@ -1,7 +1,7 @@
-public final enum class Enum : R|kotlin/Enum<ft<@FlexibleNullability test/Enum, test/Enum?>!>| {
-    public final static enum entry A: R|@FlexibleNullability test/Enum|
-    public final static enum entry B: R|@FlexibleNullability test/Enum|
-    public final static enum entry C: R|@FlexibleNullability test/Enum|
+public final enum class Enum : R|kotlin/Enum<ft<test/Enum, test/Enum?>!>| {
+    public final static enum entry A: R|@EnhancedNullability test/Enum|
+    public final static enum entry B: R|@EnhancedNullability test/Enum|
+    public final static enum entry C: R|@EnhancedNullability test/Enum|
     public final static fun values(): R|kotlin/Array<test/Enum>| {
     }
 

compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt

@@ -1,15 +1,15 @@
 public open class StaticFinal : R|kotlin/Any| {
-    public final static field publicNonNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(aaa)
+    public final static field publicNonNull: R|ft<kotlin/String, kotlin/String?>!| = String(aaa)
 
-    public final static field publicNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public final static field publicNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    public/*package*/ final static field packageNonNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(bbb)
+    public/*package*/ final static field packageNonNull: R|ft<kotlin/String, kotlin/String?>!| = String(bbb)
 
-    public/*package*/ final static field packageNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    public/*package*/ final static field packageNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    private final static field privateNonNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!| = String(bbb)
+    private final static field privateNonNull: R|ft<kotlin/String, kotlin/String?>!| = String(bbb)
 
-    private final static field privateNull: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
+    private final static field privateNull: R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/StaticFinal|
 

compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt

@@ -1,8 +1,8 @@
-public final enum class StaticMembersInEnum : R|kotlin/Enum<ft<@FlexibleNullability test/StaticMembersInEnum, test/StaticMembersInEnum?>!>| {
-    public final static enum entry ENTRY: R|@FlexibleNullability test/StaticMembersInEnum|
+public final enum class StaticMembersInEnum : R|kotlin/Enum<ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>!>| {
+    public final static enum entry ENTRY: R|@EnhancedNullability test/StaticMembersInEnum|
     public open static field STATIC_FIELD: R|kotlin/Int|
 
-    public final static field CONSTANT: R|ft<@FlexibleNullability test/StaticMembersInEnum, test/StaticMembersInEnum?>!|
+    public final static field CONSTANT: R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>!|
 
     public open static fun foo(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt

@@ -1,5 +1,5 @@
 public open class VarargInt : R|kotlin/Any| {
-    public open fun vararg(vararg p: R|ft<@FlexibleNullability kotlin/IntArray, kotlin/IntArray?>!|): R|kotlin/Unit|
+    public open fun vararg(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargInt|
 

compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt

@@ -1,5 +1,5 @@
 public open class VarargString : R|kotlin/Any| {
-    public open fun vararg(vararg strings: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
+    public open fun vararg(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargString|