diff --git a/compiler/testData/builtin-classes/default/kotlin-collections.txt b/compiler/testData/builtin-classes/default/kotlin-collections.txt
index 471113614a6..1749a58fdf6 100644
--- a/compiler/testData/builtin-classes/default/kotlin-collections.txt
+++ b/compiler/testData/builtin-classes/default/kotlin-collections.txt
@@ -24,8 +24,8 @@ public abstract class CharIterator : kotlin.collections.Iterator<kotlin.Char> {
 public interface Collection</*0*/ out E> : kotlin.collections.Iterable<E> {
     public abstract val size: kotlin.Int
         public abstract fun <get-size>(): kotlin.Int
-    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
 }
@@ -63,13 +63,13 @@ public interface Iterator</*0*/ out T> {
 public interface List</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract operator fun get(/*0*/ index: kotlin.Int): E
-    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
-    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract fun listIterator(): kotlin.collections.ListIterator<E>
     public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<E>
     public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<E>
@@ -101,9 +101,9 @@ public interface Map</*0*/ K, /*1*/ out V> {
     public abstract val values: kotlin.collections.Collection<V>
         public abstract fun <get-values>(): kotlin.collections.Collection<V>
     public abstract fun containsKey(/*0*/ key: K): kotlin.Boolean
-    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean
+    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance V): kotlin.Boolean
     public abstract operator fun get(/*0*/ key: K): V?
-    @kotlin.internal.PlatformDependent() public open fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: @kotlin.UnsafeVariance() V): V
+    @kotlin.internal.PlatformDependent public open fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: @kotlin.UnsafeVariance V): V
     public abstract fun isEmpty(): kotlin.Boolean
 
     public interface Entry</*0*/ out K, /*1*/ out V> {
@@ -189,12 +189,12 @@ public interface MutableMap</*0*/ K, /*1*/ V> : kotlin.collections.Map<K, V> {
     public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V?
-    @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: V): V
+    @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: V): V
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
     public abstract fun putAll(/*0*/ from: kotlin.collections.Map<out K, V>): kotlin.Unit
     public abstract fun remove(/*0*/ key: K): V?
-    @kotlin.internal.PlatformDependent() public open fun remove(/*0*/ key: K, /*1*/ value: V): kotlin.Boolean
+    @kotlin.internal.PlatformDependent public open fun remove(/*0*/ key: K, /*1*/ value: V): kotlin.Boolean
 
     public interface MutableEntry</*0*/ K, /*1*/ V> : kotlin.collections.Map.Entry<K, V> {
         public abstract override /*1*/ /*fake_override*/ val key: K
@@ -223,8 +223,8 @@ public interface MutableSet</*0*/ E> : kotlin.collections.Set<E>, kotlin.collect
 public interface Set</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
 }
diff --git a/compiler/testData/builtin-classes/default/kotlin.txt b/compiler/testData/builtin-classes/default/kotlin.txt
index 5530a28bddc..e1beb541a39 100644
--- a/compiler/testData/builtin-classes/default/kotlin.txt
+++ b/compiler/testData/builtin-classes/default/kotlin.txt
@@ -1,12 +1,12 @@
 package-fragment kotlin
 
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
-public fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
+public fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
 public fun booleanArrayOf(/*0*/ vararg elements: kotlin.Boolean /*kotlin.BooleanArray*/): kotlin.BooleanArray
 public fun byteArrayOf(/*0*/ vararg elements: kotlin.Byte /*kotlin.ByteArray*/): kotlin.ByteArray
 public fun charArrayOf(/*0*/ vararg elements: kotlin.Char /*kotlin.CharArray*/): kotlin.CharArray
 public fun doubleArrayOf(/*0*/ vararg elements: kotlin.Double /*kotlin.DoubleArray*/): kotlin.DoubleArray
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> emptyArray(): kotlin.Array<T>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> emptyArray(): kotlin.Array<T>
 public fun floatArrayOf(/*0*/ vararg elements: kotlin.Float /*kotlin.FloatArray*/): kotlin.FloatArray
 public fun intArrayOf(/*0*/ vararg elements: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray
 public fun longArrayOf(/*0*/ vararg elements: kotlin.Long /*kotlin.LongArray*/): kotlin.LongArray
@@ -185,7 +185,7 @@ public interface Comparable</*0*/ in T> {
     public abstract operator fun compareTo(/*0*/ other: T): kotlin.Int
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() public final annotation class Deprecated : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented public final annotation class Deprecated : kotlin.Annotation {
     /*primary*/ public constructor Deprecated(/*0*/ message: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ..., /*2*/ level: kotlin.DeprecationLevel = ...)
     public final val level: kotlin.DeprecationLevel
         public final fun <get-level>(): kotlin.DeprecationLevel
@@ -305,7 +305,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented() public final annotation class ExtensionFunctionType : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented public final annotation class ExtensionFunctionType : kotlin.Annotation {
     /*primary*/ public constructor ExtensionFunctionType()
 }
 
@@ -565,13 +565,13 @@ public abstract class Number {
     public abstract fun toShort(): kotlin.Short
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented() public final annotation class ParameterName : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented public final annotation class ParameterName : kotlin.Annotation {
     /*primary*/ public constructor ParameterName(/*0*/ name: kotlin.String)
     public final val name: kotlin.String
         public final fun <get-name>(): kotlin.String
 }
 
-@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() public final annotation class ReplaceWith : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented public final annotation class ReplaceWith : kotlin.Annotation {
     /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val expression: kotlin.String
         public final fun <get-expression>(): kotlin.String
@@ -694,6 +694,6 @@ public object Unit {
     /*primary*/ private constructor Unit()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() public final annotation class UnsafeVariance : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
     /*primary*/ public constructor UnsafeVariance()
 }
diff --git a/compiler/testData/builtin-classes/java6/kotlin-collections.txt b/compiler/testData/builtin-classes/java6/kotlin-collections.txt
index 2a6c089b0b4..303accbf66e 100644
--- a/compiler/testData/builtin-classes/java6/kotlin-collections.txt
+++ b/compiler/testData/builtin-classes/java6/kotlin-collections.txt
@@ -24,8 +24,8 @@ public abstract class CharIterator : kotlin.collections.Iterator<kotlin.Char> {
 public interface Collection</*0*/ out E> : kotlin.collections.Iterable<E> {
     public abstract val size: kotlin.Int
         public abstract fun <get-size>(): kotlin.Int
-    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
 }
@@ -63,13 +63,13 @@ public interface Iterator</*0*/ out T> {
 public interface List</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract operator fun get(/*0*/ index: kotlin.Int): E
-    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
-    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract fun listIterator(): kotlin.collections.ListIterator<E>
     public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<E>
     public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<E>
@@ -101,7 +101,7 @@ public interface Map</*0*/ K, /*1*/ out V> {
     public abstract val values: kotlin.collections.Collection<V>
         public abstract fun <get-values>(): kotlin.collections.Collection<V>
     public abstract fun containsKey(/*0*/ key: K): kotlin.Boolean
-    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean
+    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance V): kotlin.Boolean
     public abstract operator fun get(/*0*/ key: K): V?
     public abstract fun isEmpty(): kotlin.Boolean
 
@@ -220,8 +220,8 @@ public interface MutableSet</*0*/ E> : kotlin.collections.Set<E>, kotlin.collect
 public interface Set</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
 }
diff --git a/compiler/testData/builtin-classes/java6/kotlin.txt b/compiler/testData/builtin-classes/java6/kotlin.txt
index 601b1bf94a7..f38a0f6d199 100644
--- a/compiler/testData/builtin-classes/java6/kotlin.txt
+++ b/compiler/testData/builtin-classes/java6/kotlin.txt
@@ -1,12 +1,12 @@
 package-fragment kotlin
 
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
-public fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
+public fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
 public fun booleanArrayOf(/*0*/ vararg elements: kotlin.Boolean /*kotlin.BooleanArray*/): kotlin.BooleanArray
 public fun byteArrayOf(/*0*/ vararg elements: kotlin.Byte /*kotlin.ByteArray*/): kotlin.ByteArray
 public fun charArrayOf(/*0*/ vararg elements: kotlin.Char /*kotlin.CharArray*/): kotlin.CharArray
 public fun doubleArrayOf(/*0*/ vararg elements: kotlin.Double /*kotlin.DoubleArray*/): kotlin.DoubleArray
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> emptyArray(): kotlin.Array<T>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> emptyArray(): kotlin.Array<T>
 public fun floatArrayOf(/*0*/ vararg elements: kotlin.Float /*kotlin.FloatArray*/): kotlin.FloatArray
 public fun intArrayOf(/*0*/ vararg elements: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray
 public fun longArrayOf(/*0*/ vararg elements: kotlin.Long /*kotlin.LongArray*/): kotlin.LongArray
@@ -185,7 +185,7 @@ public interface Comparable</*0*/ in T> {
     public abstract operator fun compareTo(/*0*/ other: T): kotlin.Int
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() public final annotation class Deprecated : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented public final annotation class Deprecated : kotlin.Annotation {
     /*primary*/ public constructor Deprecated(/*0*/ message: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ..., /*2*/ level: kotlin.DeprecationLevel = ...)
     public final val level: kotlin.DeprecationLevel
         public final fun <get-level>(): kotlin.DeprecationLevel
@@ -309,7 +309,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented() public final annotation class ExtensionFunctionType : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented public final annotation class ExtensionFunctionType : kotlin.Annotation {
     /*primary*/ public constructor ExtensionFunctionType()
 }
 
@@ -569,13 +569,13 @@ public abstract class Number : kotlin.Any, java.io.Serializable {
     public abstract fun toShort(): kotlin.Short
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented() public final annotation class ParameterName : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented public final annotation class ParameterName : kotlin.Annotation {
     /*primary*/ public constructor ParameterName(/*0*/ name: kotlin.String)
     public final val name: kotlin.String
         public final fun <get-name>(): kotlin.String
 }
 
-@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() public final annotation class ReplaceWith : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented public final annotation class ReplaceWith : kotlin.Annotation {
     /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val expression: kotlin.String
         public final fun <get-expression>(): kotlin.String
@@ -706,6 +706,6 @@ public object Unit {
     /*primary*/ private constructor Unit()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() public final annotation class UnsafeVariance : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
     /*primary*/ public constructor UnsafeVariance()
 }
diff --git a/compiler/testData/builtin-classes/java8/kotlin-collections.txt b/compiler/testData/builtin-classes/java8/kotlin-collections.txt
index 576c3bd498c..60a149abdcd 100644
--- a/compiler/testData/builtin-classes/java8/kotlin-collections.txt
+++ b/compiler/testData/builtin-classes/java8/kotlin-collections.txt
@@ -27,14 +27,14 @@ public abstract class CharIterator : kotlin.collections.Iterator<kotlin.Char> {
 public interface Collection</*0*/ out E> : kotlin.collections.Iterable<E> {
     public abstract val size: kotlin.Int
         public abstract fun <get-size>(): kotlin.Int
-    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.Consumer<in E!>!): kotlin.Unit
     public abstract fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
-    public open fun parallelStream(): java.util.stream.Stream<@kotlin.UnsafeVariance() E!>!
-    public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() E!>!
-    public open fun stream(): java.util.stream.Stream<@kotlin.UnsafeVariance() E!>!
+    public open fun parallelStream(): java.util.stream.Stream<@kotlin.UnsafeVariance E!>!
+    public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance E!>!
+    public open fun stream(): java.util.stream.Stream<@kotlin.UnsafeVariance E!>!
 }
 
 public abstract class DoubleIterator : kotlin.collections.Iterator<kotlin.Double> {
@@ -64,7 +64,7 @@ public abstract class IntIterator : kotlin.collections.Iterator<kotlin.Int> {
 public interface Iterable</*0*/ out T> {
     public open fun forEach(/*0*/ p0: java.util.function.Consumer<in T!>!): kotlin.Unit
     public abstract operator fun iterator(): kotlin.collections.Iterator<T>
-    public open fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() T!>!
+    public open fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance T!>!
 }
 
 public interface Iterator</*0*/ out T> {
@@ -76,18 +76,18 @@ public interface Iterator</*0*/ out T> {
 public interface List</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.Consumer<in E!>!): kotlin.Unit
     public abstract operator fun get(/*0*/ index: kotlin.Int): E
-    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
-    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract fun listIterator(): kotlin.collections.ListIterator<E>
     public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<E>
     public open override /*1*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream<E!>!
-    public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() E!>!
+    public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance E!>!
     public open override /*1*/ /*fake_override*/ fun stream(): java.util.stream.Stream<E!>!
     public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<E>
 }
@@ -120,10 +120,10 @@ public interface Map</*0*/ K, /*1*/ out V> {
     public abstract val values: kotlin.collections.Collection<V>
         public abstract fun <get-values>(): kotlin.collections.Collection<V>
     public abstract fun containsKey(/*0*/ key: K): kotlin.Boolean
-    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean
+    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance V): kotlin.Boolean
     public open fun forEach(/*0*/ p0: java.util.function.BiConsumer<in K!, in V!>!): kotlin.Unit
     public abstract operator fun get(/*0*/ key: K): V?
-    @kotlin.internal.PlatformDependent() public open fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: @kotlin.UnsafeVariance() V): V
+    @kotlin.internal.PlatformDependent public open fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: @kotlin.UnsafeVariance V): V
     public abstract fun isEmpty(): kotlin.Boolean
 
     public interface Entry</*0*/ out K, /*1*/ out V> {
@@ -229,14 +229,14 @@ public interface MutableMap</*0*/ K, /*1*/ V> : kotlin.collections.Map<K, V> {
     public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in K!, in V!>!): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V?
-    @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: V): V
+    @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: V): V
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open fun merge(/*0*/ p0: K!, /*1*/ p1: V!, /*2*/ p2: java.util.function.BiFunction<in V!, in V!, out V!>!): V!
     public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
     public abstract fun putAll(/*0*/ from: kotlin.collections.Map<out K, V>): kotlin.Unit
     public open fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V!
     public abstract fun remove(/*0*/ key: K): V?
-    @kotlin.internal.PlatformDependent() public open fun remove(/*0*/ key: K, /*1*/ value: V): kotlin.Boolean
+    @kotlin.internal.PlatformDependent public open fun remove(/*0*/ key: K, /*1*/ value: V): kotlin.Boolean
     public open fun replace(/*0*/ p0: K!, /*1*/ p1: V!): V!
     public open fun replace(/*0*/ p0: K!, /*1*/ p1: V!, /*2*/ p2: V!): kotlin.Boolean
     public open fun replaceAll(/*0*/ p0: java.util.function.BiFunction<in K!, in V!, out V!>!): kotlin.Unit
@@ -273,13 +273,13 @@ public interface MutableSet</*0*/ E> : kotlin.collections.Set<E>, kotlin.collect
 public interface Set</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.Consumer<in E!>!): kotlin.Unit
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
     public open override /*1*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream<E!>!
-    public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() E!>!
+    public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance E!>!
     public open override /*1*/ /*fake_override*/ fun stream(): java.util.stream.Stream<E!>!
 }
 
diff --git a/compiler/testData/builtin-classes/java8/kotlin.txt b/compiler/testData/builtin-classes/java8/kotlin.txt
index 518f69ca653..a8ceff7bab9 100644
--- a/compiler/testData/builtin-classes/java8/kotlin.txt
+++ b/compiler/testData/builtin-classes/java8/kotlin.txt
@@ -1,12 +1,12 @@
 package-fragment kotlin
 
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
-public fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
+public fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
 public fun booleanArrayOf(/*0*/ vararg elements: kotlin.Boolean /*kotlin.BooleanArray*/): kotlin.BooleanArray
 public fun byteArrayOf(/*0*/ vararg elements: kotlin.Byte /*kotlin.ByteArray*/): kotlin.ByteArray
 public fun charArrayOf(/*0*/ vararg elements: kotlin.Char /*kotlin.CharArray*/): kotlin.CharArray
 public fun doubleArrayOf(/*0*/ vararg elements: kotlin.Double /*kotlin.DoubleArray*/): kotlin.DoubleArray
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> emptyArray(): kotlin.Array<T>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> emptyArray(): kotlin.Array<T>
 public fun floatArrayOf(/*0*/ vararg elements: kotlin.Float /*kotlin.FloatArray*/): kotlin.FloatArray
 public fun intArrayOf(/*0*/ vararg elements: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray
 public fun longArrayOf(/*0*/ vararg elements: kotlin.Long /*kotlin.LongArray*/): kotlin.LongArray
@@ -187,7 +187,7 @@ public interface Comparable</*0*/ in T> {
     public abstract operator fun compareTo(/*0*/ other: T): kotlin.Int
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() public final annotation class Deprecated : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented public final annotation class Deprecated : kotlin.Annotation {
     /*primary*/ public constructor Deprecated(/*0*/ message: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ..., /*2*/ level: kotlin.DeprecationLevel = ...)
     public final val level: kotlin.DeprecationLevel
         public final fun <get-level>(): kotlin.DeprecationLevel
@@ -311,7 +311,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented() public final annotation class ExtensionFunctionType : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented public final annotation class ExtensionFunctionType : kotlin.Annotation {
     /*primary*/ public constructor ExtensionFunctionType()
 }
 
@@ -571,13 +571,13 @@ public abstract class Number : kotlin.Any, java.io.Serializable {
     public abstract fun toShort(): kotlin.Short
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented() public final annotation class ParameterName : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented public final annotation class ParameterName : kotlin.Annotation {
     /*primary*/ public constructor ParameterName(/*0*/ name: kotlin.String)
     public final val name: kotlin.String
         public final fun <get-name>(): kotlin.String
 }
 
-@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() public final annotation class ReplaceWith : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented public final annotation class ReplaceWith : kotlin.Annotation {
     /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val expression: kotlin.String
         public final fun <get-expression>(): kotlin.String
@@ -713,6 +713,6 @@ public object Unit {
     /*primary*/ private constructor Unit()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() public final annotation class UnsafeVariance : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
     /*primary*/ public constructor UnsafeVariance()
 }
diff --git a/compiler/testData/builtin-classes/newMethods/kotlin-collections.txt b/compiler/testData/builtin-classes/newMethods/kotlin-collections.txt
index 9d9ad6ba640..e369d391cf8 100644
--- a/compiler/testData/builtin-classes/newMethods/kotlin-collections.txt
+++ b/compiler/testData/builtin-classes/newMethods/kotlin-collections.txt
@@ -24,11 +24,11 @@ public abstract class CharIterator : kotlin.collections.Iterator<kotlin.Char> {
 public interface Collection</*0*/ out E> : kotlin.collections.Iterable<E> {
     public abstract val size: kotlin.Int
         public abstract fun <get-size>(): kotlin.Int
-    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
-    @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public abstract fun nonExistingMethod(/*0*/ p0: @kotlin.UnsafeVariance() E!): kotlin.String!
+    @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public abstract fun nonExistingMethod(/*0*/ p0: @kotlin.UnsafeVariance E!): kotlin.String!
 }
 
 public abstract class DoubleIterator : kotlin.collections.Iterator<kotlin.Double> {
@@ -64,13 +64,13 @@ public interface Iterator</*0*/ out T> {
 public interface List</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract operator fun get(/*0*/ index: kotlin.Int): E
-    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
-    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Int
     public abstract fun listIterator(): kotlin.collections.ListIterator<E>
     public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<E>
     @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public abstract override /*1*/ /*fake_override*/ fun nonExistingMethod(/*0*/ p0: E!): kotlin.String!
@@ -103,7 +103,7 @@ public interface Map</*0*/ K, /*1*/ out V> {
     public abstract val values: kotlin.collections.Collection<V>
         public abstract fun <get-values>(): kotlin.collections.Collection<V>
     public abstract fun containsKey(/*0*/ key: K): kotlin.Boolean
-    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean
+    public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance V): kotlin.Boolean
     public abstract operator fun get(/*0*/ key: K): V?
     public abstract fun isEmpty(): kotlin.Boolean
 
@@ -225,8 +225,8 @@ public interface MutableSet</*0*/ E> : kotlin.collections.Set<E>, kotlin.collect
 public interface Set</*0*/ out E> : kotlin.collections.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance E>): kotlin.Boolean
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
     @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public abstract override /*1*/ /*fake_override*/ fun nonExistingMethod(/*0*/ p0: E!): kotlin.String!
diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt
index 4d5b5f37113..a33f07c3dd9 100644
--- a/compiler/testData/builtin-classes/newMethods/kotlin.txt
+++ b/compiler/testData/builtin-classes/newMethods/kotlin.txt
@@ -1,12 +1,12 @@
 package-fragment kotlin
 
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
-public fun </*0*/ reified @kotlin.internal.PureReifiable() T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOf(/*0*/ vararg elements: T /*kotlin.Array<out T>*/): kotlin.Array<T>
+public fun </*0*/ reified @kotlin.internal.PureReifiable T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
 public fun booleanArrayOf(/*0*/ vararg elements: kotlin.Boolean /*kotlin.BooleanArray*/): kotlin.BooleanArray
 public fun byteArrayOf(/*0*/ vararg elements: kotlin.Byte /*kotlin.ByteArray*/): kotlin.ByteArray
 public fun charArrayOf(/*0*/ vararg elements: kotlin.Char /*kotlin.CharArray*/): kotlin.CharArray
 public fun doubleArrayOf(/*0*/ vararg elements: kotlin.Double /*kotlin.DoubleArray*/): kotlin.DoubleArray
-public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> emptyArray(): kotlin.Array<T>
+public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> emptyArray(): kotlin.Array<T>
 public fun floatArrayOf(/*0*/ vararg elements: kotlin.Float /*kotlin.FloatArray*/): kotlin.FloatArray
 public fun intArrayOf(/*0*/ vararg elements: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray
 public fun longArrayOf(/*0*/ vararg elements: kotlin.Long /*kotlin.LongArray*/): kotlin.LongArray
@@ -185,7 +185,7 @@ public interface Comparable</*0*/ in T> {
     public abstract operator fun compareTo(/*0*/ other: T): kotlin.Int
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() public final annotation class Deprecated : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented public final annotation class Deprecated : kotlin.Annotation {
     /*primary*/ public constructor Deprecated(/*0*/ message: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ..., /*2*/ level: kotlin.DeprecationLevel = ...)
     public final val level: kotlin.DeprecationLevel
         public final fun <get-level>(): kotlin.DeprecationLevel
@@ -309,7 +309,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented() public final annotation class ExtensionFunctionType : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented public final annotation class ExtensionFunctionType : kotlin.Annotation {
     /*primary*/ public constructor ExtensionFunctionType()
 }
 
@@ -569,13 +569,13 @@ public abstract class Number : kotlin.Any, java.io.Serializable {
     public abstract fun toShort(): kotlin.Short
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented() public final annotation class ParameterName : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.MustBeDocumented public final annotation class ParameterName : kotlin.Annotation {
     /*primary*/ public constructor ParameterName(/*0*/ name: kotlin.String)
     public final val name: kotlin.String
         public final fun <get-name>(): kotlin.String
 }
 
-@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() public final annotation class ReplaceWith : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented public final annotation class ReplaceWith : kotlin.Annotation {
     /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val expression: kotlin.String
         public final fun <get-expression>(): kotlin.String
@@ -707,6 +707,6 @@ public object Unit {
     /*primary*/ private constructor Unit()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() public final annotation class UnsafeVariance : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
     /*primary*/ public constructor UnsafeVariance()
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
index a93049f6353..c4e0d9f3011 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
@@ -7,13 +7,13 @@ public final annotation class AAA : kotlin.Annotation {
 public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     enum entry ENTRY
 
-    private constructor MyEnum(/*0*/ @test.AAA() kotlin.Int)
+    private constructor MyEnum(/*0*/ @test.AAA kotlin.Int)
     public final /*fake_override*/ val name: kotlin.String
     @kotlin.Deprecated(message = "") public final val ord: kotlin.Int
     public final /*fake_override*/ val ordinal: kotlin.Int
     protected final /*fake_override*/ fun clone(): kotlin.Any
     public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
-    public final fun f(/*0*/ @java.lang.Deprecated() kotlin.Int): kotlin.Unit
+    public final fun f(/*0*/ @java.lang.Deprecated kotlin.Int): kotlin.Unit
     protected/*protected and package*/ final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
     public final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.MyEnum!>!
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt
index 9e98f50febf..f223cb2d3f9 100644
--- a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt
@@ -8,10 +8,10 @@ public final class A {
     public companion object Companion {
         private constructor Companion()
         public final val b: kotlin.String
-        @kotlin.jvm.JvmStatic() public final fun test1(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun test2(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun test1(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun test2(): kotlin.Unit
         public final fun test3(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun kotlin.String.test4(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun kotlin.String.test4(): kotlin.Unit
     }
 }
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
index 61599384f11..3de45f89b1e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
@@ -7,7 +7,7 @@ public final class A {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final val b: kotlin.String
+        @kotlin.jvm.JvmStatic public final val b: kotlin.String
         public final var test.A.c: kotlin.String
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt
index dba7afe114b..e902ad0afe6 100644
--- a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt
@@ -5,10 +5,10 @@ public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
 public object A {
     private constructor A()
     public final val b: kotlin.String
-    @kotlin.jvm.JvmStatic() public final fun test1(): kotlin.Unit
-    @kotlin.jvm.JvmStatic() public final fun test2(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public final fun test1(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public final fun test2(): kotlin.Unit
     public final fun test3(): kotlin.Unit
-    @kotlin.jvm.JvmStatic() public final fun kotlin.String.test4(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public final fun kotlin.String.test4(): kotlin.Unit
 }
 
 public/*package*/ open class Test {
diff --git a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
index 67eefc6ff17..cdc4a27a829 100644
--- a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
@@ -4,7 +4,7 @@ public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
 
 public object A {
     private constructor A()
-    @kotlin.jvm.JvmStatic() public final val b: kotlin.String
+    @kotlin.jvm.JvmStatic public final val b: kotlin.String
     public final var test.A.c: kotlin.String
 }
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt
index fe215049136..5041a9f0d45 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.jvm.JvmOverloads() public fun one(/*0*/ kotlin.Int = ...): kotlin.Unit
+@kotlin.jvm.JvmOverloads public fun one(/*0*/ kotlin.Int = ...): kotlin.Unit
 
 public final class E1 : kotlin.Exception /* = java.lang.Exception */ {
     public constructor E1()
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.txt
index 9a0832c8bf0..eae21eb7170 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.txt
@@ -6,7 +6,7 @@ public final class Test {
     public companion object Companion {
         private constructor Companion()
         public const final val valProp: kotlin.Int
-        @field:kotlin.jvm.JvmField() public final var varProp: kotlin.Int
+        @field:kotlin.jvm.JvmField public final var varProp: kotlin.Int
     }
 }
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt
index 02adc0cecf4..bec9aab3d35 100644
--- a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt
@@ -1,6 +1,6 @@
 package test
 
-@test.meta() public/*package*/ final annotation class MyAnn : kotlin.Annotation {
+@test.meta public/*package*/ final annotation class MyAnn : kotlin.Annotation {
     public/*package*/ constructor MyAnn()
 }
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/base.txt b/compiler/testData/compileJavaAgainstKotlin/targets/base.txt
index 6255d54b94c..f04fd088baa 100644
--- a/compiler/testData/compileJavaAgainstKotlin/targets/base.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/targets/base.txt
@@ -1,8 +1,8 @@
 package test
 
-@test.base() public/*package*/ open class My {
+@test.base public/*package*/ open class My {
     public/*package*/ constructor My()
-    @test.base() public/*package*/ open fun foo(/*0*/ @test.base() kotlin.Int): kotlin.Int
+    @test.base public/*package*/ open fun foo(/*0*/ @test.base kotlin.Int): kotlin.Int
 }
 
 public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt
index 49802a78229..ce3621fb144 100644
--- a/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt
@@ -1,11 +1,11 @@
 package test
 
-public fun bar(): @test.Ann() kotlin.String
+public fun bar(): @test.Ann kotlin.String
 
 public interface Ann {
 }
 
-@test.Ann() public final class Test {
+@test.Ann public final class Test {
     public constructor Test()
-    @test.Ann() public final fun foo(/*0*/ @test.Ann() s: @test.Ann() kotlin.String): @test.Ann() kotlin.String
+    @test.Ann public final fun foo(/*0*/ @test.Ann s: @test.Ann kotlin.String): @test.Ann kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.txt b/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.txt
index 9ea07923568..9058f1c2616 100644
--- a/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.txt
+++ b/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.txt
@@ -1,7 +1,7 @@
 package
 
 public fun foo(/*0*/ a: (kotlin.String) -> kotlin.Unit): kotlin.Unit
-public fun foo(/*0*/ a: @kotlin.ExtensionFunctionType() A): kotlin.Unit
+public fun foo(/*0*/ a: A): kotlin.Unit
 
 public interface A : (kotlin.String) -> kotlin.Unit {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/PackageInTypePosition.txt b/compiler/testData/diagnostics/tests/PackageInTypePosition.txt
index 16148e12ad9..c799adf784d 100644
--- a/compiler/testData/diagnostics/tests/PackageInTypePosition.txt
+++ b/compiler/testData/diagnostics/tests/PackageInTypePosition.txt
@@ -1,6 +1,6 @@
 package
 
-@[ERROR : foo]() /* annotation class not found */ public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo]
+@[ERROR : foo] /* annotation class not found */ public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo]
 
 package foo {
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt
index 1c6313399eb..77ca54e6d45 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt
@@ -1,5 +1,5 @@
 package
 
-@java.lang.Deprecated() public fun a(): kotlin.Unit
-@java.util.ArrayList<kotlin.Int>() public fun b(): kotlin.Unit
-@[ERROR : Xoo]() /* annotation class not found */ public fun c(): kotlin.Unit
+@java.lang.Deprecated public fun a(): kotlin.Unit
+@java.util.ArrayList<kotlin.Int> public fun b(): kotlin.Unit
+@[ERROR : Xoo] /* annotation class not found */ public fun c(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt
index 88627f0624c..2584a73483d 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt
@@ -1,7 +1,7 @@
 package
 
 public final class Annotated {
-    public constructor Annotated(/*0*/ @ann() x: kotlin.Int)
+    public constructor Annotated(/*0*/ @ann x: kotlin.Int)
     public final val x: kotlin.Int
     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/annotations/AnnotatedConstructorParams.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
index a38d10ea183..34088b456a0 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
@@ -1,11 +1,11 @@
 package
 
 package a {
-    @java.lang.Deprecated() @java.lang.SuppressWarnings(value = {}) public val s: kotlin.String = ""
-    @java.lang.Deprecated() @java.lang.SuppressWarnings(value = {}) public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    @java.lang.Deprecated @java.lang.SuppressWarnings(value = {}) public val s: kotlin.String = ""
+    @java.lang.Deprecated @java.lang.SuppressWarnings(value = {}) public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 
     public final class Test {
-        public constructor Test(/*0*/ @java.lang.Deprecated() s: kotlin.String, /*1*/ @java.lang.SuppressWarnings(value = {}) x: kotlin.Int)
+        public constructor Test(/*0*/ @java.lang.Deprecated s: kotlin.String, /*1*/ @java.lang.SuppressWarnings(value = {}) x: kotlin.Int)
         public final val s: kotlin.String
         public final val x: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt
index 1ae4abcebea..65f8d0d8e6e 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt
@@ -8,7 +8,7 @@ public final annotation class Base : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@UseBase() public final class My {
+@UseBase public final class My {
     public constructor My()
     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/annotations/AnnotationForFunctionTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt
index 37d2b034e11..d8974589996 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt
@@ -1,6 +1,6 @@
 package
 
-public fun </*0*/ @A1() @A2(some = 3) @A2() @A1() @A2(some = "Test") T> topFun(): kotlin.Int
+public fun </*0*/ @A1 @A2(some = 3) @A2 @A1 @A2(some = "Test") T> topFun(): kotlin.Int
 
 public final annotation class A1 : kotlin.Annotation {
     public constructor A1()
@@ -22,6 +22,6 @@ public final class SomeClass {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun </*0*/ @A1() @A2(some = 3) @A2() @A1() @A2(some = "Test") T> method(): kotlin.Int
+    public final fun </*0*/ @A1 @A2(some = 3) @A2 @A1 @A2(some = "Test") T> method(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt
index 1585470cf15..4c32710296f 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt
@@ -1,6 +1,6 @@
 package
 
-@[ERROR : someErrorAnnotation]() /* annotation class not found */ public object Test {
+@[ERROR : someErrorAnnotation] /* annotation class not found */ public object Test {
     private constructor Test()
     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/annotations/AnnotationIdentifier.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt
index 7f63c59a3da..95eb6075dd1 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt
@@ -16,14 +16,14 @@ package other {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    @other.My() public final class Our {
+    @other.My public final class Our {
         public constructor Our()
         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
     }
 
-    @test.annotation() public final class Your {
+    @test.annotation public final class Your {
         public constructor Your()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -33,7 +33,7 @@ package other {
 
 package test {
 
-    @test.annotation() public final class annotation {
+    @test.annotation public final class annotation {
         public constructor annotation()
         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/annotations/AnnotationsForClasses.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt
index 0124c9824ce..3458fc1bee0 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt
@@ -1,6 +1,6 @@
 package
 
-@java.lang.Deprecated() public final annotation class my : kotlin.Annotation {
+@java.lang.Deprecated public final annotation class my : kotlin.Annotation {
     public constructor my()
     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/annotations/AnnotationsForPropertyTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
index fe5d5216e91..0599b6e329f 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
@@ -1,6 +1,6 @@
 package
 
-public val </*0*/ @A1() @A2(some = 3) @A2() @A1() @A2(some = "Test") T> T.topProp: kotlin.Int
+public val </*0*/ @A1 @A2(some = 3) @A2 @A1 @A2(some = "Test") T> T.topProp: kotlin.Int
 
 public final annotation class A1 : kotlin.Annotation {
     public constructor A1()
@@ -19,7 +19,7 @@ public final annotation class A2 : kotlin.Annotation {
 
 public final class SomeClass {
     public constructor SomeClass()
-    public final val </*0*/ @A1() @A2(some = 3) @A2() @A1() @A2(some = "Test") T> T.field: kotlin.Int
+    public final val </*0*/ @A1 @A2(some = 3) @A2 @A1 @A2(some = "Test") T> T.field: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt
index c59ea42cd60..c38e36030e0 100644
--- a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt
@@ -1,10 +1,10 @@
 package
 
-@my() public fun foo(): kotlin.Unit
-@my1() public fun foo2(): kotlin.Unit
+@my public fun foo(): kotlin.Unit
+@my1 public fun foo2(): kotlin.Unit
 @my1(i = 2) public fun foo3(): kotlin.Unit
-@my2() public fun foo4(): kotlin.Unit
-@my2() public fun foo41(): kotlin.Unit
+@my2 public fun foo4(): kotlin.Unit
+@my2 public fun foo41(): kotlin.Unit
 @my2(i = 2) public fun foo42(): kotlin.Unit
 
 public final annotation class my : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/Deprecated.txt b/compiler/testData/diagnostics/tests/annotations/Deprecated.txt
index 87cc904fe18..636fe9140cd 100644
--- a/compiler/testData/diagnostics/tests/annotations/Deprecated.txt
+++ b/compiler/testData/diagnostics/tests/annotations/Deprecated.txt
@@ -1,4 +1,4 @@
 package
 
-@java.lang.Deprecated() public fun foo(): kotlin.Unit
-@java.lang.Deprecated() public fun foo1(): kotlin.Unit
+@java.lang.Deprecated public fun foo(): kotlin.Unit
+@java.lang.Deprecated public fun foo1(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt b/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt
index c21ed33d38e..d4a60a16bd3 100644
--- a/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt
+++ b/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt
@@ -1,7 +1,7 @@
 package
 
-@ann() public fun bar(): kotlin.Int
-@ann() public fun foo(): kotlin.Int
+@ann public fun bar(): kotlin.Int
+@ann public fun foo(): kotlin.Int
 
 public final annotation class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.txt b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.txt
index c1383a1d3d5..d2aa0237d60 100644
--- a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.txt
+++ b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.txt
@@ -1,6 +1,6 @@
 package
 
-@Foo() public final class Bar {
+@Foo public final class Bar {
     public constructor 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/annotations/RecursivelyAnnotatedFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt
index 58c1bcaeff8..301a442879f 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt
+++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt
@@ -1,6 +1,6 @@
 package
 
-public fun foo(/*0*/ @ann() x: kotlin.Int): kotlin.Int
+public fun foo(/*0*/ @ann x: kotlin.Int): kotlin.Int
 
 public final annotation class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt
index e5154d45912..2db8e77908b 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt
+++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt
@@ -1,6 +1,6 @@
 package
 
-@ann() public fun foo(): kotlin.Int
+@ann public fun foo(): kotlin.Int
 
 public final annotation class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt b/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt
index d067ab203b8..7dc3b7d2be0 100644
--- a/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt
+++ b/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt
@@ -3,7 +3,7 @@ package
 package test {
     public val some: test.SomeObject
 
-    @[ERROR : BadAnnotation]() /* annotation class not found */ public object SomeObject {
+    @[ERROR : BadAnnotation] /* annotation class not found */ public object SomeObject {
         private constructor SomeObject()
         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/annotations/annotationOnParameterInFunctionType.txt b/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt
index 9e76e31db0d..deb815ca476 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt
@@ -1,12 +1,12 @@
 package
 
 public val inVal: (x: kotlin.Int) -> kotlin.Unit
-public val onType: @TypeAnn() A.(a: @TypeAnn() A, A) -> @TypeAnn() A?
-public fun f(/*0*/ @Ann() x: kotlin.Int): kotlin.Unit
+public val onType: @TypeAnn A.(a: @TypeAnn A, A) -> @TypeAnn A?
+public fun f(/*0*/ @Ann x: kotlin.Int): kotlin.Unit
 public fun inParam(/*0*/ fn: (x: kotlin.Int) -> kotlin.Unit): kotlin.Unit
 public fun inParamNested(/*0*/ fn1: (fn2: (n: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit
 public fun inReturn(): (x: kotlin.Int) -> kotlin.Unit
-public fun @TypeAnn() A.extFun(/*0*/ @Ann() a: @TypeAnn() A): @TypeAnn() A?
+public fun @TypeAnn A.extFun(/*0*/ @Ann a: @TypeAnn A): @TypeAnn A?
 
 public final class A : (kotlin.Int) -> kotlin.Unit {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
index 5a0b4e8ac61..77a5e81631a 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
@@ -29,14 +29,14 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
 
-@AnnE() public final class Test {
+@AnnE public final class Test {
     public constructor Test()
     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
 }
 
-@AnnE() public final class Test2 {
+@AnnE public final class Test2 {
     public constructor Test2()
     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/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
index 531c9158276..6c26f4527f5 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
@@ -27,28 +27,28 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
 
-@AnnE() public final class Test {
+@AnnE public final class Test {
     public constructor Test()
     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
 }
 
-@AnnE() public final class Test2 {
+@AnnE public final class Test2 {
     public constructor Test2()
     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
 }
 
-@AnnE() public final class Test3 {
+@AnnE public final class Test3 {
     public constructor Test3()
     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
 }
 
-@AnnE() public final class Test4 {
+@AnnE public final class Test4 {
     public constructor Test4()
     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/annotations/annotationsOnLambdaAsCallArgument.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt
index 0c6a7141bbc..954948a09e8 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt
@@ -3,7 +3,7 @@ package
 public inline fun bar(/*0*/ block: () -> kotlin.Int): kotlin.Int
 public fun foo(): kotlin.Unit
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ x: kotlin.Int = ...)
     public final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt
index 4f587a537a2..be87aa9d23a 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt
@@ -1,21 +1,21 @@
 package
 
-public val baz: @a() kotlin.Int? = 1
+public val baz: @a kotlin.Int? = 1
 public val baz1: @b(i = 1) kotlin.Int? = 1
-public val baz2: @a() @b(i = 1) kotlin.Int? = 1
-public val baz3: @c() kotlin.Int? = 1
-public fun foo(/*0*/ i: @a() kotlin.Int?): kotlin.Unit
-public fun foo(/*0*/ l: kotlin.collections.List<@a() kotlin.Int?>): kotlin.Unit
+public val baz2: @a @b(i = 1) kotlin.Int? = 1
+public val baz3: @c kotlin.Int? = 1
+public fun foo(/*0*/ i: @a kotlin.Int?): kotlin.Unit
+public fun foo(/*0*/ l: kotlin.collections.List<@a kotlin.Int?>): kotlin.Unit
 public fun foo1(/*0*/ i: @b(i = 1) kotlin.Int?): kotlin.Unit
 public fun foo1(/*0*/ l: kotlin.collections.List<@b(i = 1) kotlin.Int?>): kotlin.Unit
-public fun foo2(/*0*/ i: @a() @b(i = 1) kotlin.Int?): kotlin.Unit
-public fun foo2(/*0*/ l: kotlin.collections.List<@a() @b(i = 1) kotlin.Int?>): kotlin.Unit
-public fun foo3(/*0*/ i: @c() kotlin.Int?): kotlin.Unit
-public fun foo3(/*0*/ l: kotlin.collections.List<@c() kotlin.Int?>): kotlin.Unit
-public fun @a() kotlin.Int?.bar(): kotlin.Unit
+public fun foo2(/*0*/ i: @a @b(i = 1) kotlin.Int?): kotlin.Unit
+public fun foo2(/*0*/ l: kotlin.collections.List<@a @b(i = 1) kotlin.Int?>): kotlin.Unit
+public fun foo3(/*0*/ i: @c kotlin.Int?): kotlin.Unit
+public fun foo3(/*0*/ l: kotlin.collections.List<@c kotlin.Int?>): kotlin.Unit
+public fun @a kotlin.Int?.bar(): kotlin.Unit
 public fun @b(i = 1) kotlin.Int?.bar1(): kotlin.Unit
-public fun @a() @b(i = 1) kotlin.Int?.bar2(): kotlin.Unit
-public fun @c() kotlin.Int?.bar3(): kotlin.Unit
+public fun @a @b(i = 1) kotlin.Int?.bar2(): kotlin.Unit
+public fun @c kotlin.Int?.bar3(): kotlin.Unit
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class a : kotlin.Annotation {
     public constructor a()
diff --git a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt
index 651a14f8331..a04c807cad9 100644
--- a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt
+++ b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt
@@ -1,8 +1,8 @@
 package
 
 @Ann(x = 1) @Ann(x = 2) @Ann(x = 3) private final class A {
-    @Ann() public constructor A()
-    @Ann() public final val x: kotlin.Int = 1
+    @Ann public constructor A()
+    @Ann public final val x: kotlin.Int = 1
     public final fun bar(/*0*/ x: @Ann(x = 1) @Ann(x = 2) @Ann(x = 3) kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @Ann(x = 5) public final fun foo(): kotlin.Unit
@@ -10,7 +10,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ x: kotlin.Int = ...)
     public final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt b/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
index 1dfc3b0743c..12a0e8c1b4c 100644
--- a/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
+++ b/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
@@ -3,9 +3,9 @@ package
 public interface Some {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun f1(): kotlin.String.() -> kotlin.Int
-    public abstract fun f2(): @kotlin.ExtensionFunctionType() kotlin.String.() -> kotlin.Int
-    public abstract fun f3(): @ann() kotlin.String.() -> kotlin.Int
-    public abstract fun f4(): @kotlin.ExtensionFunctionType() @ann() kotlin.String.() -> kotlin.Int
+    public abstract fun f2(): kotlin.String.() -> kotlin.Int
+    public abstract fun f3(): @ann kotlin.String.() -> kotlin.Int
+    public abstract fun f4(): @ann kotlin.String.() -> kotlin.Int
     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/annotations/kt1860-negative.txt b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt
index 3f2bbb28904..c461b7bf5cc 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt
@@ -2,10 +2,10 @@ package
 
 public var bar: kotlin.Int
 public val x: (kotlin.Int) -> kotlin.Int
-public fun foo(/*0*/ @[ERROR : varargs]() /* annotation class not found */ f: kotlin.Int): kotlin.Unit
+public fun foo(/*0*/ @[ERROR : varargs] /* annotation class not found */ f: kotlin.Int): kotlin.Unit
 
 public final class Hello {
-    public constructor Hello(/*0*/ @[ERROR : varargs]() /* annotation class not found */ args: kotlin.Any)
+    public constructor Hello(/*0*/ @[ERROR : varargs] /* annotation class not found */ args: kotlin.Any)
     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/annotations/kt1860-positive.txt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt
index 40dba668e6c..95d9546982d 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt
@@ -2,10 +2,10 @@ package
 
 public var bar: kotlin.Int
 public val x: (kotlin.Int) -> kotlin.Int
-public fun foo(/*0*/ @test() f: kotlin.Int): kotlin.Unit
+public fun foo(/*0*/ @test f: kotlin.Int): kotlin.Unit
 
 public final class Hello {
-    public constructor Hello(/*0*/ @test() args: kotlin.Any)
+    public constructor Hello(/*0*/ @test args: kotlin.Any)
     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/annotations/onFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt
index b45c8e56e43..a0b386b020b 100644
--- a/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt
+++ b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt
@@ -1,7 +1,7 @@
 package
 
 public val bar: (kotlin.Int) -> kotlin.Unit
-public fun test(/*0*/ @ann() p: kotlin.Int): kotlin.Unit
+public fun test(/*0*/ @ann p: kotlin.Int): kotlin.Unit
 
 public final annotation class ann : kotlin.Annotation {
     public constructor ann()
diff --git a/compiler/testData/diagnostics/tests/annotations/options/documented.txt b/compiler/testData/diagnostics/tests/annotations/options/documented.txt
index cf7b8a4b8b9..1037a8c7fbf 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/documented.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/documented.txt
@@ -1,13 +1,13 @@
 package
 
-@kotlin.annotation.MustBeDocumented() public final annotation class DocAnn : kotlin.Annotation {
+@kotlin.annotation.MustBeDocumented public final annotation class DocAnn : kotlin.Annotation {
     public constructor DocAnn()
     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
 }
 
-@DocAnn() public final class My {
+@DocAnn public final class My {
     public constructor My()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,7 +21,7 @@ public final annotation class NotDocAnn : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@NotDocAnn() public final class Your {
+@NotDocAnn public final class Your {
     public constructor Your()
     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/annotations/options/functions.txt b/compiler/testData/diagnostics/tests/annotations/options/functions.txt
index 8935e4453b4..416e0743af5 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/functions.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/functions.txt
@@ -4,7 +4,7 @@ public fun bar(/*0*/ arg: () -> kotlin.Int): kotlin.Int
 public inline fun fast(/*0*/ arg: () -> kotlin.Int): kotlin.Int
 public inline fun fast2(/*0*/ x: kotlin.Int, /*1*/ arg: () -> kotlin.Int): kotlin.Int
 public fun foo(/*0*/ arg: kotlin.Int): kotlin.Unit
-@FunAnn() public fun gav(): kotlin.Int
+@FunAnn public fun gav(): kotlin.Int
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class ExprAnn : kotlin.Annotation {
     public constructor ExprAnn()
diff --git a/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt b/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt
index 7122c81ac6a..7cbccd80398 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt
@@ -6,7 +6,7 @@ public open class DocumentedAnnotations {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @kotlin.annotation.MustBeDocumented() public final annotation class DocAnn : kotlin.Annotation {
+    @kotlin.annotation.MustBeDocumented public final annotation class DocAnn : kotlin.Annotation {
         public constructor DocAnn()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -20,7 +20,7 @@ public open class DocumentedAnnotations {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    @kotlin.annotation.MustBeDocumented() @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RunDocAnn : kotlin.Annotation {
+    @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RunDocAnn : kotlin.Annotation {
         public constructor RunDocAnn()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -28,21 +28,21 @@ public open class DocumentedAnnotations {
     }
 }
 
-@DocumentedAnnotations.RunDocAnn() public final class His {
+@DocumentedAnnotations.RunDocAnn public final class His {
     public constructor His()
     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
 }
 
-@DocumentedAnnotations.DocAnn() public final class My {
+@DocumentedAnnotations.DocAnn public final class My {
     public constructor My()
     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
 }
 
-@DocumentedAnnotations.NotDocAnn() public final class Your {
+@DocumentedAnnotations.NotDocAnn public final class Your {
     public constructor Your()
     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/annotations/options/javaretention.txt b/compiler/testData/diagnostics/tests/annotations/options/javaretention.txt
index f69e612ba46..4fb2411312a 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/javaretention.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/javaretention.txt
@@ -35,28 +35,28 @@ public open class AnnotationRetentions {
     }
 }
 
-@AnnotationRetentions.BaseAnnotation() public final class BaseClass {
+@AnnotationRetentions.BaseAnnotation public final class BaseClass {
     public constructor BaseClass()
     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
 }
 
-@AnnotationRetentions.BinaryAnnotation() public final class BinaryClass {
+@AnnotationRetentions.BinaryAnnotation public final class BinaryClass {
     public constructor BinaryClass()
     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
 }
 
-@AnnotationRetentions.RuntimeAnnotation() public final class RuntimeClass {
+@AnnotationRetentions.RuntimeAnnotation public final class RuntimeClass {
     public constructor RuntimeClass()
     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
 }
 
-@AnnotationRetentions.SourceAnnotation() public final class SourceClass {
+@AnnotationRetentions.SourceAnnotation public final class SourceClass {
     public constructor SourceClass()
     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/annotations/options/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt
index e77af898baf..b938243507e 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt
@@ -1,15 +1,15 @@
 package
 
-@repann() @repann() public fun foo(/*0*/ @repann() @repann() x: kotlin.Int): kotlin.Int
+@repann @repann public fun foo(/*0*/ @repann @repann x: kotlin.Int): kotlin.Int
 
-@binrepann() @binrepann() public final class BinaryAnnotated {
+@binrepann @binrepann public final class BinaryAnnotated {
     public constructor BinaryAnnotated()
     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
 }
 
-@repann() @repann() public final class DoubleAnnotated {
+@repann @repann public final class DoubleAnnotated {
     public constructor DoubleAnnotated()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -30,21 +30,21 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.Repeatable() public final annotation class binrepann : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.Repeatable public final annotation class binrepann : kotlin.Annotation {
     public constructor binrepann()
     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
 }
 
-@kotlin.annotation.Repeatable() public final annotation class repann : kotlin.Annotation {
+@kotlin.annotation.Repeatable public final annotation class repann : kotlin.Annotation {
     public constructor repann()
     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
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class repann1 : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class repann1 : kotlin.Annotation {
     public constructor repann1(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -52,7 +52,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class repann2 : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class repann2 : kotlin.Annotation {
     public constructor repann2(/*0*/ f: kotlin.Boolean)
     public final val f: kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -60,7 +60,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Repeatable() public final annotation class repexpr : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Repeatable public final annotation class repexpr : kotlin.Annotation {
     public constructor repexpr()
     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/annotations/options/retention.txt b/compiler/testData/diagnostics/tests/annotations/options/retention.txt
index 55c6561fb03..c15786abcd6 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/retention.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/retention.txt
@@ -1,6 +1,6 @@
 package
 
-@sourceann() public final class AnnotatedAtSource {
+@sourceann public final class AnnotatedAtSource {
     public constructor AnnotatedAtSource()
     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/annotations/options/target.txt b/compiler/testData/diagnostics/tests/annotations/options/target.txt
index eee6aa4b0d9..1b2668e4d45 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/target.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/target.txt
@@ -1,6 +1,6 @@
 package
 
-@base() public final data class My {
+@base public final data class My {
     public constructor My(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
index d37b8692fd4..fbee4dfdc87 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
@@ -2,9 +2,9 @@ package
 
 public final class My {
     public constructor My(/*0*/ x: kotlin.Int)
-    @smartget() public final var y: kotlin.Int
+    @smartget public final var y: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @base() @smartget() @smartset() public final fun foo(): kotlin.Int
+    @base @smartget @smartset public final fun foo(): kotlin.Int
     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/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
index 6a6a8bf7df8..7e535ad06c8 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
@@ -1,12 +1,12 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
     private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
+@base public final class correct {
+    @base public constructor correct()
     public constructor correct(/*0*/ x: kotlin.Int)
-    @base() public final val x: kotlin.Int
+    @base public final val x: kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
index 7007711393c..69384740995 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
@@ -1,14 +1,14 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
-    @base() private constructor My()
+    @base private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
-    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @base() w: @base() kotlin.Int)
-    @base() public final val x: kotlin.Int
+@base public final class correct {
+    @base public constructor correct()
+    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @base w: @base kotlin.Int)
+    @base public final val x: kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
index 41f1139d1ed..3ee9f2a8955 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
@@ -1,14 +1,14 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
-    @base() private constructor My()
+    @base private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
+@base public final class correct {
+    @base public constructor correct()
     public constructor correct(/*0*/ x: kotlin.Int)
-    @base() public final val x: kotlin.Int
+    @base public final val x: kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
index 485b456595c..e7018b162e2 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
@@ -1,14 +1,14 @@
 package
 
-@empty() public val z: kotlin.Int
-@empty() public fun foo(/*0*/ @empty() y: @empty() kotlin.Int): kotlin.Int
+@empty public val z: kotlin.Int
+@empty public fun foo(/*0*/ @empty y: @empty kotlin.Int): kotlin.Int
 
-@empty() public final enum class My : kotlin.Enum<My> {
-    @empty() enum entry FIRST
+@empty public final enum class My : kotlin.Enum<My> {
+    @empty enum entry FIRST
 
-    @empty() enum entry SECOND
+    @empty enum entry SECOND
 
-    @empty() private constructor My()
+    @empty private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -24,16 +24,16 @@ package
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-@empty() public final class correct {
-    @empty() public constructor correct()
-    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @empty() w: @empty() kotlin.Int)
-    @empty() public final val x: kotlin.Int
+@empty public final class correct {
+    @empty public constructor correct()
+    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @empty w: @empty kotlin.Int)
+    @empty public final val x: kotlin.Int
     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
 }
 
-@empty() public final annotation class derived : kotlin.Annotation {
+@empty public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/expr.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt
index 56370cbf4da..a0f9a6e59ca 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt
@@ -1,6 +1,6 @@
 package
 
-@base() @special() public fun foo(/*0*/ i: kotlin.Int): kotlin.Int
+@base @special public fun foo(/*0*/ i: kotlin.Int): kotlin.Int
 public fun transform(/*0*/ i: kotlin.Int, /*1*/ tr: (kotlin.Int) -> kotlin.Int): kotlin.Int
 
 public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
index 1e442545e42..f99b6907fd2 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
@@ -1,9 +1,9 @@
 package
 
-@Field() public val x: kotlin.Int = 42
-@Field() public val y: kotlin.Int
+@Field public val x: kotlin.Int = 42
+@Field public val y: kotlin.Int
 
-@Field() public final annotation class Another : kotlin.Annotation {
+@Field public final annotation class Another : kotlin.Annotation {
     public constructor Another()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -18,28 +18,28 @@ package
 }
 
 public interface His {
-    @Field() public abstract val x: kotlin.Int
-    @Field() public open val y: kotlin.Int
+    @Field public abstract val x: kotlin.Int
+    @Field public open val y: kotlin.Int
     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
 }
 
-@Field() public abstract class My {
-    public constructor My(/*0*/ @Field() arg: kotlin.Int, /*1*/ w: kotlin.Int)
-    @Field() public final val v: kotlin.Int
-    @Field() public final val w: kotlin.Int
-    @Field() public final val x: kotlin.Int
-    @Field() public final val y: kotlin.Int
-    @Field() public abstract val z: kotlin.Int
+@Field public abstract class My {
+    public constructor My(/*0*/ @Field arg: kotlin.Int, /*1*/ w: kotlin.Int)
+    @Field public final val v: kotlin.Int
+    @Field public final val w: kotlin.Int
+    @Field public final val x: kotlin.Int
+    @Field public final val y: kotlin.Int
+    @Field public abstract val z: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @Field() public final fun foo(): kotlin.Unit
+    @Field public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final enum class Your : kotlin.Enum<Your> {
-    @Field() enum entry FIRST
+    @Field enum entry FIRST
 
     private constructor Your()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt
index 9c2f09d4e63..cd9d07646aa 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt
@@ -2,14 +2,14 @@ package
 
 package test {
 
-    @test.common() public final class Correct {
+    @test.common public final class Correct {
         public constructor Correct()
         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
     }
 
-    @test.special() public final class Incorrect {
+    @test.special public final class Incorrect {
         public constructor Incorrect()
         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/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
index 49c5f08887e..8aab4252034 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
@@ -1,14 +1,14 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
-    @base() private constructor My()
+    @base private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -31,17 +31,17 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
+@base public final class correct {
+    @base public constructor correct()
     public constructor correct(/*0*/ x: kotlin.Int)
-    @base() public final val x: kotlin.Int
-    @base() public final fun baz(): kotlin.Unit
+    @base public final val x: kotlin.Int
+    @base public final fun baz(): kotlin.Unit
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
index 664d744f313..c17aa713142 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
@@ -1,14 +1,14 @@
 package
 
-@incorrect() public val z: kotlin.Int
-@incorrect() public fun foo(/*0*/ @incorrect() y: @incorrect() kotlin.Int): kotlin.Int
+@incorrect public val z: kotlin.Int
+@incorrect public fun foo(/*0*/ @incorrect y: @incorrect kotlin.Int): kotlin.Int
 
-@incorrect() public final enum class My : kotlin.Enum<My> {
-    @incorrect() enum entry FIRST
+@incorrect public final enum class My : kotlin.Enum<My> {
+    @incorrect enum entry FIRST
 
-    @incorrect() enum entry SECOND
+    @incorrect enum entry SECOND
 
-    @incorrect() private constructor My()
+    @incorrect private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -24,16 +24,16 @@ package
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-@incorrect() public final class correct {
-    @incorrect() public constructor correct()
-    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @incorrect() w: @incorrect() kotlin.Int)
-    @incorrect() public final val x: kotlin.Int
+@incorrect public final class correct {
+    @incorrect public constructor correct()
+    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @incorrect w: @incorrect kotlin.Int)
+    @incorrect public final val x: kotlin.Int
     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
 }
 
-@incorrect() public final annotation class derived : kotlin.Annotation {
+@incorrect public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/init.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt
index 50f0962821e..6a89b3d34e1 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt
@@ -1,6 +1,6 @@
 package
 
-@base() public final class My {
+@base public final class My {
     public constructor My()
     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/annotations/options/targets/java.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
index f5209c86af7..f0246c01b41 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
@@ -72,18 +72,18 @@ package test {
         }
     }
 
-    @test.AnnotationTargets.base() @test.AnnotationTargets.meta() @test.AnnotationTargets.type() @test.AnnotationTargets.method() @test.AnnotationTargets.multiple() public final class KClass {
-        @test.AnnotationTargets.base() @test.AnnotationTargets.method() @test.AnnotationTargets.konstructor() public constructor KClass()
-        public constructor KClass(/*0*/ @test.AnnotationTargets.base() @test.AnnotationTargets.parameter() y: @test.AnnotationTargets.base() @test.AnnotationTargets.type() kotlin.Int)
-        @test.AnnotationTargets.base() @test.AnnotationTargets.multiple() @test.AnnotationTargets.fieldann() @test.AnnotationTargets.local() public final val x: kotlin.Int = 0
-        @test.AnnotationTargets.fieldann() public final val y: @test.AnnotationTargets.base() @test.AnnotationTargets.type() kotlin.Int
+    @test.AnnotationTargets.base @test.AnnotationTargets.meta @test.AnnotationTargets.type @test.AnnotationTargets.method @test.AnnotationTargets.multiple public final class KClass {
+        @test.AnnotationTargets.base @test.AnnotationTargets.method @test.AnnotationTargets.konstructor public constructor KClass()
+        public constructor KClass(/*0*/ @test.AnnotationTargets.base @test.AnnotationTargets.parameter y: @test.AnnotationTargets.base @test.AnnotationTargets.type kotlin.Int)
+        @test.AnnotationTargets.base @test.AnnotationTargets.multiple @test.AnnotationTargets.fieldann @test.AnnotationTargets.local public final val x: kotlin.Int = 0
+        @test.AnnotationTargets.fieldann public final val y: @test.AnnotationTargets.base @test.AnnotationTargets.type kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @test.AnnotationTargets.base() @test.AnnotationTargets.method() @test.AnnotationTargets.multiple() @test.AnnotationTargets.konstructor() public final fun foo(/*0*/ @test.AnnotationTargets.parameter() @test.AnnotationTargets.type() i: @test.AnnotationTargets.base() @test.AnnotationTargets.multiple() kotlin.Int): @test.AnnotationTargets.fieldann() @test.AnnotationTargets.parameter() kotlin.Int
+        @test.AnnotationTargets.base @test.AnnotationTargets.method @test.AnnotationTargets.multiple @test.AnnotationTargets.konstructor public final fun foo(/*0*/ @test.AnnotationTargets.parameter @test.AnnotationTargets.type i: @test.AnnotationTargets.base @test.AnnotationTargets.multiple kotlin.Int): @test.AnnotationTargets.fieldann @test.AnnotationTargets.parameter kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    @test.AnnotationTargets.base() @test.AnnotationTargets.meta() @test.AnnotationTargets.type() @test.AnnotationTargets.konstructor() public final annotation class KMeta : kotlin.Annotation {
+    @test.AnnotationTargets.base @test.AnnotationTargets.meta @test.AnnotationTargets.type @test.AnnotationTargets.konstructor public final annotation class KMeta : kotlin.Annotation {
         public constructor KMeta()
         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/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
index a7b125a4135..964998af62c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
@@ -1,12 +1,12 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
     private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
+@base public final class correct {
+    @base public constructor correct()
     public constructor correct(/*0*/ x: kotlin.Int)
-    @base() public final val x: kotlin.Int
+    @base public final val x: kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/nested.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt
index 99338097ec0..8c23d3765f5 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt
@@ -1,20 +1,20 @@
 package
 
-@base() public final class Outer {
+@base public final class Outer {
     public constructor Outer()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @base() @meta() public final annotation class Annotated : kotlin.Annotation {
+    @base @meta public final annotation class Annotated : kotlin.Annotation {
         public constructor Annotated()
         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
     }
 
-    @base() @meta() public final class Nested {
+    @base @meta public final class Nested {
         public constructor Nested()
         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/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
index f31d18613e1..9884a9ee19f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
@@ -1,12 +1,12 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
     private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
-    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @base() w: kotlin.Int)
-    @base() public final val x: kotlin.Int
+@base public final class correct {
+    @base public constructor correct()
+    public constructor correct(/*0*/ x: kotlin.Int, /*1*/ @base w: kotlin.Int)
+    @base public final val x: kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/returntype.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt
index e4cc57bcda1..27c32f8316a 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt
@@ -1,11 +1,11 @@
 package
 
-@base() public final class My {
-    public constructor My(/*0*/ x: @base() @typed() kotlin.Int, /*1*/ y: @base() @typed() kotlin.Int)
-    public final val x: @base() @typed() kotlin.Int
-    public final val z: @base() @typed() kotlin.Int
+@base public final class My {
+    public constructor My(/*0*/ x: @base @typed kotlin.Int, /*1*/ y: @base @typed kotlin.Int)
+    public final val x: @base @typed kotlin.Int
+    public final val z: @base @typed kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): @base() @typed() kotlin.Int
+    public final fun foo(): @base @typed kotlin.Int
     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/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
index d9e496782d2..168af071c5d 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
@@ -1,14 +1,14 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
-    @base() private constructor My()
+    @base private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
-    public constructor correct(/*0*/ x: @base() kotlin.Int)
-    @base() public final val x: @base() kotlin.Int
+@base public final class correct {
+    @base public constructor correct()
+    public constructor correct(/*0*/ x: @base kotlin.Int)
+    @base public final val x: @base kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/options/targets/typeParams.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.txt
index 27eafda3071..b92777568f6 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.txt
@@ -1,11 +1,11 @@
 package
 
-public val </*0*/ @A() @B(i = 3) T> T.topProp: kotlin.Int
-@A() public fun foo(): kotlin.Unit
-public fun foo(/*0*/ i: @A() kotlin.Int): kotlin.Unit
-public fun </*0*/ T> test(/*0*/ t: @A() T): T
-public fun </*0*/ @C() T> test2(/*0*/ t: T): T
-public fun </*0*/ @A() @B(i = 3) T> topFun(): kotlin.Int
+public val </*0*/ @A @B(i = 3) T> T.topProp: kotlin.Int
+@A public fun foo(): kotlin.Unit
+public fun foo(/*0*/ i: @A kotlin.Int): kotlin.Unit
+public fun </*0*/ T> test(/*0*/ t: @A T): T
+public fun </*0*/ @C T> test2(/*0*/ t: T): T
+public fun </*0*/ @A @B(i = 3) T> topFun(): kotlin.Int
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) public final annotation class A : kotlin.Annotation {
     public constructor A()
@@ -34,19 +34,19 @@ public final class Class1 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun </*0*/ @A() @B(i = 3) T> method(): kotlin.Int
+    public final fun </*0*/ @A @B(i = 3) T> method(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class Class2 {
     public constructor Class2()
-    public final val </*0*/ @A() @B(i = 3) T> T.field: kotlin.Int
+    public final val </*0*/ @A @B(i = 3) T> T.field: kotlin.Int
     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
 }
 
-@A() public final class D {
+@A public final class D {
     public constructor D()
     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/annotations/options/targets/typeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
index 30989f527ce..5066d2ccbed 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
@@ -1,8 +1,8 @@
 package
 
-public val x: kotlin.collections.List<@base() kotlin.String>? = null
-public val y: kotlin.collections.List<@base() kotlin.String>? = null
-public fun foo(/*0*/ list: kotlin.collections.List<@typeAnn() kotlin.Int>): kotlin.collections.List<@typeAnn() kotlin.Int>
+public val x: kotlin.collections.List<@base kotlin.String>? = null
+public val y: kotlin.collections.List<@base kotlin.String>? = null
+public fun foo(/*0*/ list: kotlin.collections.List<@typeAnn kotlin.Int>): kotlin.collections.List<@typeAnn kotlin.Int>
 
 public final annotation class base : kotlin.Annotation {
     public constructor base()
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
index 972bb66cf34..629e90c565f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
@@ -1,12 +1,12 @@
 package
 
-@base() public val z: kotlin.Int = 0
-@base() public fun foo(/*0*/ @base() y: @base() kotlin.Int): kotlin.Int
+@base public val z: kotlin.Int = 0
+@base public fun foo(/*0*/ @base y: @base kotlin.Int): kotlin.Int
 
-@base() public final enum class My : kotlin.Enum<My> {
-    @base() enum entry FIRST
+@base public final enum class My : kotlin.Enum<My> {
+    @base enum entry FIRST
 
-    @base() enum entry SECOND
+    @base enum entry SECOND
 
     private constructor My()
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
@@ -31,16 +31,16 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@base() public final class correct {
-    @base() public constructor correct()
-    public constructor correct(/*0*/ @base() x: kotlin.Int, /*1*/ @base() w: kotlin.Int)
+@base public final class correct {
+    @base public constructor correct()
+    public constructor correct(/*0*/ @base x: kotlin.Int, /*1*/ @base w: kotlin.Int)
     public final val x: kotlin.Int
     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
 }
 
-@base() public final annotation class derived : kotlin.Annotation {
+@base public final annotation class derived : kotlin.Annotation {
     public constructor derived()
     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/annotations/typeAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
index bd7709c27a8..e2b9a6a525b 100644
--- a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
@@ -1,9 +1,9 @@
 package
 
-public val </*0*/ T> @x() kotlin.collections.List<@x() T>.f: kotlin.Int
-public fun </*0*/ T, /*1*/ U : T> kotlin.collections.List<@x() T>.firstTyped(): U
-public fun @x() A.foo(/*0*/ a: @x() kotlin.Int): kotlin.Unit
-public fun </*0*/ T> @x() kotlin.collections.List<@x() T>.foo(/*0*/ l: kotlin.collections.List<@x() T>): @x() kotlin.collections.List<@x() T>
+public val </*0*/ T> @x kotlin.collections.List<@x T>.f: kotlin.Int
+public fun </*0*/ T, /*1*/ U : T> kotlin.collections.List<@x T>.firstTyped(): U
+public fun @x A.foo(/*0*/ a: @x kotlin.Int): kotlin.Unit
+public fun </*0*/ T> @x kotlin.collections.List<@x T>.foo(/*0*/ l: kotlin.collections.List<@x T>): @x kotlin.collections.List<@x T>
 
 public final class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt b/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt
index 778a8df5168..51c0087fb3c 100644
--- a/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt
@@ -3,7 +3,7 @@ package
 public final class Bar</*0*/ T : kotlin.Annotation> {
     public constructor Bar</*0*/ T : kotlin.Annotation>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @[ERROR : Not an annotation: T]() /* annotation class not found */ public final fun foo(): kotlin.Int
+    @[ERROR : Not an annotation: T] /* annotation class not found */ public final fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,7 +11,7 @@ public final class Bar</*0*/ T : kotlin.Annotation> {
 public final class Foo</*0*/ T> {
     public constructor Foo</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @[ERROR : Not an annotation: T]() /* annotation class not found */ public final fun foo(): kotlin.Int
+    @[ERROR : Not an annotation: T] /* annotation class not found */ public final fun foo(): kotlin.Int
     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/annotations/unresolvedReferenceRange.txt b/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt
index eaebc04e480..9fba12786fd 100644
--- a/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt
+++ b/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt
@@ -1,34 +1,34 @@
 package
 
-@[ERROR : Ann]() /* annotation class not found */ public final class A {
+@[ERROR : Ann] /* annotation class not found */ public final class A {
     public constructor A()
     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
 }
 
-@[ERROR : Ann]() /* annotation class not found */ public final class B {
+@[ERROR : Ann] /* annotation class not found */ public final class B {
     public constructor B()
     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
 }
 
-@[ERROR : Ann]() /* annotation class not found */ public final class C {
+@[ERROR : Ann] /* annotation class not found */ public final class C {
     public constructor C()
     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
 }
 
-@[ERROR : kotlin.Ann]() /* annotation class not found */ public final class D {
+@[ERROR : kotlin.Ann] /* annotation class not found */ public final class D {
     public constructor D()
     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
 }
 
-@[ERROR : kotlin.annotation.Ann]() /* annotation class not found */ public final class E {
+@[ERROR : kotlin.annotation.Ann] /* annotation class not found */ public final class E {
     public constructor E()
     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/annotations/withUseSiteTarget/DelegateAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/DelegateAnnotations.txt
index 62a2ead5cc6..52548d9bb58 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/DelegateAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/DelegateAnnotations.txt
@@ -1,6 +1,6 @@
 package
 
-public fun foo(/*0*/ @delegate:Field() @delegate:Prop() x: kotlin.Int): kotlin.Int
+public fun foo(/*0*/ @delegate:Field @delegate:Prop x: kotlin.Int): kotlin.Int
 
 public final class CustomDelegate {
     public constructor CustomDelegate()
@@ -24,19 +24,19 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@delegate:Field() public final class SomeClass {
-    @delegate:Field() public constructor SomeClass()
-    @delegate:Field() @delegate:Prop() protected final val delegatedProperty: kotlin.String
-    @delegate:Field() @delegate:Prop() public final val propertyWithCustomGetter: kotlin.Int
-    @delegate:Field() @delegate:Prop() protected final val simpleProperty: kotlin.String = "text"
+@delegate:Field public final class SomeClass {
+    @delegate:Field public constructor SomeClass()
+    @delegate:Field @delegate:Prop protected final val delegatedProperty: kotlin.String
+    @delegate:Field @delegate:Prop public final val propertyWithCustomGetter: kotlin.Int
+    @delegate:Field @delegate:Prop protected final val simpleProperty: kotlin.String = "text"
     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 class WithPrimaryConstructor {
-    public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String, /*1*/ @param:Field() @param:Prop() b: kotlin.String)
-    @delegate:Field() @delegate:Prop() public final val a: kotlin.String
+    public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String, /*1*/ @param:Field @param:Prop b: kotlin.String)
+    @delegate:Field @delegate:Prop public final val a: kotlin.String
     public final val b: kotlin.String
     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/annotations/withUseSiteTarget/FieldAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt
index 778e76c9ac7..b2c2251d547 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt
@@ -15,13 +15,13 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@field:Ann() public final class SomeClass {
-    @field:Ann() public constructor SomeClass()
-    @field:Ann() protected final val delegatedProperty: kotlin.String
-    @field:Ann() public final val propertyWithCustomGetter: kotlin.Int
-    @field:Ann() protected final val simpleProperty: kotlin.String = "text"
-    @field:Ann() protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
-    @field:Ann() public final fun anotherFun(/*0*/ @field:Ann() s: kotlin.String): kotlin.Unit
+@field:Ann public final class SomeClass {
+    @field:Ann public constructor SomeClass()
+    @field:Ann protected final val delegatedProperty: kotlin.String
+    @field:Ann public final val propertyWithCustomGetter: kotlin.Int
+    @field:Ann protected final val simpleProperty: kotlin.String = "text"
+    @field:Ann protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
+    @field:Ann public final fun anotherFun(/*0*/ @field:Ann s: kotlin.String): kotlin.Unit
     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
@@ -29,7 +29,7 @@ public final class CustomDelegate {
 
 public final class WithPrimaryConstructor {
     public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String)
-    @field:Ann() public final val a: kotlin.String
+    @field:Ann public final val a: kotlin.String
     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/annotations/withUseSiteTarget/GetterAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
index a5281afd33c..b39b0cc952e 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
@@ -15,14 +15,14 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@get:Ann() public final class SomeClass {
-    @get:Ann() public constructor SomeClass()
+@get:Ann public final class SomeClass {
+    @get:Ann public constructor SomeClass()
     protected final val delegatedProperty: kotlin.String
     protected final var mutableProperty: kotlin.String
     public final val propertyWithCustomGetter: kotlin.Int
     protected final val simpleProperty: kotlin.String = "text"
     protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
-    @get:Ann() public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
+    @get:Ann public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
     public final fun anotherFun(): kotlin.Unit
     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/annotations/withUseSiteTarget/ParamAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt
index 031919de27b..3ca65733687 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt
@@ -8,7 +8,7 @@ public final annotation class Ann : kotlin.Annotation {
 }
 
 public final class PrimaryConstructorClass {
-    public constructor PrimaryConstructorClass(/*0*/ @param:Ann() a: kotlin.String, /*1*/ @param:Ann() @param:Second() b: kotlin.String, /*2*/ @param:Ann() c: kotlin.String)
+    public constructor PrimaryConstructorClass(/*0*/ @param:Ann a: kotlin.String, /*1*/ @param:Ann @param:Second b: kotlin.String, /*2*/ @param:Ann c: kotlin.String)
     public final val c: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -22,10 +22,10 @@ public final annotation class Second : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@param:Ann() public final class SomeClass {
-    @param:Ann() public constructor SomeClass(/*0*/ @param:Ann() a: kotlin.String)
-    @param:Ann() protected final val simpleProperty: kotlin.String = "text"
-    @param:Ann() public final fun anotherFun(): kotlin.Unit
+@param:Ann public final class SomeClass {
+    @param:Ann public constructor SomeClass(/*0*/ @param:Ann a: kotlin.String)
+    @param:Ann protected final val simpleProperty: kotlin.String = "text"
+    @param:Ann public final fun anotherFun(): kotlin.Unit
     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/annotations/withUseSiteTarget/PropertyAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt
index 8eba94d4378..21da3e069cd 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt
@@ -22,14 +22,14 @@ public final annotation class Second : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@property:Ann() public final class SomeClass {
-    @property:Ann() public constructor SomeClass(/*0*/ s: kotlin.String)
-    @property:Ann() protected final val p1: kotlin.String = ""
-    @property:Ann() @property:Second() protected final val p2: kotlin.String = ""
-    @property:Ann() protected final var p3: kotlin.String
-    @property:Ann() protected final val p4: kotlin.String
-    @property:Ann() public final var propertyWithCustomSetter: kotlin.Int
-    @property:Ann() public final fun anotherFun(): kotlin.Unit
+@property:Ann public final class SomeClass {
+    @property:Ann public constructor SomeClass(/*0*/ s: kotlin.String)
+    @property:Ann protected final val p1: kotlin.String = ""
+    @property:Ann @property:Second protected final val p2: kotlin.String = ""
+    @property:Ann protected final var p3: kotlin.String
+    @property:Ann protected final val p4: kotlin.String
+    @property:Ann public final var propertyWithCustomSetter: kotlin.Int
+    @property:Ann public final fun anotherFun(): kotlin.Unit
     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/annotations/withUseSiteTarget/ReceiverAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt
index e7c9d4658de..12356582c0b 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt
@@ -1,7 +1,7 @@
 package
 
-public val @receiver:Ann() kotlin.String.extensionProperty: kotlin.String
-public fun @receiver:Ann() kotlin.String.length2(): kotlin.Int
+public val @receiver:Ann kotlin.String.extensionProperty: kotlin.String
+public fun @receiver:Ann kotlin.String.length2(): kotlin.Int
 
 public final annotation class Ann : kotlin.Annotation {
     public constructor Ann()
@@ -10,11 +10,11 @@ public final annotation class Ann : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@receiver:Ann() public final class SomeClass {
-    @receiver:Ann() public constructor SomeClass(/*0*/ @receiver:Ann() a: kotlin.String)
-    @receiver:Ann() protected final val simpleProperty: kotlin.String = "text"
-    public final val @receiver:Ann() kotlin.String.extensionProperty2: kotlin.String
-    @receiver:Ann() public final fun anotherFun(): kotlin.Unit
+@receiver:Ann public final class SomeClass {
+    @receiver:Ann public constructor SomeClass(/*0*/ @receiver:Ann a: kotlin.String)
+    @receiver:Ann protected final val simpleProperty: kotlin.String = "text"
+    public final val @receiver:Ann kotlin.String.extensionProperty2: kotlin.String
+    @receiver:Ann public final fun anotherFun(): kotlin.Unit
     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/annotations/withUseSiteTarget/SetterAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
index 6b9979906a0..85fee30cfed 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
@@ -16,14 +16,14 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@set:Ann() public final class SomeClass {
+@set:Ann public final class SomeClass {
     public constructor SomeClass()
     protected final var delegatedProperty: kotlin.String
     protected final var mutableProperty: kotlin.String
     protected final var mutablePropertyWithAnnotationList: kotlin.String
     public final var propertyWithCustomSetter: kotlin.Int
-    @set:Ann() protected final val simpleProperty: kotlin.String = "text"
-    @set:Ann() public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
+    @set:Ann protected final val simpleProperty: kotlin.String = "text"
+    @set:Ann public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
     public final fun anotherFun(): kotlin.Unit
     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/annotations/withUseSiteTarget/SparamAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt
index f63e0a1008b..142b940d923 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt
@@ -16,14 +16,14 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@setparam:Ann() public final class SomeClass {
-    @setparam:Ann() public constructor SomeClass()
-    @setparam:Ann() protected final var delegatedProperty: kotlin.String
-    @setparam:Ann() protected final var mutableProperty: kotlin.String
-    @setparam:Ann() protected final var mutablePropertyWithAnnotationList: kotlin.String
-    @setparam:Ann() public final var propertyWithCustomSetter: kotlin.Int
-    @setparam:Ann() protected final val simpleProperty: kotlin.String = "text"
-    @setparam:Ann() public final fun anotherFun(): kotlin.Unit
+@setparam:Ann public final class SomeClass {
+    @setparam:Ann public constructor SomeClass()
+    @setparam:Ann protected final var delegatedProperty: kotlin.String
+    @setparam:Ann protected final var mutableProperty: kotlin.String
+    @setparam:Ann protected final var mutablePropertyWithAnnotationList: kotlin.String
+    @setparam:Ann public final var propertyWithCustomSetter: kotlin.Int
+    @setparam:Ann protected final val simpleProperty: kotlin.String = "text"
+    @setparam:Ann public final fun anotherFun(): kotlin.Unit
     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/annotations/withUseSiteTarget/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
index 2ca908781d6..20dddf85af8 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
@@ -1,16 +1,16 @@
 package
 
 public final class A {
-    public constructor A(/*0*/ @param:Ann() @Ann() x: kotlin.Int, /*1*/ @param:RepeatableAnn() @Ann() y: kotlin.Int)
-    @property:Ann() @RepeatableAnn() @property:RepeatableAnn() @field:Ann() public final val a: kotlin.Int = 0
-    @Ann() @property:Ann() @field:Ann() public final val b: kotlin.Int = 0
-    @field:RepeatableAnn() @field:RepeatableAnn() public final val c: kotlin.Int = 0
-    @property:RepeatableAnn() @RepeatableAnn() public final val d: kotlin.Int = 0
-    @property:RepeatableAnn() @RepeatableAnn() @delegate:RepeatableAnn() public final val e: kotlin.String
-    @property:Ann() @delegate:Ann() public final val f: kotlin.String
-    @Ann() @delegate:Ann() public final val g: kotlin.String
-    @Ann() @field:Ann() public final val h: kotlin.String = ""
-    @property:Ann() @field:Ann() public final val i: kotlin.String = ""
+    public constructor A(/*0*/ @param:Ann @Ann x: kotlin.Int, /*1*/ @param:RepeatableAnn @Ann y: kotlin.Int)
+    @property:Ann @RepeatableAnn @property:RepeatableAnn @field:Ann public final val a: kotlin.Int = 0
+    @Ann @property:Ann @field:Ann public final val b: kotlin.Int = 0
+    @field:RepeatableAnn @field:RepeatableAnn public final val c: kotlin.Int = 0
+    @property:RepeatableAnn @RepeatableAnn public final val d: kotlin.Int = 0
+    @property:RepeatableAnn @RepeatableAnn @delegate:RepeatableAnn public final val e: kotlin.String
+    @property:Ann @delegate:Ann public final val f: kotlin.String
+    @Ann @delegate:Ann public final val g: kotlin.String
+    @Ann @field:Ann public final val h: kotlin.String = ""
+    @property:Ann @field:Ann public final val i: kotlin.String = ""
     public final val x: kotlin.Int
     public final val y: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -33,7 +33,7 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class RepeatableAnn : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class RepeatableAnn : kotlin.Annotation {
     public constructor RepeatableAnn()
     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/coroutines/suspendApplicability.txt b/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.txt
index f50c3555f93..94877585f17 100644
--- a/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.txt
+++ b/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.txt
@@ -4,7 +4,7 @@ public suspend fun notMember(/*0*/ x: kotlin.coroutines.Continuation<kotlin.Int>
 public suspend fun Controller.correctExtension(/*0*/ x: kotlin.coroutines.Continuation<kotlin.Int>): kotlin.Unit
 public suspend fun kotlin.String.wrongExtension(/*0*/ x: kotlin.coroutines.Continuation<kotlin.Int>): kotlin.Unit
 
-@kotlin.coroutines.AllowSuspendExtensions() public final class Controller {
+@kotlin.coroutines.AllowSuspendExtensions public final class Controller {
     public constructor Controller()
     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/coroutines/suspendExtensionFunctions.txt b/compiler/testData/diagnostics/tests/coroutines/suspendExtensionFunctions.txt
index fc84664b62a..917b556fe31 100644
--- a/compiler/testData/diagnostics/tests/coroutines/suspendExtensionFunctions.txt
+++ b/compiler/testData/diagnostics/tests/coroutines/suspendExtensionFunctions.txt
@@ -10,7 +10,7 @@ public suspend fun Controller.severalParams(/*0*/ x: kotlin.String, /*1*/ y: kot
 public suspend fun kotlin.String.wrongReceiver(/*0*/ y: kotlin.Int, /*1*/ machine: kotlin.coroutines.Continuation<kotlin.Double>): kotlin.Unit
 public suspend fun Controller.yieldString(/*0*/ value: kotlin.String, /*1*/ c: kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
 
-@kotlin.coroutines.AllowSuspendExtensions() public final class Controller {
+@kotlin.coroutines.AllowSuspendExtensions public final class Controller {
     public constructor Controller()
     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/cyclicHierarchy/kotlinJavaNestedCycle.txt b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.txt
index a59c286048d..cb6886089d6 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.txt
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.txt
@@ -5,7 +5,7 @@ public interface ExceptionTracker {
 
 public/*package*/ open class LockBasedStorageManager {
     public/*package*/ constructor LockBasedStorageManager()
-    @java.lang.Override() public/*package*/ open fun foo(): kotlin.Unit
+    @java.lang.Override public/*package*/ open fun foo(): kotlin.Unit
 
     public/*package*/ interface ExceptionHandlingStrategy {
         public abstract fun bar(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
index 50de6fa4ab0..bf426b7f04a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
@@ -1,9 +1,9 @@
 package
 
-@a() public fun <no name provided>(): kotlin.Unit
+@a public fun <no name provided>(): kotlin.Unit
 public fun <no name provided>(): kotlin.Unit
 public fun outerFun(): kotlin.Unit
-public fun @a() A.<no name provided>(): kotlin.Unit
+public fun @a A.<no name provided>(): kotlin.Unit
 public fun A.<no name provided>(): kotlin.Unit
 
 public interface A {
@@ -20,12 +20,12 @@ public interface B {
 
 public final class Outer {
     public constructor Outer()
-    @a() public final fun <no name provided>(): kotlin.Unit
+    @a public final fun <no name provided>(): kotlin.Unit
     public final fun <no name provided>(): kotlin.Unit
     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 fun @a() A.<no name provided>(): kotlin.Unit
+    public final fun @a A.<no name provided>(): kotlin.Unit
     public final fun B.<no name provided>(): kotlin.Unit
 }
 
diff --git a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
index d8af81f365d..39439eb1fdd 100644
--- a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
@@ -1,6 +1,6 @@
 package
 
-@obsolete() public final class Obsolete {
+@obsolete public final class Obsolete {
     public constructor Obsolete()
     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/deprecated/javaDeprecated.txt b/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt
index 88e83ef9adf..b92751f84ad 100644
--- a/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt
@@ -10,7 +10,7 @@ package
 
 public final class B : A {
     public constructor B(/*0*/ foo: kotlin.String)
-    @property:kotlin.Deprecated() private final val foo: kotlin.String
+    @property:kotlin.Deprecated private final val foo: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun getFoo(/*0*/ text: kotlin.String): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/javaDeprecatedInheritance.txt b/compiler/testData/diagnostics/tests/deprecated/javaDeprecatedInheritance.txt
index 44977b88ee3..fe6fde705fb 100644
--- a/compiler/testData/diagnostics/tests/deprecated/javaDeprecatedInheritance.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/javaDeprecatedInheritance.txt
@@ -17,7 +17,7 @@ public open class A {
 public open class B : A {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun f(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ fun f(): kotlin.Unit
     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/evaluate/divisionByZero.txt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
index ec3df72eced..76bd7a68056 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
@@ -10,7 +10,7 @@ public val a7: kotlin.Int
 public val a8: kotlin.Int
 public val a9: kotlin.Int
 public val b1: kotlin.Byte
-@Ann() public val b2: kotlin.Int = 1
+@Ann public val b2: kotlin.Int = 1
 
 public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ i: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
index 489de746eb3..c7d443d1d2d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
@@ -7,6 +7,6 @@ public fun process(/*0*/ x: Predicate<kotlin.String>): kotlin.Unit
 public interface Predicate</*0*/ T : kotlin.CharSequence!> {
     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 abstract operator fun invoke(/*0*/ @org.jetbrains.annotations.NotNull() t: T): kotlin.Boolean
+    public abstract operator fun invoke(/*0*/ @org.jetbrains.annotations.NotNull t: T): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/unsafeVarianceStar.txt b/compiler/testData/diagnostics/tests/generics/projectionsScope/unsafeVarianceStar.txt
index ee021c9b089..a4e90c04d34 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/unsafeVarianceStar.txt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/unsafeVarianceStar.txt
@@ -4,7 +4,7 @@ public fun test(/*0*/ a: A<*>): kotlin.Unit
 
 public interface A</*0*/ out K> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ x: @kotlin.UnsafeVariance() K): kotlin.Unit
+    public abstract fun foo(/*0*/ x: @kotlin.UnsafeVariance K): kotlin.Unit
     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/generics/suppressVarianceConflict.txt b/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt
index f34ea65e020..a6dfce1c506 100644
--- a/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt
+++ b/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt
@@ -4,10 +4,10 @@ public fun foo(/*0*/ x: A<kotlin.String, kotlin.Any?>, /*1*/ cs: kotlin.CharSequ
 
 public final class A</*0*/ out T, /*1*/ in E> {
     public constructor A</*0*/ out T, /*1*/ in E>()
-    public final fun bar(): kotlin.collections.List<@kotlin.UnsafeVariance() E>
+    public final fun bar(): kotlin.collections.List<@kotlin.UnsafeVariance E>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T): kotlin.Unit
-    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T, /*1*/ y: kotlin.collections.List<@kotlin.UnsafeVariance() T>): @kotlin.UnsafeVariance() E
+    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance T): kotlin.Unit
+    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance T, /*1*/ y: kotlin.collections.List<@kotlin.UnsafeVariance T>): @kotlin.UnsafeVariance E
     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/classesInClassObjectHeader.txt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
index 3bd9c43cfdd..a8e9c72e763 100644
--- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
+++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
@@ -6,7 +6,7 @@ public final class Test {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @Test.InnerAnnotation() @Test.InnerAnnotation() public companion object Companion : Test.StaticClass, Test.InnerClass {
+    @Test.InnerAnnotation @Test.InnerAnnotation public companion object Companion : Test.StaticClass, Test.InnerClass {
         private constructor Companion()
         public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
index 5cfacf3b553..aaf99a9cd91 100644
--- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
+++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
@@ -6,7 +6,7 @@ public final class Test {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @[ERROR : ClassObjectAnnotation]() /* annotation class not found */ @Test.NestedAnnotation() public companion object Companion {
+    @[ERROR : ClassObjectAnnotation] /* annotation class not found */ @Test.NestedAnnotation public companion object Companion {
         private constructor Companion()
         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/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
index db09b44a0b0..36a7d15e23f 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
@@ -11,18 +11,18 @@ public open class A {
 
 public open class X</*0*/ T : kotlin.Any!> {
     public constructor X</*0*/ T : kotlin.Any!>()
-    public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull() a: T): kotlin.Unit
+    public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public/*package*/ open fun fooN(): T
+    @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public open class Y : X<kotlin.String!> {
     public constructor Y()
-    public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ @org.jetbrains.annotations.NotNull() a: kotlin.String): kotlin.Unit
+    public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): kotlin.String
+    @org.jetbrains.annotations.NotNull public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): kotlin.String
     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/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
index dd7b9c255d8..41e58c4393a 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
@@ -11,18 +11,18 @@ public open class A {
 
 public open class X</*0*/ T : kotlin.Any!> {
     public constructor X</*0*/ T : kotlin.Any!>()
-    public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull() a: T): kotlin.Unit
+    public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public/*package*/ open fun fooN(): T
+    @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public open class Y : X<A!> {
     public constructor Y()
-    public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ @org.jetbrains.annotations.NotNull() a: A): kotlin.Unit
+    public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: A): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): A
+    @org.jetbrains.annotations.NotNull public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): A
     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/j+k/annotationWithArgumentsMissingDependencies.txt b/compiler/testData/diagnostics/tests/j+k/annotationWithArgumentsMissingDependencies.txt
index d8c6700b56f..807261e07e3 100644
--- a/compiler/testData/diagnostics/tests/j+k/annotationWithArgumentsMissingDependencies.txt
+++ b/compiler/testData/diagnostics/tests/j+k/annotationWithArgumentsMissingDependencies.txt
@@ -2,10 +2,10 @@ package
 
 public fun main(): kotlin.Unit
 
-@missing.Ann() /* annotation class not found */ public open class A {
+@missing.Ann /* annotation class not found */ public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @missing.Ann() /* annotation class not found */ public open fun foo(): kotlin.String!
+    @missing.Ann /* annotation class not found */ public open fun foo(): kotlin.String!
     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/j+k/collectionOverrides/collectionStringImpl.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
index 42d7eeae391..146f79ede10 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
@@ -5,20 +5,20 @@ public fun test(/*0*/ x: CollectionStringImpl): kotlin.Unit
 public open class CollectionStringImpl : kotlin.collections.MutableCollection<kotlin.String!> {
     public constructor CollectionStringImpl()
     public open override /*1*/ val size: kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun clear(): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open operator fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun isEmpty(): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    @java.lang.Override() public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    @java.lang.Override public open override /*1*/ fun isEmpty(): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+    @java.lang.Override public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
index de205f9591f..0a4e517d0cd 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
@@ -5,95 +5,95 @@ public fun main(): kotlin.Unit
 public open class X : kotlin.collections.MutableList<kotlin.String!> {
     public constructor X()
     public open override /*1*/ val size: kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun clear(): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
+    @java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open operator fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
+    @java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun isEmpty(): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
+    @java.lang.Override public open override /*1*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    @java.lang.Override public open override /*1*/ fun isEmpty(): kotlin.Boolean
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
     public open fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open fun toArray(): kotlin.Array<(out) kotlin.Any!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
+    @java.lang.Override public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open fun toArray(): kotlin.Array<(out) kotlin.Any!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class Y : X {
     public constructor Y()
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class Y2 : X {
     public constructor Y2()
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
+    @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>
+    @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt b/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt
index f8e3bf0547c..22c68c59490 100644
--- a/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt
+++ b/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt
@@ -6,7 +6,7 @@ public fun concurrentMap(): kotlin.Unit
 
 public open class ConcHashMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : ConcMap<K!, V!> {
     public constructor ConcHashMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
-    @java.lang.Override() public/*package*/ open override /*1*/ fun computeIfAbsent(/*0*/ key: K!, /*1*/ mappingFunction: MyFunc<in K!, out V!>!): V!
+    @java.lang.Override public/*package*/ open override /*1*/ fun computeIfAbsent(/*0*/ key: K!, /*1*/ mappingFunction: MyFunc<in K!, out V!>!): V!
     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/j+k/javaStaticImport.txt b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt
index 7a5e7a12f5d..d0978d8d667 100644
--- a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt
+++ b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt
@@ -19,7 +19,7 @@ package backend {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            @org.jetbrains.annotations.NotNull() public open fun doSmth(/*0*/ s: kotlin.String!): kotlin.String
+            @org.jetbrains.annotations.NotNull public open fun doSmth(/*0*/ s: kotlin.String!): kotlin.String
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt b/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
index e6b1b322da8..c188c1d7554 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
@@ -4,18 +4,18 @@ public open class C : kotlin.CharSequence {
     public constructor C()
     public open override /*1*/ val length: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
+    @java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
-    @java.lang.Override() public open override /*1*/ fun toString(): kotlin.String
+    @java.lang.Override public open override /*1*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
+    @java.lang.Override public open override /*1*/ fun toString(): kotlin.String
 }
 
 public final class T : C {
     public constructor T()
     public open override /*1*/ /*fake_override*/ val length: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt b/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt
index f69f21d5053..0f706ef2d68 100644
--- a/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt
@@ -14,7 +14,7 @@ public interface A</*0*/ K : kotlin.Any!> {
 public open class B</*0*/ E : kotlin.Any!> : A<E!> {
     public constructor B</*0*/ E : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun foo(/*0*/ key: E!, /*1*/ f: MyFunc!): E!
+    @java.lang.Override public open override /*1*/ fun foo(/*0*/ key: E!, /*1*/ f: MyFunc!): E!
     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/j+k/primitiveOverrides/kt11140.txt b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/kt11140.txt
index 300490dcd06..02afc97d626 100644
--- a/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/kt11140.txt
+++ b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/kt11140.txt
@@ -40,7 +40,7 @@ public open class A : java.util.HashMap<kotlin.Int!, kotlin.Double!>, B<kotlin.I
     invisible_fake open override /*1*/ /*fake_override*/ fun newKeyIterator(): kotlin.collections.(Mutable)Iterator<kotlin.Int!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun newValueIterator(): kotlin.collections.(Mutable)Iterator<kotlin.Double!>!
     public open override /*1*/ fun put(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Double): kotlin.Double
-    @java.lang.Override() public open override /*2*/ fun put(/*0*/ key: kotlin.Int!, /*1*/ value: kotlin.Double!): kotlin.Double?
+    @java.lang.Override public open override /*2*/ fun put(/*0*/ key: kotlin.Int!, /*1*/ value: kotlin.Double!): kotlin.Double?
     public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map<out kotlin.Int!, kotlin.Double!>): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putAllForCreate(/*0*/ p0: (kotlin.collections.MutableMap<out kotlin.Int!, out kotlin.Double!>..kotlin.collections.Map<out kotlin.Int!, kotlin.Double!>?)): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putForCreate(/*0*/ p0: kotlin.Int!, /*1*/ p1: kotlin.Double!): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/notNullAnnotated.txt b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/notNullAnnotated.txt
index cc1dbdf050b..e4582b1f10d 100644
--- a/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/notNullAnnotated.txt
+++ b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/notNullAnnotated.txt
@@ -4,7 +4,7 @@ public fun foo(/*0*/ b: B): kotlin.Unit
 
 public open class A {
     public constructor A()
-    public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.Double): kotlin.Unit
+    public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.Double): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(/*0*/ x: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -14,9 +14,9 @@ public open class A {
 public open class B : A {
     public constructor B()
     public open fun bar(/*0*/ x: kotlin.Double): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.Double): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.Double): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.Int): kotlin.Unit
+    public open fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Int): kotlin.Unit
     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/j+k/primitiveOverrides/specializedMap.txt b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
index 2dd6f367098..807562d748a 100644
--- a/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
+++ b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
@@ -32,19 +32,19 @@ public open class SpecializedMap : AbstractSpecializedMap {
     public open override /*1*/ val keys: kotlin.collections.MutableSet<kotlin.Int!>
     public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ val values: kotlin.collections.MutableCollection<kotlin.Double!>
-    @java.lang.Override() public open override /*1*/ fun clear(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun containsKey(/*0*/ k: kotlin.Int): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ x: kotlin.Int!): kotlin.Boolean
     public open override /*1*/ fun containsValue(/*0*/ v: kotlin.Double): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ x: kotlin.Double!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun get(/*0*/ k: kotlin.Int): kotlin.Double
-    @java.lang.Override() public open override /*1*/ fun get(/*0*/ key: kotlin.Int!): kotlin.Double?
+    @java.lang.Override public open override /*1*/ fun get(/*0*/ key: kotlin.Int!): kotlin.Double?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun isEmpty(): kotlin.Boolean
+    @java.lang.Override public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun put(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Double): kotlin.Double
-    @java.lang.Override() public open override /*1*/ fun put(/*0*/ key: kotlin.Int!, /*1*/ value: kotlin.Double!): kotlin.Double?
-    @java.lang.Override() public open override /*1*/ fun putAll(/*0*/ from: kotlin.collections.Map<out kotlin.Int!, kotlin.Double!>): kotlin.Unit
+    @java.lang.Override public open override /*1*/ fun put(/*0*/ key: kotlin.Int!, /*1*/ value: kotlin.Double!): kotlin.Double?
+    @java.lang.Override public open override /*1*/ fun putAll(/*0*/ from: kotlin.collections.Map<out kotlin.Int!, kotlin.Double!>): kotlin.Unit
     public open override /*1*/ fun remove(/*0*/ k: kotlin.Int): kotlin.Double
     public open override /*1*/ fun remove(/*0*/ ok: kotlin.Int!): kotlin.Double?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt
index 55693c67856..070a6e409be 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt
@@ -6,7 +6,7 @@ public fun main(): kotlin.Unit
 
 public interface J {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String?): kotlin.String
+    @org.jetbrains.annotations.NotNull public abstract fun foo(/*0*/ @org.jetbrains.annotations.Nullable x: kotlin.String?): kotlin.String
     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/modifiers/IllegalModifiers.txt b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
index 103c0a4fbd8..f0c3bda5928 100644
--- a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
@@ -66,7 +66,7 @@ package illegal_modifiers {
     }
 
     public final class IllegalModifiers3 {
-        public constructor IllegalModifiers3(/*0*/ @illegal_modifiers.annotated() b: kotlin.String)
+        public constructor IllegalModifiers3(/*0*/ @illegal_modifiers.annotated b: kotlin.String)
         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
@@ -124,7 +124,7 @@ package illegal_modifiers {
     }
 
     public final class LegalModifier {
-        public constructor LegalModifier(/*0*/ a: kotlin.Int, /*1*/ @illegal_modifiers.annotated() b: kotlin.String, /*2*/ @illegal_modifiers.annotated() vararg v: kotlin.Int /*kotlin.IntArray*/)
+        public constructor LegalModifier(/*0*/ a: kotlin.Int, /*1*/ @illegal_modifiers.annotated b: kotlin.String, /*2*/ @illegal_modifiers.annotated vararg v: kotlin.Int /*kotlin.IntArray*/)
         public final val a: kotlin.Int
         private final var b: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt b/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt
index 64c9a82ba96..e5c74c52404 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt
@@ -2,7 +2,7 @@ package
 
 public val q: A
 @Ann(x = 1) public fun main1(): kotlin.Unit
-@Ann() public fun main2(): kotlin.Unit
+@Ann public fun main2(): kotlin.Unit
 @Ann(x = 3) public fun main3(): kotlin.Unit
 
 public open class A {
diff --git a/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeIn.txt b/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeIn.txt
index 2f7c2ee9bb1..667c5fdada5 100644
--- a/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeIn.txt
+++ b/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeIn.txt
@@ -19,14 +19,14 @@ public interface J1 {
 
 public interface J2 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract fun foo(): In<kotlin.String!>
+    @org.jetbrains.annotations.NotNull public abstract fun foo(): In<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface J3 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.Nullable() public abstract fun foo(): In<kotlin.String!>?
+    @org.jetbrains.annotations.Nullable public abstract fun foo(): In<kotlin.String!>?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -68,21 +68,21 @@ public interface TestJ1K2 : J1, K2 {
 
 public interface TestJ2K1 : J2, K1 {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract override /*2*/ /*fake_override*/ fun foo(): In<kotlin.String!>
+    @org.jetbrains.annotations.NotNull public abstract override /*2*/ /*fake_override*/ fun foo(): In<kotlin.String!>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface TestJ2K1K2 : J2, K1, K2 {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract override /*3*/ /*fake_override*/ fun foo(): In<kotlin.String!>
+    @org.jetbrains.annotations.NotNull public abstract override /*3*/ /*fake_override*/ fun foo(): In<kotlin.String!>
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface TestJ2K2 : J2, K2 {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract override /*2*/ /*fake_override*/ fun foo(): In<kotlin.String!>
+    @org.jetbrains.annotations.NotNull public abstract override /*2*/ /*fake_override*/ fun foo(): In<kotlin.String!>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -131,7 +131,7 @@ public interface TestK1J2 : K1, J2 {
 
 public interface TestK1J2K2 : K1, J2, K2 {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract override /*3*/ /*fake_override*/ fun foo(): In<kotlin.String!>
+    @org.jetbrains.annotations.NotNull public abstract override /*3*/ /*fake_override*/ fun foo(): In<kotlin.String!>
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt
index f15ad239136..fea5b822b67 100644
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt
+++ b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt
@@ -29,21 +29,21 @@ public interface KSuper {
 
 public/*package*/ interface Sub1 : KSuper, JSuper1, JSuper2 {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
+    @java.lang.Override public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public/*package*/ interface Sub2 : JSuper1, KSuper, JSuper2 {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
+    @java.lang.Override public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public/*package*/ interface Sub3 : JSuper1, JSuper2, KSuper {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
+    @java.lang.Override public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt b/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt
index f57fdd366e8..01e05c42aba 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt
@@ -12,7 +12,7 @@ public interface Base {
 public open class Derived : Base {
     public constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun </*0*/ V : kotlin.Any!> foo(): kotlin.Unit
+    @java.lang.Override public open override /*1*/ fun </*0*/ V : kotlin.Any!> foo(): kotlin.Unit
     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/platformTypes/noAnnotationInClassPath.txt b/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt
index bc1b522b3f0..1facb74e790 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt
@@ -5,7 +5,7 @@ public fun test(): kotlin.Unit
 
 public interface A</*0*/ T : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ @javax.annotation.Nullable() /* annotation class not found */ y: T?): kotlin.Boolean
+    public abstract fun foo(/*0*/ @javax.annotation.Nullable /* annotation class not found */ y: T?): 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/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt
index 700b5808e8e..20edb45650a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt
@@ -5,7 +5,7 @@ public fun test(): kotlin.Unit
 
 public interface A</*0*/ T : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: T): kotlin.Unit
+    public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T): kotlin.Unit
     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/platformTypes/notNullTypeParameter/methodTypeParameter.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt
index 9971c5dbe45..fa3821ed75a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt
@@ -9,6 +9,6 @@ public open class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public open fun </*0*/ T : kotlin.Any!> bar(/*0*/ @org.jetbrains.annotations.NotNull() x: T, /*1*/ y: T!): kotlin.Unit
+    public open fun </*0*/ T : kotlin.Any!> bar(/*0*/ @org.jetbrains.annotations.NotNull x: T, /*1*/ y: T!): kotlin.Unit
     public open fun platformString(): kotlin.String!
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt
index 86b3288122a..7390bd2d320 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt
@@ -4,7 +4,7 @@ public fun test(): kotlin.Unit
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.jetbrains.annotations.NotNull() public open fun bar(): T
+    @org.jetbrains.annotations.NotNull public open fun bar(): T
     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/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt
index 7b31cb3b406..2b47ef4e8a1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt
@@ -4,7 +4,7 @@ public fun test(): kotlin.Unit
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull() x: T): kotlin.Unit
+    public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T): kotlin.Unit
     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/platformTypes/notNullTypeParameter/onTypeProjection.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt
index a134dca259a..74ae9249cf5 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt
@@ -4,7 +4,7 @@ public fun test(/*0*/ a: A<out kotlin.CharSequence>): kotlin.Unit
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.jetbrains.annotations.NotNull() public open fun bar(): T
+    @org.jetbrains.annotations.NotNull public open fun bar(): T
     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/platformTypes/notNullTypeParameter/substitutionInSuperType.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt
index 85dc38a7cc5..56f090e8661 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt
@@ -4,7 +4,7 @@ public fun test(): kotlin.Unit
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull() x: T): kotlin.Unit
+    public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T): kotlin.Unit
     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
@@ -20,7 +20,7 @@ public open class B1 : A<kotlin.String!> {
 
 public open class B2 : A<kotlin.String!> {
     public constructor B2()
-    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String): kotlin.Unit
     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
@@ -36,7 +36,7 @@ public final class C1 : A<kotlin.String?> {
 
 public final class C2 : A<kotlin.String?> {
     public constructor C2()
-    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String): kotlin.Unit
     public open fun bar(/*0*/ x: kotlin.String?): kotlin.Unit
     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/platformTypes/nullabilityWarnings/arithmetic.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
index 3be10d0cd77..0ad4a60cb32 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.Int!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Int?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Int
+    @org.jetbrains.annotations.Nullable public final var staticN: kotlin.Int?
+    @org.jetbrains.annotations.NotNull public final var staticNN: kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
index 540df3f0a46..3603d77f565 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.Array<(out) kotlin.Int!>!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Array<(out) kotlin.Int!>?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Array<(out) kotlin.Int!>
+    @org.jetbrains.annotations.Nullable public final var staticN: kotlin.Array<(out) kotlin.Int!>?
+    @org.jetbrains.annotations.NotNull public final var staticNN: kotlin.Array<(out) kotlin.Int!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
index 84dc5c822fc..63a17a2826f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
index aefd3722ae8..9fbbcb93349 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.Boolean!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Boolean?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Boolean
+    @org.jetbrains.annotations.Nullable public final var staticN: kotlin.Boolean?
+    @org.jetbrains.annotations.NotNull public final var staticNN: kotlin.Boolean
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
index ac8a3c1dcd2..529d4a0a6e2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
@@ -10,6 +10,6 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
index c984bf02aa9..c33963afb31 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
index 0642bd71d9b..fba60f9d614 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
@@ -20,6 +20,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J.DP!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J.DP?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J.DP
+    @org.jetbrains.annotations.Nullable public final var staticN: J.DP?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J.DP
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
index aa175267871..783a2acd877 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
@@ -62,6 +62,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.collections.(Mutable)List<kotlin.String!>!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.collections.(Mutable)List<kotlin.String!>?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.collections.(Mutable)List<kotlin.String!>
+    @org.jetbrains.annotations.Nullable public final var staticN: kotlin.collections.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.NotNull public final var staticNN: kotlin.collections.(Mutable)List<kotlin.String!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
index f1fc3573b14..3cf1ffd5cf7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
index 0358dfbe9e2..9c01b38c3b9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
@@ -11,6 +11,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
index c984bf02aa9..c33963afb31 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
index c984bf02aa9..c33963afb31 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
index 0adc8cb4c8d..f99ecb9d316 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.collections.(Mutable)List<kotlin.String!>!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.collections.(Mutable)List<kotlin.String!>?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.collections.(Mutable)List<kotlin.String!>
+    @org.jetbrains.annotations.Nullable public final var staticN: kotlin.collections.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.NotNull public final var staticNN: kotlin.collections.(Mutable)List<kotlin.String!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
index 9010f60600c..08e38ec444c 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
index 7ab0124eef4..e67867ddd32 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
@@ -8,7 +8,7 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jetbrains.annotations.Nullable() public open fun n(): kotlin.collections.(Mutable)List<kotlin.String!>?
-    @org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String
+    @org.jetbrains.annotations.Nullable public open fun n(): kotlin.collections.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.NotNull public open fun nn(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
index c6bbd9e7644..44bf3c0d210 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
@@ -17,7 +17,7 @@ public open class J {
 
     // Static members
     public final var staticJ: J.Invoke!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J.Invoke?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J.Invoke
+    @org.jetbrains.annotations.Nullable public final var staticN: J.Invoke?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J.Invoke
     public final /*synthesized*/ fun Invoke(/*0*/ function: () -> kotlin.Unit): J.Invoke
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
index f7e6d9a4788..98e0f459a1b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
@@ -7,6 +7,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jetbrains.annotations.Nullable() public open fun method(): kotlin.String?
+    @org.jetbrains.annotations.Nullable public open fun method(): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
index edc3bb1401f..8662f30b560 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
@@ -18,6 +18,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J.Multi!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J.Multi?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J.Multi
+    @org.jetbrains.annotations.Nullable public final var staticN: J.Multi?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J.Multi
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
index 76f7330cb91..219edd2d71f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
@@ -6,6 +6,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String
+    @org.jetbrains.annotations.NotNull public open fun nn(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
index c984bf02aa9..c33963afb31 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
index 06031ea77c0..ae901ba31c0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
@@ -18,5 +18,5 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
index 2995f5dddd8..2bd852b9bc1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
@@ -6,6 +6,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jetbrains.annotations.Nullable() public open fun n(): kotlin.collections.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.Nullable public open fun n(): kotlin.collections.(Mutable)List<kotlin.String!>?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
index e19fc1f5645..5da5a601a16 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
@@ -4,18 +4,18 @@ public fun test(/*0*/ n: J?, /*1*/ nn: J): kotlin.Unit
 
 public open class J {
     public constructor J()
-    public constructor J(/*0*/ @org.jetbrains.annotations.NotNull() nn: J, /*1*/ @org.jetbrains.annotations.Nullable() n: J?, /*2*/ j: J!)
+    public constructor J(/*0*/ @org.jetbrains.annotations.NotNull nn: J, /*1*/ @org.jetbrains.annotations.Nullable n: J?, /*2*/ j: J!)
     public final var j: J!
-    @org.jetbrains.annotations.Nullable() public final var n: J?
-    @org.jetbrains.annotations.NotNull() public final var nn: J
+    @org.jetbrains.annotations.Nullable public final var n: J?
+    @org.jetbrains.annotations.NotNull public final var nn: J
     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 operator fun set(/*0*/ @org.jetbrains.annotations.NotNull() nn: J, /*1*/ @org.jetbrains.annotations.Nullable() n: J?, /*2*/ j: J!): kotlin.Unit
+    public open operator fun set(/*0*/ @org.jetbrains.annotations.NotNull nn: J, /*1*/ @org.jetbrains.annotations.Nullable n: J?, /*2*/ j: J!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
-    public open fun staticSet(/*0*/ @org.jetbrains.annotations.NotNull() nn: J, /*1*/ @org.jetbrains.annotations.Nullable() n: J?, /*2*/ j: J!): kotlin.Unit
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
+    public open fun staticSet(/*0*/ @org.jetbrains.annotations.NotNull nn: J, /*1*/ @org.jetbrains.annotations.Nullable n: J?, /*2*/ j: J!): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
index a288440295c..2778bac8cc9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.IntArray!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.IntArray?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.IntArray
+    @org.jetbrains.annotations.Nullable public final var staticN: kotlin.IntArray?
+    @org.jetbrains.annotations.NotNull public final var staticNN: kotlin.IntArray
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
index 0358dfbe9e2..9c01b38c3b9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
@@ -11,6 +11,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
index c984bf02aa9..c33963afb31 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
index c984bf02aa9..c33963afb31 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
index 2d1f56a085a..0bca58af57d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: java.lang.Exception!
-    @org.jetbrains.annotations.Nullable() public final var staticN: java.lang.Exception?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: java.lang.Exception
+    @org.jetbrains.annotations.Nullable public final var staticN: java.lang.Exception?
+    @org.jetbrains.annotations.NotNull public final var staticNN: java.lang.Exception
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
index 06031ea77c0..ae901ba31c0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
@@ -18,5 +18,5 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @org.jetbrains.annotations.NotNull() public final var staticNN: J
+    @org.jetbrains.annotations.NotNull public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisRightIsNull.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisRightIsNull.txt
index 0c664b0edb8..8d277bd6258 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisRightIsNull.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisRightIsNull.txt
@@ -10,5 +10,5 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @org.jetbrains.annotations.Nullable() public final var staticN: J?
+    @org.jetbrains.annotations.Nullable public final var staticN: J?
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt b/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt
index a6665c1418b..90ebfea7a0f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt
@@ -11,7 +11,7 @@ public interface A</*0*/ T : kotlin.Any!> {
 
 public interface B : A<(raw) kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public abstract override /*1*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override public abstract override /*1*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -26,7 +26,7 @@ public abstract class C {
 
 public open class D : C {
     public constructor D()
-    @java.lang.Override() public open override /*1*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override public open override /*1*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     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
@@ -45,14 +45,14 @@ public final class E2 : B {
     public constructor E2()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.collections.List<kotlin.String?>): kotlin.String
-    @java.lang.Override() public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class F : D {
     public constructor F()
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override public open override /*1*/ /*fake_override*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     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/platformTypes/rawTypes/rawEnhancment.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawEnhancment.txt
index 90a417fae18..fb54573b5da 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawEnhancment.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawEnhancment.txt
@@ -3,7 +3,7 @@ package
 public open class B : X {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public/*package*/ open override /*1*/ fun foo(/*0*/ l: kotlin.collections.MutableList<(raw) kotlin.Any?>): kotlin.collections.List<(raw) kotlin.Any?>?
+    @java.lang.Override public/*package*/ open override /*1*/ fun foo(/*0*/ l: kotlin.collections.MutableList<(raw) kotlin.Any?>): kotlin.collections.List<(raw) kotlin.Any?>?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,7 +11,7 @@ public open class B : X {
 internal final class C : B {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.MutableList<(raw) kotlin.Any?>): kotlin.collections.List<(raw) kotlin.Any?>?
+    @java.lang.Override public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.MutableList<(raw) kotlin.Any?>): kotlin.collections.List<(raw) kotlin.Any?>?
     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/platformTypes/rawTypes/typeEnhancement.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt
index 11f7508fe05..24448c48475 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt
@@ -6,7 +6,7 @@ public fun main(): kotlin.Unit
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: T, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.collections.(Mutable)List<kotlin.String!>?): kotlin.collections.(Mutable)List<kotlin.String!>
+    @org.jetbrains.annotations.NotNull public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.collections.(Mutable)List<kotlin.String!>?): kotlin.collections.(Mutable)List<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -20,7 +20,7 @@ public/*package*/ open class Test {
     public/*package*/ open class DerivedRawA : A<(raw) kotlin.Any!> {
         public/*package*/ constructor DerivedRawA()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.Any, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>?): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>
+        @org.jetbrains.annotations.NotNull public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.Any, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>?): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>
         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/platformTypes/typeEnhancement/overriddenExtensions.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt
index a89416aa028..87653c5786a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt
@@ -14,8 +14,8 @@ public/*package*/ open class B : A {
     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
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
+    @java.lang.Override public/*package*/ open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
+    @java.lang.Override public/*package*/ open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
 }
 
 public open class B1 : A {
@@ -23,8 +23,8 @@ public open class B1 : A {
     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
-    @java.lang.Override() public open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
-    @java.lang.Override() public open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
+    @java.lang.Override public open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
+    @java.lang.Override public open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
 }
 
 public/*package*/ open class C : A {
@@ -32,8 +32,8 @@ public/*package*/ open class C : A {
     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
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String!.bar(/*0*/ @org.jetbrains.annotations.Nullable() y: kotlin.String!): kotlin.Int
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String!.foo(/*0*/ @org.jetbrains.annotations.NotNull() y: kotlin.String!): kotlin.Int
+    @java.lang.Override public/*package*/ open override /*1*/ fun kotlin.String!.bar(/*0*/ @org.jetbrains.annotations.Nullable y: kotlin.String!): kotlin.Int
+    @java.lang.Override public/*package*/ open override /*1*/ fun kotlin.String!.foo(/*0*/ @org.jetbrains.annotations.NotNull y: kotlin.String!): kotlin.Int
 }
 
 public/*package*/ open class D : B {
@@ -41,8 +41,8 @@ public/*package*/ open class D : B {
     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
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String!.bar(/*0*/ @org.jetbrains.annotations.NotNull() y: kotlin.String): kotlin.Int
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String!.foo(/*0*/ @org.jetbrains.annotations.Nullable() y: kotlin.String?): kotlin.Int
+    @java.lang.Override public/*package*/ open override /*1*/ fun kotlin.String!.bar(/*0*/ @org.jetbrains.annotations.NotNull y: kotlin.String): kotlin.Int
+    @java.lang.Override public/*package*/ open override /*1*/ fun kotlin.String!.foo(/*0*/ @org.jetbrains.annotations.Nullable y: kotlin.String?): kotlin.Int
 }
 
 public final class E : B1 {
diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt
index a34199dac09..6bd79c85f16 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt
@@ -7,49 +7,49 @@ public /*synthesized*/ fun B3(/*0*/ function: (x: kotlin.String!, y: kotlin.Stri
 
 public interface A</*0*/ T : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: T, /*1*/ @org.jetbrains.annotations.Nullable() y: T?): kotlin.Unit
+    public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T, /*1*/ @org.jetbrains.annotations.Nullable y: T?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B1 : A<kotlin.String!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B2 : A<kotlin.String!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B3 : A<kotlin.String!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String!, /*1*/ @org.jetbrains.annotations.NotNull() y: kotlin.String!): kotlin.Unit
+    public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable x: kotlin.String!, /*1*/ @org.jetbrains.annotations.NotNull y: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface C1 : A<kotlin.String> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface C2 : A<kotlin.String?> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface C3 : B1 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.String?): kotlin.Unit
     public abstract fun foo(/*0*/ x: kotlin.String?, /*1*/ y: kotlin.String?): kotlin.Unit
     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/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt
index 3eb7a2793b7..a4d2ccb0a69 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt
@@ -5,14 +5,14 @@ public /*synthesized*/ fun B(/*0*/ function: (x: kotlin.String) -> kotlin.Unit):
 
 public interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String?): kotlin.Unit
+    public abstract fun foo(/*0*/ @org.jetbrains.annotations.Nullable x: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String): kotlin.Unit
+    public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -21,7 +21,7 @@ public final class C1 : A, B {
     public constructor C1()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(/*0*/ x: kotlin.String): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable x: kotlin.String?): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -29,7 +29,7 @@ public final class C1 : A, B {
 public final class C2 : A, B {
     public constructor C2()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String): kotlin.Unit
     public open override /*1*/ fun foo(/*0*/ x: kotlin.String?): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
@@ -39,7 +39,7 @@ public final class C3 : I {
     public constructor C3()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(/*0*/ x: kotlin.String): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable x: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -47,7 +47,7 @@ public final class C3 : I {
 public final class C4 : I {
     public constructor C4()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String): kotlin.Unit
     public open override /*1*/ fun foo(/*0*/ x: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -55,8 +55,8 @@ public final class C4 : I {
 
 public interface I : A, B {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.String): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String?): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: kotlin.String): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.Nullable x: kotlin.String?): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentReturnNullability.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentReturnNullability.txt
index bed63d30087..9d949d620f1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentReturnNullability.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentReturnNullability.txt
@@ -5,14 +5,14 @@ public /*synthesized*/ fun B(/*0*/ function: () -> kotlin.String): B
 
 public interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.Nullable() public abstract fun foo(): kotlin.String?
+    @org.jetbrains.annotations.Nullable public abstract fun foo(): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.String
+    @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -51,7 +51,7 @@ public final class C4 : I {
 
 public interface I : A, B {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String
+    @org.jetbrains.annotations.NotNull public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea65509.txt b/compiler/testData/diagnostics/tests/regressions/ea65509.txt
index 49cd925289b..f7d4208e150 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea65509.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea65509.txt
@@ -2,7 +2,7 @@ package
 
 public final class ClassB {
     public constructor ClassB()
-    @[ERROR : ClassA]() /* annotation class not found */ public final fun <no name provided>(): kotlin.Unit
+    @[ERROR : ClassA] /* annotation class not found */ public final fun <no name provided>(): kotlin.Unit
     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/regressions/kt1639-JFrame.txt b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
index da2eed3de41..cd5d2c7fd79 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
@@ -293,10 +293,10 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ fun getFocusTraversalKeys_NoIDCheck(/*0*/ p0: kotlin.Int): kotlin.collections.(Mutable)Set<(raw) kotlin.Any?>!
         public open override /*1*/ /*fake_override*/ fun getFocusTraversalPolicy(): java.awt.FocusTraversalPolicy!
         public open override /*1*/ /*fake_override*/ fun getFocusableWindowState(): kotlin.Boolean
-        @java.beans.Transient() /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun getFont(): java.awt.Font!
+        @java.beans.Transient /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun getFont(): java.awt.Font!
         public open override /*1*/ /*fake_override*/ fun getFontMetrics(/*0*/ p0: java.awt.Font!): java.awt.FontMetrics!
         invisible_fake final override /*1*/ /*fake_override*/ fun getFont_NoClientCode(): java.awt.Font!
-        @java.beans.Transient() /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun getForeground(): java.awt.Color!
+        @java.beans.Transient /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun getForeground(): java.awt.Color!
         public open override /*1*/ /*fake_override*/ fun getGlassPane(): java.awt.Component!
         public open override /*1*/ /*fake_override*/ fun getGraphics(): java.awt.Graphics!
         public open override /*1*/ /*fake_override*/ fun getGraphicsConfiguration(): java.awt.GraphicsConfiguration!
@@ -450,7 +450,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun isUndecorated(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun isValid(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun isValidateRoot(): kotlin.Boolean
-        @java.beans.Transient() /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun isVisible(): kotlin.Boolean
+        @java.beans.Transient /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun isVisible(): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun isVisible_NoClientCode(): kotlin.Boolean
         @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyDown(/*0*/ p0: java.awt.Event!, /*1*/ p1: kotlin.Int): kotlin.Boolean
         @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyUp(/*0*/ p0: java.awt.Event!, /*1*/ p1: kotlin.Int): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt
index 3faf2ed057e..72a4a246045 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt
+++ b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt
@@ -3,7 +3,7 @@ package
 public fun </*0*/ T> bar(/*0*/ block: (T) -> kotlin.Int): kotlin.Unit
 public fun foo(): kotlin.Unit
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class Ann : kotlin.Annotation {
     public constructor Ann()
     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/scopes/classHeader/annotationOnClass.txt b/compiler/testData/diagnostics/tests/scopes/classHeader/annotationOnClass.txt
index 0744f170b29..1f23392b6dd 100644
--- a/compiler/testData/diagnostics/tests/scopes/classHeader/annotationOnClass.txt
+++ b/compiler/testData/diagnostics/tests/scopes/classHeader/annotationOnClass.txt
@@ -1,6 +1,6 @@
 package
 
-@Ann() public final class A {
+@Ann public final class A {
     public constructor A()
     public final val a: kotlin.Int = 1
     public final fun b(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt
index 663d5c166a9..5cf1cc0bf0f 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt
@@ -1,8 +1,8 @@
 package
 
 public final class A {
-    @Ann1() public constructor A()
-    @Ann2() public constructor A(/*0*/ x1: kotlin.Int)
+    @Ann1 public constructor A()
+    @Ann2 public constructor A(/*0*/ x1: kotlin.Int)
     @Ann2(x = 2) public constructor A(/*0*/ x1: kotlin.Int, /*1*/ x2: kotlin.Int)
     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/smartCasts/elvisExclExclPlatform.txt b/compiler/testData/diagnostics/tests/smartCasts/elvisExclExclPlatform.txt
index 03a70bdffd8..f614f2d8eb6 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisExclExclPlatform.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisExclExclPlatform.txt
@@ -11,6 +11,6 @@ package p {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @org.jetbrains.annotations.Nullable() public/*package*/ open fun create(): kotlin.String?
+        @org.jetbrains.annotations.Nullable public/*package*/ open fun create(): kotlin.String?
     }
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeAnnotation.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeAnnotation.txt
index 5f29849f461..15a45558f3b 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeAnnotation.txt
@@ -5,7 +5,7 @@ public fun foo(/*0*/ javaClass: JavaClass): kotlin.Unit
 public open class JavaClass {
     public constructor JavaClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.Nullable() public open fun getSomething(): kotlin.String?
+    @org.jetbrains.annotations.Nullable public open fun getSomething(): kotlin.String?
     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/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt
index 24871cb0da7..e2b868b97bc 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt
@@ -4,7 +4,7 @@ public /*synthesized*/ fun JavaInterface(/*0*/ function: (s: kotlin.String, runn
 public fun foo(/*0*/ javaInterface: JavaInterface): kotlin.Unit
 
 public interface JavaInterface {
-    public abstract fun doIt(/*0*/ @org.jetbrains.annotations.NotNull() s: kotlin.String, /*1*/ @org.jetbrains.annotations.NotNull() runnable: java.lang.Runnable): kotlin.Unit
+    public abstract fun doIt(/*0*/ @org.jetbrains.annotations.NotNull s: kotlin.String, /*1*/ @org.jetbrains.annotations.NotNull runnable: java.lang.Runnable): kotlin.Unit
     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/syntheticExtensions/samAdapters/ReturnTypeAnnotation.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ReturnTypeAnnotation.txt
index 692c45183e5..a79b8a83192 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ReturnTypeAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ReturnTypeAnnotation.txt
@@ -4,7 +4,7 @@ public /*synthesized*/ fun </*0*/ T : kotlin.Any!> Provider(/*0*/ function: () -
 public fun foo(/*0*/ javaInterface: JavaInterface): kotlin.Unit
 
 public interface JavaInterface {
-    @org.jetbrains.annotations.Nullable() public abstract fun </*0*/ T : kotlin.Any!> compute(/*0*/ @org.jetbrains.annotations.NotNull() provider: Provider<T!>): kotlin.String?
+    @org.jetbrains.annotations.Nullable public abstract fun </*0*/ T : kotlin.Any!> compute(/*0*/ @org.jetbrains.annotations.NotNull provider: Provider<T!>): kotlin.String?
     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/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
index 8d20256a12b..78e33092876 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
@@ -19,7 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @org.jetbrains.annotations.NotNull() public open fun create(): J
+    @org.jetbrains.annotations.NotNull public open fun create(): J
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.txt b/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.txt
index 9be181812d1..5a26d8c56e4 100644
--- a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.txt
+++ b/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.txt
@@ -1,13 +1,13 @@
 package
 
-@RepeatableAnnotation() @RepeatableAnnotation() public final class My {
+@RepeatableAnnotation @RepeatableAnnotation public final class My {
     public constructor My()
     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
 }
 
-@kotlin.annotation.Repeatable() public final annotation class RepeatableAnnotation : kotlin.Annotation {
+@kotlin.annotation.Repeatable public final annotation class RepeatableAnnotation : kotlin.Annotation {
     public constructor RepeatableAnnotation()
     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/testsWithJava8/annotations/javaRepeatableRetention.txt b/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.txt
index e6870cdb701..bbb78584696 100644
--- a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.txt
+++ b/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.txt
@@ -1,13 +1,13 @@
 package
 
-@RepeatableAnnotation() @RepeatableAnnotation() public final class My {
+@RepeatableAnnotation @RepeatableAnnotation public final class My {
     public constructor My()
     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
 }
 
-@kotlin.annotation.Repeatable() @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RepeatableAnnotation : kotlin.Annotation {
+@kotlin.annotation.Repeatable @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RepeatableAnnotation : kotlin.Annotation {
     public constructor RepeatableAnnotation()
     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/testsWithJava8/annotations/javaUnrepeatable.txt b/compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.txt
index 651ff45d8bb..bb2fa91f946 100644
--- a/compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.txt
+++ b/compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.txt
@@ -1,6 +1,6 @@
 package
 
-@UnrepeatableAnnotation() @UnrepeatableAnnotation() public final class My {
+@UnrepeatableAnnotation @UnrepeatableAnnotation public final class My {
     public constructor My()
     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/testsWithJava8/targetedBuiltIns/getOrDefault.txt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.txt
index 912beb5211c..bfb36f35c8b 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.txt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.txt
@@ -13,7 +13,7 @@ public abstract class A : kotlin.collections.Map<kotlin.Int, kotlin.String> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in kotlin.Int!, in kotlin.String!>!): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.Int): kotlin.String?
-    @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.Int, /*1*/ defaultValue: kotlin.String): kotlin.String
+    @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.Int, /*1*/ defaultValue: kotlin.String): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.txt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.txt
index fb646b86bb9..92d1e598ab0 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.txt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.txt
@@ -20,7 +20,7 @@ public final class KotlinMap1</*0*/ K, /*1*/ V> : java.util.AbstractMap<K, V> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in K!, in V!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V?
-    @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V!
+    @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V!, /*2*/ p2: java.util.function.BiFunction<in V!, in V!, out V!>!): V!
@@ -53,7 +53,7 @@ public final class KotlinMap2 : java.util.AbstractMap<kotlin.String, kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in kotlin.String!, in kotlin.Int!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String!): kotlin.Int?
-    @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
+    @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: java.util.function.BiFunction<in kotlin.Int!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Int!
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
index f17eb972964..13ed6396944 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
@@ -1,40 +1,40 @@
 package
 
-@kotlin.js.native() public final class A {
+@kotlin.js.native public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-    @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+    @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+    @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-        @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+        @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+        @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+        @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
 
-@kotlin.js.native() public final class B {
+@kotlin.js.native public final class B {
     public constructor B()
-    @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+    @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
     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 companion object Companion {
         private constructor Companion()
-        @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+        @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
         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
 
-        @kotlin.js.nativeGetter() public object Obj2 {
+        @kotlin.js.nativeGetter public object Obj2 {
             private constructor Obj2()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -42,7 +42,7 @@ package
         }
     }
 
-    @kotlin.js.nativeGetter() public object Obj1 {
+    @kotlin.js.nativeGetter public object Obj1 {
         private constructor Obj1()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -50,27 +50,27 @@ package
     }
 }
 
-@kotlin.js.native() public final class C {
+@kotlin.js.native public final class C {
     public constructor C()
-    @kotlin.js.nativeGetter() public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
-    @kotlin.js.nativeGetter() public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
+    @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
+    @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
-    @kotlin.js.nativeGetter() public final fun get(): kotlin.Any?
-    @kotlin.js.nativeGetter() public final fun get(/*0*/ a: A): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
+    @kotlin.js.nativeGetter public final fun get(): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun get(/*0*/ a: A): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-    @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-    @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+    @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+    @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+    @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
 
     public companion object Companion {
         private constructor Companion()
         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
-        @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-        @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-        @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+        @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+        @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+        @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
index 0a6d3f49b7a..5397f42fe1d 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.js.native() public final class A {
+@kotlin.js.native public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,38 +16,38 @@ package
         public final class A {
             public constructor A()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-            @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+            @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+            @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             public companion object Companion {
                 private constructor Companion()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-                @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+                @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+                @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+                @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
             }
         }
 
         public final class B {
             public constructor B()
-            @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+            @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
             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 companion object Companion {
                 private constructor Companion()
-                @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+                @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
                 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
 
-                @kotlin.js.nativeGetter() public object Obj2 {
+                @kotlin.js.nativeGetter public object Obj2 {
                     private constructor Obj2()
                     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -55,7 +55,7 @@ package
                 }
             }
 
-            @kotlin.js.nativeGetter() public object Obj1 {
+            @kotlin.js.nativeGetter public object Obj1 {
                 private constructor Obj1()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -65,32 +65,32 @@ package
 
         public final class C {
             public constructor C()
-            @kotlin.js.nativeGetter() public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
-            @kotlin.js.nativeGetter() public final fun baz(/*0*/ a: kotlin.Number = ...): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.Number = ...): kotlin.Int?
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeGetter() public final fun get(): kotlin.Any?
-            @kotlin.js.nativeGetter() public final fun get(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeGetter public final fun get(): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun get(/*0*/ a: A.B.A): kotlin.Any?
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
         }
 
         public object obj {
             private constructor obj()
-            @kotlin.js.nativeGetter() public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
-            @kotlin.js.nativeGetter() public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeGetter() public final fun get(): kotlin.Any?
-            @kotlin.js.nativeGetter() public final fun get(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeGetter public final fun get(): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun get(/*0*/ a: A.B.A): kotlin.Any?
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
         }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt
index 25ec691efa2..fbb13415db0 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt
@@ -16,44 +16,44 @@ public final class A {
         public final class A {
             public constructor A()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-            @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+            @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+            @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             public companion object Companion {
                 private constructor Companion()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-                @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+                @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+                @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+                @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
             }
         }
 
         public final class B {
             public constructor B()
-            @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+            @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
             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
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-            @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+            @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
 
             public companion object Companion {
                 private constructor Companion()
-                @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+                @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
                 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
-                @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-                @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-                @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+                @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+                @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+                @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
 
-                @kotlin.js.nativeGetter() public object Obj2 {
+                @kotlin.js.nativeGetter public object Obj2 {
                     private constructor Obj2()
                     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -61,7 +61,7 @@ public final class A {
                 }
             }
 
-            @kotlin.js.nativeGetter() public object Obj1 {
+            @kotlin.js.nativeGetter public object Obj1 {
                 private constructor Obj1()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -71,24 +71,24 @@ public final class A {
 
         public final class C {
             public constructor C()
-            @kotlin.js.nativeGetter() public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
-            @kotlin.js.nativeGetter() public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeGetter() public final fun get(): kotlin.Any?
-            @kotlin.js.nativeGetter() public final fun get(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeGetter public final fun get(): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun get(/*0*/ a: A.B.A): kotlin.Any?
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
         public object obj {
             private constructor obj()
-            @kotlin.js.nativeGetter() public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
-            @kotlin.js.nativeGetter() public final fun baz(/*0*/ a: kotlin.Double = ...): kotlin.Int?
+            @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.Double = ...): kotlin.Int?
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeGetter() public final fun get(): kotlin.Any?
-            @kotlin.js.nativeGetter() public final fun get(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeGetter public final fun get(): kotlin.Any?
+            @kotlin.js.nativeGetter public final fun get(/*0*/ a: A.B.A): kotlin.Any?
             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/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt
index 36a09a8c060..04cfcd9a1a9 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt
@@ -3,38 +3,38 @@ package
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-    @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+    @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+    @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
-        @kotlin.js.nativeGetter() public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
+        @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
+        @kotlin.js.nativeGetter public final fun get(/*0*/ a: kotlin.String): kotlin.Any?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeGetter() public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
+        @kotlin.js.nativeGetter public final fun take(/*0*/ a: kotlin.Number): kotlin.String?
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
 
 public final class B {
     public constructor B()
-    @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+    @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
     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 companion object Companion {
         private constructor Companion()
-        @kotlin.js.nativeGetter() public final val foo: kotlin.Int = 0
+        @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
         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
 
-        @kotlin.js.nativeGetter() public object Obj2 {
+        @kotlin.js.nativeGetter public object Obj2 {
             private constructor Obj2()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -42,7 +42,7 @@ public final class B {
         }
     }
 
-    @kotlin.js.nativeGetter() public object Obj1 {
+    @kotlin.js.nativeGetter public object Obj1 {
         private constructor Obj1()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,15 +52,15 @@ public final class B {
 
 public final class C {
     public constructor C()
-    @kotlin.js.nativeGetter() public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
-    @kotlin.js.nativeGetter() public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
+    @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
+    @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeGetter() public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
-    @kotlin.js.nativeGetter() public final fun get(): kotlin.Any?
-    @kotlin.js.nativeGetter() public final fun get(/*0*/ a: A): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
+    @kotlin.js.nativeGetter public final fun get(): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun get(/*0*/ a: A): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.js.nativeGetter() public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-    @kotlin.js.nativeGetter() public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-    @kotlin.js.nativeGetter() public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+    @kotlin.js.nativeGetter public final fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+    @kotlin.js.nativeGetter public final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+    @kotlin.js.nativeGetter public final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.txt
index 002afae5094..20b82ecba2b 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.js.nativeGetter() public fun kotlin.Int.baz(/*0*/ a: kotlin.Int = ...): kotlin.String?
-@kotlin.js.nativeGetter() public fun kotlin.Int.get(/*0*/ a: kotlin.Any): kotlin.Int?
-@kotlin.js.nativeGetter() public fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
-@kotlin.js.nativeGetter() public fun kotlin.Int.get2(): kotlin.String?
-@kotlin.js.nativeGetter() public fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
-@kotlin.js.nativeGetter() public fun kotlin.Int.get3(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.Any?): kotlin.String?
-@kotlin.js.nativeGetter() public fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
+@kotlin.js.nativeGetter public fun kotlin.Int.baz(/*0*/ a: kotlin.Int = ...): kotlin.String?
+@kotlin.js.nativeGetter public fun kotlin.Int.get(/*0*/ a: kotlin.Any): kotlin.Int?
+@kotlin.js.nativeGetter public fun kotlin.Int.get(/*0*/ a: kotlin.String): kotlin.Int?
+@kotlin.js.nativeGetter public fun kotlin.Int.get2(): kotlin.String?
+@kotlin.js.nativeGetter public fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
+@kotlin.js.nativeGetter public fun kotlin.Int.get3(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.Any?): kotlin.String?
+@kotlin.js.nativeGetter public fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.txt
index a116260e563..ac9aee08e48 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.js.nativeGetter() public val toplevelVal: kotlin.Int = 0
-@kotlin.js.nativeGetter() public fun toplevelFun(): kotlin.Any
+@kotlin.js.nativeGetter public val toplevelVal: kotlin.Int = 0
+@kotlin.js.nativeGetter public fun toplevelFun(): kotlin.Any
 
-@kotlin.js.nativeGetter() public final class Foo {
+@kotlin.js.nativeGetter public final class Foo {
     public constructor Foo()
     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/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
index 8d58c6f95f6..3891b8405d3 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
@@ -1,28 +1,28 @@
 package
 
-@kotlin.js.native() public final class A {
+@kotlin.js.native public final class A {
     public constructor A()
-    @kotlin.js.nativeInvoke() public final val foo: kotlin.Int = 0
+    @kotlin.js.nativeInvoke public final val foo: kotlin.Int = 0
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+    @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+    @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-    @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+    @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+    @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.js.nativeInvoke() public final val foo: kotlin.Int = 0
+        @kotlin.js.nativeInvoke public final val foo: kotlin.Int = 0
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+        @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+        @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-        @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+        @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+        @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
 
-        @kotlin.js.nativeInvoke() public object Obj2 {
+        @kotlin.js.nativeInvoke public object Obj2 {
             private constructor Obj2()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -30,7 +30,7 @@ package
         }
     }
 
-    @kotlin.js.nativeInvoke() public object Obj1 {
+    @kotlin.js.nativeInvoke public object Obj1 {
         private constructor Obj1()
         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/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
index 8ea15f28e4a..4123cc2f42a 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.js.native() public final class A {
+@kotlin.js.native public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,32 +16,32 @@ package
         public final class C {
             public constructor C()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+            @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+            @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
         }
 
         public companion object Companion {
             private constructor Companion()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+            @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
         public object obj {
             private constructor obj()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+            @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+            @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
         }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt
index f4e2c9439fb..efe4dcd6eb0 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt
@@ -16,29 +16,29 @@ public final class A {
         public final class C {
             public constructor C()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+            @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+            @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
         }
 
         public companion object Companion {
             private constructor Companion()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+            @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
         public object obj {
             private constructor obj()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+            @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+            @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt
index c01a4b9f22c..6e8f89f9974 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt
@@ -2,27 +2,27 @@ package
 
 public final class A {
     public constructor A()
-    @kotlin.js.nativeInvoke() public final val baz: kotlin.Int = 0
+    @kotlin.js.nativeInvoke public final val baz: kotlin.Int = 0
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+    @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+    @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-    @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+    @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+    @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
 
     public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+        @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeInvoke() public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
+        @kotlin.js.nativeInvoke public final fun invoke(/*0*/ a: kotlin.String): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        @kotlin.js.nativeInvoke() public final fun kotlin.Int.ext(): kotlin.Int
-        @kotlin.js.nativeInvoke() public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+        @kotlin.js.nativeInvoke public final fun kotlin.Int.ext(): kotlin.Int
+        @kotlin.js.nativeInvoke public final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
     }
 
-    @kotlin.js.nativeInvoke() public object Obj {
+    @kotlin.js.nativeInvoke public object Obj {
         private constructor Obj()
         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/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.txt
index f8cb8b9bdbe..94738f3aff4 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.txt
@@ -1,4 +1,4 @@
 package
 
-@kotlin.js.nativeInvoke() public fun kotlin.Int.ext(): kotlin.Int
-@kotlin.js.nativeInvoke() public fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
+@kotlin.js.nativeInvoke public fun kotlin.Int.ext(): kotlin.Int
+@kotlin.js.nativeInvoke public fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.txt
index 6794010a7db..cc4aa133574 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.js.nativeInvoke() public val toplevelVal: kotlin.Int = 0
-@kotlin.js.nativeInvoke() public fun toplevelFun(): kotlin.Unit
+@kotlin.js.nativeInvoke public val toplevelVal: kotlin.Int = 0
+@kotlin.js.nativeInvoke public fun toplevelFun(): kotlin.Unit
 
-@kotlin.js.nativeInvoke() public final class Foo {
+@kotlin.js.nativeInvoke public final class Foo {
     public constructor Foo()
     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/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
index 9acde8bd650..fbf873db01c 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
@@ -1,44 +1,44 @@
 package
 
-@kotlin.js.native() public final class A {
+@kotlin.js.native public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
-    @kotlin.js.nativeSetter() public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
-    @kotlin.js.nativeSetter() public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
+    @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+    @kotlin.js.nativeSetter public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
+    @kotlin.js.nativeSetter public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+        @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-        @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
-        @kotlin.js.nativeSetter() public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
-        @kotlin.js.nativeSetter() public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
+        @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+        @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+        @kotlin.js.nativeSetter public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
+        @kotlin.js.nativeSetter public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
 
-@kotlin.js.native() public final class B {
+@kotlin.js.native public final class B {
     public constructor B()
-    @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+    @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
     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 companion object Companion {
         private constructor Companion()
-        @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+        @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
         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
 
-        @kotlin.js.nativeSetter() public object Obj2 {
+        @kotlin.js.nativeSetter public object Obj2 {
             private constructor Obj2()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -46,7 +46,7 @@ package
         }
     }
 
-    @kotlin.js.nativeSetter() public object Obj1 {
+    @kotlin.js.nativeSetter public object Obj1 {
         private constructor Obj1()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -54,18 +54,18 @@ package
     }
 }
 
-@kotlin.js.native() public final class C {
+@kotlin.js.native public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String = ...): kotlin.String
+    @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String = ...): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeSetter() public final fun set(): kotlin.Any?
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A): kotlin.Any?
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A, /*1*/ v: kotlin.Any?): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
+    @kotlin.js.nativeSetter public final fun set(): kotlin.Any?
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: A): kotlin.Any?
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: A, /*1*/ v: kotlin.Any?): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.js.nativeSetter() public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
-    @kotlin.js.nativeSetter() public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
+    @kotlin.js.nativeSetter public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
+    @kotlin.js.nativeSetter public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
index 6329970a7e1..538e276be3f 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.js.native() public final class A {
+@kotlin.js.native public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,42 +16,42 @@ package
         public final class A {
             public constructor A()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
-            @kotlin.js.nativeSetter() public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
+            @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
+            @kotlin.js.nativeSetter public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             public companion object Companion {
                 private constructor Companion()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+                @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-                @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
-                @kotlin.js.nativeSetter() public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
-                @kotlin.js.nativeSetter() public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
+                @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+                @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+                @kotlin.js.nativeSetter public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
+                @kotlin.js.nativeSetter public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
             }
         }
 
         public final class B {
             public constructor B()
-            @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+            @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
             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 companion object Companion {
                 private constructor Companion()
-                @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+                @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
                 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
 
-                @kotlin.js.nativeSetter() public object Obj2 {
+                @kotlin.js.nativeSetter public object Obj2 {
                     private constructor Obj2()
                     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -59,7 +59,7 @@ package
                 }
             }
 
-            @kotlin.js.nativeSetter() public object Obj1 {
+            @kotlin.js.nativeSetter public object Obj1 {
                 private constructor Obj1()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -70,32 +70,32 @@ package
         public final class C {
             public constructor C()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Double = ..., /*1*/ v: kotlin.String = ...): kotlin.String
+            @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Double = ..., /*1*/ v: kotlin.String = ...): kotlin.String
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeSetter() public final fun set(): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
+            @kotlin.js.nativeSetter public final fun set(): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
         }
 
         public object obj {
             private constructor obj()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String = ...): kotlin.String
+            @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String = ...): kotlin.String
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeSetter() public final fun set(): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
         }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt
index f824f57f4aa..905354fb1de 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt
@@ -16,40 +16,40 @@ public final class A {
         public final class A {
             public constructor A()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
-            @kotlin.js.nativeSetter() public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
+            @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
+            @kotlin.js.nativeSetter public final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             public companion object Companion {
                 private constructor Companion()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+                @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-                @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+                @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+                @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
             }
         }
 
         public final class B {
             public constructor B()
-            @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+            @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
             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 companion object Companion {
                 private constructor Companion()
-                @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+                @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
                 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
 
-                @kotlin.js.nativeSetter() public object Obj2 {
+                @kotlin.js.nativeSetter public object Obj2 {
                     private constructor Obj2()
                     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -57,7 +57,7 @@ public final class A {
                 }
             }
 
-            @kotlin.js.nativeSetter() public object Obj1 {
+            @kotlin.js.nativeSetter public object Obj1 {
                 private constructor Obj1()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -68,32 +68,32 @@ public final class A {
         public final class C {
             public constructor C()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Double = ..., /*1*/ v: kotlin.String = ...): kotlin.String
+            @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Double = ..., /*1*/ v: kotlin.String = ...): kotlin.String
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeSetter() public final fun set(): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
         }
 
         public object obj {
             private constructor obj()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String = ...): kotlin.String
+            @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String = ...): kotlin.String
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            @kotlin.js.nativeSetter() public final fun set(): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A): kotlin.Any?
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A): kotlin.Any?
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: A.B.A, /*1*/ v: kotlin.Any?): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
-            @kotlin.js.nativeSetter() public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
+            @kotlin.js.nativeSetter public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
         }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt
index 6d82b6c1eb9..2e2267d5760 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt
@@ -3,38 +3,38 @@ package
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+    @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
+        @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeSetter() public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
-        @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
+        @kotlin.js.nativeSetter public final fun put(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String): kotlin.Unit
+        @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
 
 public final class B {
     public constructor B()
-    @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+    @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
     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 companion object Companion {
         private constructor Companion()
-        @kotlin.js.nativeSetter() public final val foo: kotlin.Int = 0
+        @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
         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
 
-        @kotlin.js.nativeSetter() public object Obj2 {
+        @kotlin.js.nativeSetter public object Obj2 {
             private constructor Obj2()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -42,7 +42,7 @@ public final class B {
         }
     }
 
-    @kotlin.js.nativeSetter() public object Obj1 {
+    @kotlin.js.nativeSetter public object Obj1 {
         private constructor Obj1()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,14 +53,14 @@ public final class B {
 public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeSetter() public final fun foo(/*0*/ a: kotlin.String = ..., /*1*/ v: kotlin.String): kotlin.String
+    @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.String = ..., /*1*/ v: kotlin.String): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeSetter() public final fun set(): kotlin.Any?
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A): kotlin.Any?
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: A, /*1*/ v: kotlin.Any?): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun set(): kotlin.Any?
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: A): kotlin.Any?
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: A, /*1*/ v: kotlin.Any?): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any, /*2*/ v2: kotlin.Any): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.js.nativeSetter() public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-    @kotlin.js.nativeSetter() public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
-    @kotlin.js.nativeSetter() public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
+    @kotlin.js.nativeSetter public final fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.String
+    @kotlin.js.nativeSetter public final fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String?): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt
index 9d606cdc44c..fdc58108e74 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt
@@ -1,12 +1,12 @@
 package
 
-@kotlin.js.nativeSetter() public fun kotlin.Any.foo(/*0*/ a: kotlin.String = ..., /*1*/ v: kotlin.String = ...): kotlin.String
-@kotlin.js.nativeSetter() public fun kotlin.Int.set(/*0*/ a: [ERROR : A]): kotlin.Int?
-@kotlin.js.nativeSetter() public fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
-@kotlin.js.nativeSetter() public fun kotlin.Int.set2(): kotlin.String?
-@kotlin.js.nativeSetter() public fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.Any?
-@kotlin.js.nativeSetter() public fun kotlin.Int.set3(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.Any?): kotlin.Unit
-@kotlin.js.nativeSetter() public fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.String
-@kotlin.js.nativeSetter() public fun kotlin.Int.set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
-@kotlin.js.nativeSetter() public fun kotlin.Int.set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
-@kotlin.js.nativeSetter() public fun kotlin.Int.set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
+@kotlin.js.nativeSetter public fun kotlin.Any.foo(/*0*/ a: kotlin.String = ..., /*1*/ v: kotlin.String = ...): kotlin.String
+@kotlin.js.nativeSetter public fun kotlin.Int.set(/*0*/ a: [ERROR : A]): kotlin.Int?
+@kotlin.js.nativeSetter public fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit
+@kotlin.js.nativeSetter public fun kotlin.Int.set2(): kotlin.String?
+@kotlin.js.nativeSetter public fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.Any?
+@kotlin.js.nativeSetter public fun kotlin.Int.set3(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.Any?): kotlin.Unit
+@kotlin.js.nativeSetter public fun kotlin.Int.set3(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.String
+@kotlin.js.nativeSetter public fun kotlin.Int.set4(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Any
+@kotlin.js.nativeSetter public fun kotlin.Int.set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
+@kotlin.js.nativeSetter public fun kotlin.Int.set6(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.Number
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.txt
index ee6e44061fa..2026b32f9e6 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.js.nativeSetter() public val toplevelVal: kotlin.Int = 0
-@kotlin.js.nativeSetter() public fun toplevelFun(): kotlin.Any
+@kotlin.js.nativeSetter public val toplevelVal: kotlin.Int = 0
+@kotlin.js.nativeSetter public fun toplevelFun(): kotlin.Any
 
-@kotlin.js.nativeSetter() public final class Foo {
+@kotlin.js.nativeSetter public final class Foo {
     public constructor Foo()
     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/testsWithJsStdLib/native/nested/nativeInnerClassProhibited.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nested/nativeInnerClassProhibited.txt
index f24fb89626b..da96592b7a4 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nested/nativeInnerClassProhibited.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nested/nativeInnerClassProhibited.txt
@@ -6,7 +6,7 @@ public final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @kotlin.js.native() public final inner class B {
+    @kotlin.js.native public final inner class B {
         public constructor B()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -14,13 +14,13 @@ public final class A {
     }
 }
 
-@kotlin.js.native() public final class C {
+@kotlin.js.native public final class C {
     public constructor C()
     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
 
-    @kotlin.js.native() public final inner class D {
+    @kotlin.js.native public final inner class D {
         public constructor D()
         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/testsWithJsStdLib/native/optionlBody/native.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt
index 5280327a922..936a6ff96f1 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt
@@ -1,15 +1,15 @@
 package
 
-@kotlin.js.native() public val baz: kotlin.Int
-@kotlin.js.native() public val boo: kotlin.Int
-@kotlin.js.native() public val kotlin.Int.baz: kotlin.Int
-@kotlin.js.native() public fun bar(): kotlin.Unit
-@kotlin.js.native() public fun foo(): kotlin.Unit
+@kotlin.js.native public val baz: kotlin.Int
+@kotlin.js.native public val boo: kotlin.Int
+@kotlin.js.native public val kotlin.Int.baz: kotlin.Int
+@kotlin.js.native public fun bar(): kotlin.Unit
+@kotlin.js.native public fun foo(): kotlin.Unit
 public fun test(): kotlin.Unit
-@kotlin.js.native() public fun kotlin.String.bar(): kotlin.Int
-@kotlin.js.native() public fun kotlin.String.foo(): kotlin.Int
+@kotlin.js.native public fun kotlin.String.bar(): kotlin.Int
+@kotlin.js.native public fun kotlin.String.foo(): kotlin.Int
 
-@kotlin.js.native() public final class C {
+@kotlin.js.native public final class C {
     public constructor C()
     public final val baz: kotlin.Int
     public final val boo: kotlin.Int
@@ -31,7 +31,7 @@ public fun test(): kotlin.Unit
     }
 }
 
-@kotlin.js.native() public object O {
+@kotlin.js.native public object O {
     private constructor O()
     public final val baz: kotlin.Int
     public final val boo: kotlin.Int
@@ -42,7 +42,7 @@ public fun test(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.js.native() public interface T {
+@kotlin.js.native public interface T {
     public abstract val baz: kotlin.Int
     public open fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
index 04c050cac21..152ff98485a 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
@@ -1,12 +1,12 @@
 package
 
-@kotlin.js.nativeGetter() public fun kotlin.String.bar(/*0*/ n: kotlin.Int): kotlin.Int?
-@kotlin.js.nativeGetter() public fun kotlin.String.foo(/*0*/ n: kotlin.Int): kotlin.Int?
+@kotlin.js.nativeGetter public fun kotlin.String.bar(/*0*/ n: kotlin.Int): kotlin.Int?
+@kotlin.js.nativeGetter public fun kotlin.String.foo(/*0*/ n: kotlin.Int): kotlin.Int?
 
-@kotlin.js.native() public interface T {
-    @kotlin.js.nativeGetter() public open fun bar(/*0*/ d: kotlin.Double): kotlin.String?
+@kotlin.js.native public interface T {
+    @kotlin.js.nativeGetter public open fun bar(/*0*/ d: kotlin.Double): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeGetter() public abstract fun foo(/*0*/ d: kotlin.Double): kotlin.String?
+    @kotlin.js.nativeGetter public abstract fun foo(/*0*/ d: kotlin.Double): kotlin.String?
     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/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt
index 5e5fd678a10..0c222817abb 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt
@@ -1,13 +1,13 @@
 package
 
-@kotlin.js.nativeInvoke() public fun kotlin.String.bar(): kotlin.Int
-@kotlin.js.nativeInvoke() public fun kotlin.String.foo(): kotlin.Int
+@kotlin.js.nativeInvoke public fun kotlin.String.bar(): kotlin.Int
+@kotlin.js.nativeInvoke public fun kotlin.String.foo(): kotlin.Int
 
-@kotlin.js.native() public object O {
+@kotlin.js.native public object O {
     private constructor O()
-    @kotlin.js.nativeInvoke() public final fun bar(): kotlin.Unit
+    @kotlin.js.nativeInvoke public final fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeInvoke() public final fun foo(): kotlin.Unit
+    @kotlin.js.nativeInvoke public final fun foo(): kotlin.Unit
     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/testsWithJsStdLib/native/optionlBody/nativeSetter.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
index a679521622e..d351654f89d 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
@@ -1,13 +1,13 @@
 package
 
-@kotlin.js.nativeSetter() public fun kotlin.String.bar(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
-@kotlin.js.nativeSetter() public fun kotlin.String.foo(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
+@kotlin.js.nativeSetter public fun kotlin.String.bar(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
+@kotlin.js.nativeSetter public fun kotlin.String.foo(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
 
-@kotlin.js.native() public final class C {
+@kotlin.js.native public final class C {
     public constructor C()
-    @kotlin.js.nativeSetter() public final fun bar(/*0*/ d: kotlin.Double, /*1*/ v: kotlin.Any): kotlin.Any
+    @kotlin.js.nativeSetter public final fun bar(/*0*/ d: kotlin.Double, /*1*/ v: kotlin.Any): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.js.nativeSetter() public final fun foo(/*0*/ d: kotlin.Double, /*1*/ v: kotlin.Any): kotlin.Any
+    @kotlin.js.nativeSetter public final fun foo(/*0*/ d: kotlin.Double, /*1*/ v: kotlin.Any): kotlin.Any
     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/testsWithJsStdLib/native/unusedParam/native.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.txt
index 2958a6211f3..4555ce07e5c 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.js.native() public fun foo(/*0*/ a: kotlin.String): kotlin.Int
-@kotlin.js.native() public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
+@kotlin.js.native public fun foo(/*0*/ a: kotlin.String): kotlin.Int
+@kotlin.js.native public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
 
-@kotlin.js.native() public final class Bar {
+@kotlin.js.native public final class Bar {
     public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
     public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -11,7 +11,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.js.native() public object Obj {
+@kotlin.js.native public object Obj {
     private constructor Obj()
     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/testsWithJsStdLib/native/unusedParam/nativeGetter.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.txt
index 91e546e7c03..0f4148aa309 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.txt
@@ -1,27 +1,27 @@
 package
 
-@kotlin.js.nativeGetter() public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int?
+@kotlin.js.nativeGetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int?
 
-@kotlin.js.native() public final class Bar {
+@kotlin.js.native public final class Bar {
     public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
-    @kotlin.js.nativeGetter() public final fun baz(/*0*/ d: kotlin.Int): kotlin.Any?
+    @kotlin.js.nativeGetter public final fun baz(/*0*/ d: kotlin.Int): kotlin.Any?
     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
 }
 
-@kotlin.js.native() public object Obj {
+@kotlin.js.native public object Obj {
     private constructor Obj()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeGetter() public final fun test1(/*0*/ e: kotlin.String): kotlin.String?
+    @kotlin.js.nativeGetter public final fun test1(/*0*/ e: kotlin.String): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public object Nested {
         private constructor Nested()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeGetter() public final fun test2(/*0*/ g: kotlin.Int): kotlin.Any?
+        @kotlin.js.nativeGetter public final fun test2(/*0*/ g: kotlin.Int): kotlin.Any?
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt
index 51b427dddae..c3226701032 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt
@@ -1,27 +1,27 @@
 package
 
-@kotlin.js.nativeInvoke() public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
+@kotlin.js.nativeInvoke public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
 
-@kotlin.js.native() public final class Bar {
+@kotlin.js.native public final class Bar {
     public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
-    @kotlin.js.nativeInvoke() public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
+    @kotlin.js.nativeInvoke public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
     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
 }
 
-@kotlin.js.native() public object Obj {
+@kotlin.js.native public object Obj {
     private constructor Obj()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeInvoke() public final fun test1(/*0*/ e: kotlin.String): kotlin.Unit
+    @kotlin.js.nativeInvoke public final fun test1(/*0*/ e: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public object Nested {
         private constructor Nested()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeInvoke() public final fun test2(/*0*/ g: kotlin.Int): kotlin.Unit
+        @kotlin.js.nativeInvoke public final fun test2(/*0*/ g: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt
index 4447a2ae737..82a2b79e527 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt
@@ -1,27 +1,27 @@
 package
 
-@kotlin.js.nativeSetter() public fun kotlin.Int.foo(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Int
+@kotlin.js.nativeSetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Int
 
-@kotlin.js.native() public final class Bar {
+@kotlin.js.native public final class Bar {
     public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
-    @kotlin.js.nativeSetter() public final fun baz(/*0*/ d: kotlin.Int, /*1*/ v: kotlin.Int): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun baz(/*0*/ d: kotlin.Int, /*1*/ v: kotlin.Int): kotlin.Unit
     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
 }
 
-@kotlin.js.native() public object Obj {
+@kotlin.js.native public object Obj {
     private constructor Obj()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.js.nativeSetter() public final fun test1(/*0*/ e: kotlin.String, /*1*/ v: kotlin.Any): kotlin.Unit
+    @kotlin.js.nativeSetter public final fun test1(/*0*/ e: kotlin.String, /*1*/ v: kotlin.Any): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public object Nested {
         private constructor Nested()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.js.nativeSetter() public final fun test2(/*0*/ g: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
+        @kotlin.js.nativeSetter public final fun test2(/*0*/ g: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/unsupportedFeatures/annotations.txt b/compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/unsupportedFeatures/annotations.txt
index 3e3461c01ef..beb6dd1fb23 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/unsupportedFeatures/annotations.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/unsupportedFeatures/annotations.txt
@@ -23,25 +23,25 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    @foo.AnnotationWithBinaryRetention() public final class TestBinary {
+    @foo.AnnotationWithBinaryRetention public final class TestBinary {
         public constructor TestBinary()
-        @foo.AnnotationWithBinaryRetention() public final fun baz(/*0*/ @foo.AnnotationWithBinaryRetention() foo: kotlin.Int): kotlin.Int
+        @foo.AnnotationWithBinaryRetention public final fun baz(/*0*/ @foo.AnnotationWithBinaryRetention foo: kotlin.Int): kotlin.Int
         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
     }
 
-    @foo.AnnotationWithRuntimeRetention() public final class TestRuntime {
+    @foo.AnnotationWithRuntimeRetention public final class TestRuntime {
         public constructor TestRuntime()
-        @foo.AnnotationWithRuntimeRetention() public final fun baz(/*0*/ @foo.AnnotationWithRuntimeRetention() foo: kotlin.Int): kotlin.Int
+        @foo.AnnotationWithRuntimeRetention public final fun baz(/*0*/ @foo.AnnotationWithRuntimeRetention foo: kotlin.Int): kotlin.Int
         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
     }
 
-    @foo.AnnotationWithSourceRetention() public final class TestSource {
+    @foo.AnnotationWithSourceRetention public final class TestSource {
         public constructor TestSource()
-        @foo.AnnotationWithSourceRetention() public final fun baz(/*0*/ @foo.AnnotationWithSourceRetention() foo: kotlin.Int): kotlin.Int
+        @foo.AnnotationWithSourceRetention public final fun baz(/*0*/ @foo.AnnotationWithSourceRetention foo: kotlin.Int): kotlin.Int
         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/testsWithStdLib/CallCompanionProtectedNonStatic.txt b/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.txt
index 81df8b4eedf..b6f9ec7e868 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.txt
@@ -15,7 +15,7 @@ public open class Base {
         protected final fun bar(): kotlin.Unit
         protected final override /*1*/ /*fake_override*/ fun baz(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() protected final fun gav(): kotlin.Unit
+        @kotlin.jvm.JvmStatic protected final fun gav(): kotlin.Unit
         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/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
index 460a8dbe08d..9699ef46418 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
@@ -2,7 +2,7 @@ package
 
 public final class My {
     public constructor My()
-    @delegate:kotlin.jvm.JvmSynthetic() public final val s: kotlin.String
+    @delegate:kotlin.jvm.JvmSynthetic public final val s: kotlin.String
     public final val t: kotlin.String
     public final var z: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/Synchronized.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/Synchronized.txt
index d7142608359..85eeb6ef2e7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/Synchronized.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/Synchronized.txt
@@ -1,22 +1,22 @@
 package
 
-@kotlin.jvm.Synchronized() public fun gav(): kotlin.Int
+@kotlin.jvm.Synchronized public fun gav(): kotlin.Int
 
 public interface My {
-    @kotlin.jvm.Synchronized() public open fun bar(): kotlin.Int
-    @kotlin.jvm.Synchronized() public open fun baz(): kotlin.String
+    @kotlin.jvm.Synchronized public open fun bar(): kotlin.Int
+    @kotlin.jvm.Synchronized public open fun baz(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.Synchronized() public abstract fun foo(): kotlin.Unit
+    @kotlin.jvm.Synchronized public abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public abstract class Your {
     public constructor Your()
-    @kotlin.jvm.Synchronized() public final fun bar(): kotlin.Int
-    @kotlin.jvm.Synchronized() public open fun baz(): kotlin.String
+    @kotlin.jvm.Synchronized public final fun bar(): kotlin.Int
+    @kotlin.jvm.Synchronized public open fun baz(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.Synchronized() public abstract fun foo(): kotlin.Unit
+    @kotlin.jvm.Synchronized public abstract fun foo(): kotlin.Unit
     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/testsWithStdLib/annotations/TransientOnDelegate.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/TransientOnDelegate.txt
index 49811b7fbdc..b1e2a2f51d4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/TransientOnDelegate.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/TransientOnDelegate.txt
@@ -2,7 +2,7 @@ package
 
 public final class C {
     public constructor C()
-    @delegate:kotlin.jvm.Transient() public final val lazy: kotlin.Int
+    @delegate:kotlin.jvm.Transient public final val lazy: kotlin.Int
     public final val plainField: kotlin.Int = 1
     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/testsWithStdLib/annotations/Volatile.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt
index b3b0443b924..ffd73543679 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt
@@ -2,10 +2,10 @@ package
 
 public final class My {
     public constructor My()
-    @field:kotlin.jvm.Volatile() public final val w: kotlin.Int = 2
-    @kotlin.jvm.Volatile() public final val x: kotlin.Int = 0
-    @kotlin.jvm.Volatile() public final var y: kotlin.Int
-    @delegate:kotlin.jvm.Volatile() public final var z: kotlin.String
+    @field:kotlin.jvm.Volatile public final val w: kotlin.Int = 2
+    @kotlin.jvm.Volatile public final val x: kotlin.Int = 0
+    @kotlin.jvm.Volatile public final var y: kotlin.Int
+    @delegate:kotlin.jvm.Volatile public final var z: kotlin.String
     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/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
index c3c39dbd6d0..b763af476ce 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
@@ -6,7 +6,7 @@ public val i3: kotlin.Int
 public val iAnn: Ann
 public fun foo(): kotlin.Int
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ i: kotlin.IntArray)
     public final val i: kotlin.IntArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,7 +14,7 @@ public fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class AnnAnn : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class AnnAnn : kotlin.Annotation {
     public constructor AnnAnn(/*0*/ i: kotlin.Array<Ann>)
     public final val i: kotlin.Array<Ann>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
index ad50dbf164d..d90b2254f2f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
@@ -6,7 +6,7 @@ public val ia: kotlin.IntArray
 public val sa: kotlin.Array<kotlin.String>
 public fun foo(): kotlin.Int
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ i: kotlin.Int)
     public final val i: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -45,7 +45,7 @@ public final class MyClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@Ann(i = 1) @Ann() @Ann() @AnnIA() @AnnSA() public final class Test {
+@Ann(i = 1) @Ann @Ann @AnnIA @AnnSA public final class Test {
     public constructor Test()
     public final val i: kotlin.Int = 1
     @Ann(i = 1) public final val i2: kotlin.Int = 1
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
index 29c02f78052..4b5cf072f88 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
@@ -6,7 +6,7 @@ public val i3: kotlin.Int
 public val iAnn: Ann
 public fun foo(): kotlin.Int
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/)
     public final val i: kotlin.IntArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,7 +14,7 @@ public fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class AnnAnn : kotlin.Annotation {
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class AnnAnn : kotlin.Annotation {
     public constructor AnnAnn(/*0*/ vararg i: Ann /*kotlin.Array<out Ann>*/)
     public final val i: kotlin.Array<out Ann>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
index 7a53b037ca7..c0175e43b73 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
@@ -3,8 +3,8 @@ package
 @A(value = {"1", "2", "3"}) public fun test1(): kotlin.Unit
 @A(value = {"4"}) public fun test2(): kotlin.Unit
 @A(value = {{"5", "6"}, "7"}) public fun test3(): kotlin.Unit
-@A() public fun test4(): kotlin.Unit
-@A() public fun test5(): kotlin.Unit
+@A public fun test4(): kotlin.Unit
+@A public fun test5(): kotlin.Unit
 
 public final annotation class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/ = ...)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
index 1f297fc241b..ca3d2f2b381 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
@@ -15,7 +15,7 @@ public final annotation class A : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@A() public final class MyClass2 {
+@A public final class MyClass2 {
     public constructor MyClass2()
     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/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
index 0cb49513b5a..5c82dde6630 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
@@ -22,7 +22,7 @@ public final annotation class A : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@A() public final class MyClass3 {
+@A public final class MyClass3 {
     public constructor MyClass3()
     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/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt
index 46f070e6847..ae11fa6f14f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt
@@ -2,7 +2,7 @@ package
 
 public final class A {
     public constructor A()
-    @kotlin.jvm.JvmField() public final val clash: kotlin.Int = 1
+    @kotlin.jvm.JvmField public final val clash: kotlin.Int = 1
     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/testsWithStdLib/annotations/jvmField/inMultiFileFacade.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inMultiFileFacade.txt
index ddd1d82a6f6..9f5bde826e1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inMultiFileFacade.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inMultiFileFacade.txt
@@ -1,11 +1,11 @@
 package
 
-@kotlin.jvm.JvmField() public val c: kotlin.Int = 4
-@kotlin.jvm.JvmField() public var g: kotlin.Int
+@kotlin.jvm.JvmField public val c: kotlin.Int = 4
+@kotlin.jvm.JvmField public var g: kotlin.Int
 
 public final class C {
     public constructor C()
-    @kotlin.jvm.JvmField() public final var g: kotlin.Int
+    @kotlin.jvm.JvmField public final var g: kotlin.Int
     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/testsWithStdLib/annotations/jvmField/inSingleFileFacade.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inSingleFileFacade.txt
index ddd1d82a6f6..9f5bde826e1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inSingleFileFacade.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inSingleFileFacade.txt
@@ -1,11 +1,11 @@
 package
 
-@kotlin.jvm.JvmField() public val c: kotlin.Int = 4
-@kotlin.jvm.JvmField() public var g: kotlin.Int
+@kotlin.jvm.JvmField public val c: kotlin.Int = 4
+@kotlin.jvm.JvmField public var g: kotlin.Int
 
 public final class C {
     public constructor C()
-    @kotlin.jvm.JvmField() public final var g: kotlin.Int
+    @kotlin.jvm.JvmField public final var g: kotlin.Int
     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/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
index d36150b4644..c981bb854f9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
@@ -1,27 +1,27 @@
 package
 
-@kotlin.jvm.JvmField() public const val Const: kotlin.Int = 4
-@kotlin.jvm.JvmField() public var i: kotlin.Int
-@kotlin.jvm.JvmField() private val private: kotlin.Int = 3
-@kotlin.jvm.JvmField() public fun foo(): kotlin.Unit
+@kotlin.jvm.JvmField public const val Const: kotlin.Int = 4
+@kotlin.jvm.JvmField public var i: kotlin.Int
+@kotlin.jvm.JvmField private val private: kotlin.Int = 3
+@kotlin.jvm.JvmField public fun foo(): kotlin.Unit
 
-@kotlin.jvm.JvmField() public abstract class C : I {
-    @kotlin.jvm.JvmField() public constructor C(/*0*/ s: kotlin.String)
-    @kotlin.jvm.JvmField() public final val a: kotlin.String
-    @kotlin.jvm.JvmField() public final override /*1*/ val ai: kotlin.Int = 3
-    @kotlin.jvm.JvmField() public open val b: kotlin.Int = 3
-    @kotlin.jvm.JvmField() public open override /*1*/ /*fake_override*/ val bi: kotlin.Int
-    @kotlin.jvm.JvmField() public abstract val c: kotlin.Int
-    @kotlin.jvm.JvmField() public final val customGetter: kotlin.String = ""
-    @kotlin.jvm.JvmField() public final var customSetter: kotlin.String
-    @kotlin.jvm.JvmField() public final val explicitDefaultAnnotatedGetter: kotlin.String = ""
-    @kotlin.jvm.JvmField() public final var explicitDefaultAnnotatedSetter: kotlin.String
-    @kotlin.jvm.JvmField() public final val explicitDefaultGetter: kotlin.String = ""
-    @kotlin.jvm.JvmField() public final var explicitDefaultSetter: kotlin.String
-    @kotlin.jvm.JvmField() public final val noBackingField: kotlin.String
-    @kotlin.jvm.JvmField() private final val private: kotlin.Int = 3
+@kotlin.jvm.JvmField public abstract class C : I {
+    @kotlin.jvm.JvmField public constructor C(/*0*/ s: kotlin.String)
+    @kotlin.jvm.JvmField public final val a: kotlin.String
+    @kotlin.jvm.JvmField public final override /*1*/ val ai: kotlin.Int = 3
+    @kotlin.jvm.JvmField public open val b: kotlin.Int = 3
+    @kotlin.jvm.JvmField public open override /*1*/ /*fake_override*/ val bi: kotlin.Int
+    @kotlin.jvm.JvmField public abstract val c: kotlin.Int
+    @kotlin.jvm.JvmField public final val customGetter: kotlin.String = ""
+    @kotlin.jvm.JvmField public final var customSetter: kotlin.String
+    @kotlin.jvm.JvmField public final val explicitDefaultAnnotatedGetter: kotlin.String = ""
+    @kotlin.jvm.JvmField public final var explicitDefaultAnnotatedSetter: kotlin.String
+    @kotlin.jvm.JvmField public final val explicitDefaultGetter: kotlin.String = ""
+    @kotlin.jvm.JvmField public final var explicitDefaultSetter: kotlin.String
+    @kotlin.jvm.JvmField public final val noBackingField: kotlin.String
+    @kotlin.jvm.JvmField private final val private: kotlin.Int = 3
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmField() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
+    @kotlin.jvm.JvmField private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -35,8 +35,8 @@ public final annotation class DemoAnnotation : kotlin.Annotation {
 
 public final class G {
     public constructor G()
-    @kotlin.jvm.JvmField() public final lateinit var lateInit: kotlin.String
-    @delegate:kotlin.jvm.JvmField() public final val s: kotlin.String
+    @kotlin.jvm.JvmField public final lateinit var lateInit: kotlin.String
+    @delegate:kotlin.jvm.JvmField public final val s: kotlin.String
     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
@@ -50,7 +50,7 @@ public final class H {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmField() public final var c: kotlin.Int
+        @kotlin.jvm.JvmField public final var c: kotlin.Int
         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
@@ -58,8 +58,8 @@ public final class H {
 }
 
 public interface I {
-    @kotlin.jvm.JvmField() public abstract val ai: kotlin.Int
-    @kotlin.jvm.JvmField() public open val bi: kotlin.Int
+    @kotlin.jvm.JvmField public abstract val ai: kotlin.Int
+    @kotlin.jvm.JvmField public open val bi: kotlin.Int
     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
@@ -74,7 +74,7 @@ public interface K {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmField() public final var c: kotlin.Int
+        @kotlin.jvm.JvmField public final var c: kotlin.Int
         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
@@ -83,8 +83,8 @@ public interface K {
 
 public final class KK : K {
     public constructor KK()
-    @kotlin.jvm.JvmField() public open override /*1*/ val i: kotlin.Int = 0
-    @kotlin.jvm.JvmField() public final override /*1*/ val j: kotlin.Int = 0
+    @kotlin.jvm.JvmField public open override /*1*/ val i: kotlin.Int = 0
+    @kotlin.jvm.JvmField public final override /*1*/ val j: kotlin.Int = 0
     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
@@ -92,8 +92,8 @@ public final class KK : K {
 
 public open class KKK : K {
     public constructor KKK()
-    @kotlin.jvm.JvmField() public open override /*1*/ val i: kotlin.Int = 0
-    @kotlin.jvm.JvmField() public final override /*1*/ val j: kotlin.Int = 0
+    @kotlin.jvm.JvmField public open override /*1*/ val i: kotlin.Int = 0
+    @kotlin.jvm.JvmField public final override /*1*/ val j: kotlin.Int = 0
     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
@@ -101,7 +101,7 @@ public open class KKK : K {
 
 public object O {
     private constructor O()
-    @kotlin.jvm.JvmField() public final val c: kotlin.Int = 3
+    @kotlin.jvm.JvmField public final val c: kotlin.Int = 3
     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/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt
index 9782e21ceb7..30043679e84 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt
@@ -1,9 +1,9 @@
 package
 
 public final class C {
-    @kotlin.jvm.JvmOverloads() public constructor C()
+    @kotlin.jvm.JvmOverloads public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmOverloads() public final fun foo(/*0*/ s: kotlin.String): kotlin.Unit
+    @kotlin.jvm.JvmOverloads public final fun foo(/*0*/ s: kotlin.String): kotlin.Unit
     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/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt
index 7492ac57900..e47fa67a3d0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt
@@ -3,14 +3,14 @@ package
 public abstract class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmOverloads() public abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
+    @kotlin.jvm.JvmOverloads public abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface T {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmOverloads() public abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
+    @kotlin.jvm.JvmOverloads public abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
     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/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt
index f5c4440da65..1f38e170f48 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt
@@ -4,9 +4,9 @@ public fun foo(): kotlin.Unit
 
 public final class C {
     public constructor C()
-    @kotlin.jvm.JvmOverloads() public final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit
+    @kotlin.jvm.JvmOverloads public final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmOverloads() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
+    @kotlin.jvm.JvmOverloads private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
     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/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt
index a25ba155851..ba1ebbb19c5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt
@@ -8,8 +8,8 @@ public final class A {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() @kotlin.jvm.JvmField() public final val x: kotlin.Int = 1
-        @kotlin.jvm.JvmStatic() public const final val z: kotlin.Int = 1
+        @kotlin.jvm.JvmStatic @kotlin.jvm.JvmField public final val x: kotlin.Int = 1
+        @kotlin.jvm.JvmStatic public const final val z: kotlin.Int = 1
         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
@@ -18,8 +18,8 @@ public final class A {
 
 public object B {
     private constructor B()
-    @kotlin.jvm.JvmStatic() @kotlin.jvm.JvmField() public final val x: kotlin.Int = 1
-    @kotlin.jvm.JvmStatic() public const final val z: kotlin.Int = 1
+    @kotlin.jvm.JvmStatic @kotlin.jvm.JvmField public final val x: kotlin.Int = 1
+    @kotlin.jvm.JvmStatic public const final val z: kotlin.Int = 1
     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/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt
index 19fd82d8c64..82132e04320 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt
@@ -2,7 +2,7 @@ package
 
 public final class A {
     public constructor A(/*0*/ z: kotlin.Int)
-    @kotlin.jvm.JvmStatic() public final val z: kotlin.Int
+    @kotlin.jvm.JvmStatic public final val z: kotlin.Int
     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/testsWithStdLib/annotations/jvmStatic/constructors.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.txt
index c41e4e496cd..f09e1253546 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.txt
@@ -1,13 +1,13 @@
 package
 
 public final class A {
-    @kotlin.jvm.JvmStatic() public constructor A()
+    @kotlin.jvm.JvmStatic public constructor A()
     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 B {
-        @kotlin.jvm.JvmStatic() public constructor B()
+        @kotlin.jvm.JvmStatic public constructor B()
         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
@@ -15,7 +15,7 @@ public final class A {
 }
 
 public final class C {
-    @kotlin.jvm.JvmStatic() public constructor C()
+    @kotlin.jvm.JvmStatic public constructor C()
     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/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt
index ac7a3b31695..9987d3a6f21 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt
@@ -12,10 +12,10 @@ public abstract class A {
 
 public object B : A {
     private constructor B()
-    @kotlin.jvm.JvmStatic() public open override /*1*/ fun a(): kotlin.Unit
-    @kotlin.jvm.JvmStatic() public open override /*1*/ fun b(): kotlin.Unit
-    @kotlin.jvm.JvmStatic() public final override /*1*/ fun c(): kotlin.Unit
-    @kotlin.jvm.JvmStatic() public open fun d(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public open override /*1*/ fun a(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public open override /*1*/ fun b(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public final override /*1*/ fun c(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public open fun d(): kotlin.Unit
     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
@@ -29,10 +29,10 @@ public final class C {
 
     public companion object Companion : A {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public open override /*1*/ fun a(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public open override /*1*/ fun b(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final override /*1*/ fun c(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public open fun d(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public open override /*1*/ fun a(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public open override /*1*/ fun b(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final override /*1*/ fun c(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public open fun d(): kotlin.Unit
         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/testsWithStdLib/annotations/jvmStatic/functions.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.txt
index 6e4fbc4ac24..1ad8d6f5492 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.txt
@@ -2,7 +2,7 @@ package
 
 public final class A {
     public constructor A()
-    @kotlin.jvm.JvmStatic() public final fun a4(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public final fun a4(): kotlin.Unit
     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 final fun test(): kotlin.Unit
@@ -10,7 +10,7 @@ public final class A {
 
     public object A {
         private constructor A()
-        @kotlin.jvm.JvmStatic() public final fun a2(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun a2(): kotlin.Unit
         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
@@ -18,7 +18,7 @@ public final class A {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final fun a1(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
         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
@@ -26,7 +26,7 @@ public final class A {
 }
 
 public interface B {
-    @kotlin.jvm.JvmStatic() public open fun a4(): kotlin.Unit
+    @kotlin.jvm.JvmStatic public open fun a4(): kotlin.Unit
     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 fun test(): kotlin.Unit
@@ -34,7 +34,7 @@ public interface B {
 
     public object A {
         private constructor A()
-        @kotlin.jvm.JvmStatic() public final fun a2(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun a2(): kotlin.Unit
         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
@@ -42,7 +42,7 @@ public interface B {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final fun a1(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
         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/testsWithStdLib/annotations/jvmStatic/property.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
index 4af028fcdf4..2c28ded48cc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
@@ -3,29 +3,29 @@ package
 public final class A {
     public constructor A()
     public final var p: kotlin.Int
-    @kotlin.jvm.JvmStatic() public final val z2: kotlin.Int = 1
+    @kotlin.jvm.JvmStatic public final val z2: kotlin.Int = 1
     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 object A : B {
         private constructor A()
-        @kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
+        @kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
         public open override /*1*/ val base2: kotlin.Int = 0
         public final var p: kotlin.Int
-        @kotlin.jvm.JvmStatic() public final val z: kotlin.Int = 1
+        @kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() public open fun f(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public open fun f(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
     public companion object Companion : B {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
+        @kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
         public open override /*1*/ val base2: kotlin.Int = 0
         public final var p1: kotlin.Int
-        @kotlin.jvm.JvmStatic() public final val z: kotlin.Int = 1
+        @kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
         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/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
index e3ebbb3a743..56890d4fa4f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
@@ -47,14 +47,14 @@ public final annotation class Ann3 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@Ann1() public final class MyClass2 {
+@Ann1 public final class MyClass2 {
     public constructor MyClass2()
     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
 }
 
-@Ann1() public final class MyClass3 {
+@Ann1 public final class MyClass3 {
     public constructor MyClass3()
     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/testsWithStdLib/annotations/qualifiedCallValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
index bbcd898883f..a315d940861 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
@@ -5,7 +5,7 @@ package a {
     package a.b {
 
         package a.b.c {
-            @kotlin.Deprecated(message = "aaa") @a.b.c.ann1(p = kotlin.Deprecated(message = "aaa")) @a.b.c.ann1() @a.b.c.ann2(p = a.b.c.ann1()) @a.b.c.A.IAnn() @a.b.c.ann3(p = a.b.c.A.IAnn()) @a.b.c.A.IAnn() @a.b.c.ann3(p = a.b.c.A.IAnn()) @a.b.c.annArray(p = {"a"}) public fun test(): kotlin.Int
+            @kotlin.Deprecated(message = "aaa") @a.b.c.ann1(p = kotlin.Deprecated(message = "aaa")) @a.b.c.ann1 @a.b.c.ann2(p = a.b.c.ann1) @a.b.c.A.IAnn @a.b.c.ann3(p = a.b.c.A.IAnn) @a.b.c.A.IAnn @a.b.c.ann3(p = a.b.c.A.IAnn) @a.b.c.annArray(p = {"a"}) public fun test(): kotlin.Int
 
             public final class A {
                 public constructor A()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/strictfpOnClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/strictfpOnClass.txt
index 495ea2cb7aa..29b99a7bdde 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/strictfpOnClass.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/strictfpOnClass.txt
@@ -2,21 +2,21 @@ package
 
 public fun foo(): kotlin.Unit
 
-@kotlin.jvm.Strictfp() public final class A {
+@kotlin.jvm.Strictfp public final class A {
     public constructor A()
     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
 }
 
-@kotlin.jvm.Strictfp() public object B {
+@kotlin.jvm.Strictfp public object B {
     private constructor B()
     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
 }
 
-@kotlin.jvm.Strictfp() public interface C {
+@kotlin.jvm.Strictfp public interface C {
     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/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt
index f88c06d2483..ee2b98e34eb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt
@@ -4,7 +4,7 @@ public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
-    @kotlin.jvm.JvmOverloads() public final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
+    @kotlin.jvm.JvmOverloads public final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
     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/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt
index 6be8992c85e..7d99c62ae93 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt
@@ -18,7 +18,7 @@ public final class Derived : Base {
     public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() public final fun foo(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
         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/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt
index 4f196048003..b605d018c1d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt
@@ -11,7 +11,7 @@ public open class Base {
 public object Derived : Base {
     private constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmStatic() public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
+    @kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): kotlin.Unit
     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/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt
index 13f23b91852..fbbef6047b0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt
@@ -31,12 +31,12 @@ public open class K : B {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() public final fun foo(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
         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/testsWithStdLib/duplicateJvmSignature/statics/jk.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt
index cbd35c99c70..b447dc9fc7f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt
@@ -19,10 +19,10 @@ public open class K : A {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() public final fun foo(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit
         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/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt
index 0c3da37051b..64ae44d81c8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt
@@ -38,12 +38,12 @@ public open class K : C {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() public final fun foo(): kotlin.Unit
-        @kotlin.jvm.JvmStatic() public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
         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/testsWithStdLib/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt
index 60da4b5f349..05230e46ac2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt
@@ -8,9 +8,9 @@ public open class K : foo.A {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.jvm.JvmStatic() public final fun bar(/*0*/ d: kotlin.Double): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun bar(/*0*/ d: kotlin.Double): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.jvm.JvmStatic() public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit
+        @kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit
         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/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt
index 45d3fc80180..4bf8a1b703c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt
@@ -1,5 +1,5 @@
 package
 
 public fun test(): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
 @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt
index f20f288c78e..d056554e6f3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt
@@ -1,7 +1,7 @@
 package
 
 public fun test(/*0*/ map: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes() T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "getAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.get1(/*0*/ key: kotlin.Any?): kotlin.Int
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes() K, /*1*/ V> kotlin.collections.Map<out K, V>.get1(/*0*/ key: K): V?
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "getAny") @kotlin.internal.LowPriorityInOverloadResolution public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.get1(/*0*/ key: kotlin.Any?): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes K, /*1*/ V> kotlin.collections.Map<out K, V>.get1(/*0*/ key: K): V?
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAnnotationWithPlatformTypes.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAnnotationWithPlatformTypes.txt
index 89f68cbc0f9..a178f02e5bd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAnnotationWithPlatformTypes.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAnnotationWithPlatformTypes.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes() T> assertEquals1(/*0*/ t1: T, /*1*/ t2: T): kotlin.Unit
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes T> assertEquals1(/*0*/ t1: T, /*1*/ t2: T): kotlin.Unit
 public fun test(): kotlin.Unit
 
 public open class Foo {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.txt
index 678e5367136..a77143887c3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes() T> assertEquals1(/*0*/ t1: T, /*1*/ t2: T): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes() T> expect1(/*0*/ expected: T, /*1*/ block: () -> T): kotlin.Unit
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes T> assertEquals1(/*0*/ t1: T, /*1*/ t2: T): kotlin.Unit
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ @kotlin.internal.OnlyInputTypes T> expect1(/*0*/ expected: T, /*1*/ block: () -> T): kotlin.Unit
 public fun test(): kotlin.Unit
 public fun test1(/*0*/ a: A, /*1*/ b: B, /*2*/ c: C): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inline/inlineOnlySuppressesNothingToInline.txt b/compiler/testData/diagnostics/testsWithStdLib/inline/inlineOnlySuppressesNothingToInline.txt
index 2e4b2d46150..0b08e2cbec8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inline/inlineOnlySuppressesNothingToInline.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inline/inlineOnlySuppressesNothingToInline.txt
@@ -1,8 +1,8 @@
 package
 
-@kotlin.internal.InlineOnly() public inline fun test(): kotlin.Unit
-@kotlin.internal.InlineOnly() public inline fun test2(/*0*/ s: ((kotlin.Int) -> kotlin.Int)?): kotlin.Unit
-@kotlin.internal.InlineOnly() public inline fun test3(/*0*/ noinline s: (kotlin.Int) -> kotlin.Int): kotlin.Unit
-@kotlin.internal.InlineOnly() public inline fun test4(/*0*/ noinline s: kotlin.Int.() -> kotlin.Int): kotlin.Unit
-@kotlin.internal.InlineOnly() public inline fun ((kotlin.Int) -> kotlin.Int)?.test5(): kotlin.Unit
-@kotlin.internal.InlineOnly() public inline fun ((kotlin.Int) -> kotlin.Int)?.test6(): kotlin.Unit
+@kotlin.internal.InlineOnly public inline fun test(): kotlin.Unit
+@kotlin.internal.InlineOnly public inline fun test2(/*0*/ s: ((kotlin.Int) -> kotlin.Int)?): kotlin.Unit
+@kotlin.internal.InlineOnly public inline fun test3(/*0*/ noinline s: (kotlin.Int) -> kotlin.Int): kotlin.Unit
+@kotlin.internal.InlineOnly public inline fun test4(/*0*/ noinline s: kotlin.Int.() -> kotlin.Int): kotlin.Unit
+@kotlin.internal.InlineOnly public inline fun ((kotlin.Int) -> kotlin.Int)?.test5(): kotlin.Unit
+@kotlin.internal.InlineOnly public inline fun ((kotlin.Int) -> kotlin.Int)?.test6(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt b/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt
index 6cce13fa105..23f2101a1c3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt
@@ -12,7 +12,7 @@ public interface Base {
 public open class Derived : Base {
     public constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun </*0*/ V : kotlin.Any!> foo(/*0*/ @org.jetbrains.annotations.NotNull() compute: () -> V?): kotlin.Unit
+    @java.lang.Override public open override /*1*/ fun </*0*/ V : kotlin.Any!> foo(/*0*/ @org.jetbrains.annotations.NotNull compute: () -> V?): kotlin.Unit
     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/testsWithStdLib/pureReifiable.txt b/compiler/testData/diagnostics/testsWithStdLib/pureReifiable.txt
index 60737b9165f..4545031e88e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/pureReifiable.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/pureReifiable.txt
@@ -1,4 +1,4 @@
 package
 
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public inline fun </*0*/ reified @kotlin.internal.PureReifiable() T> foo(/*0*/ x: T): kotlin.Unit
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public inline fun </*0*/ reified @kotlin.internal.PureReifiable T> foo(/*0*/ x: T): kotlin.Unit
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
index 51ae2c3017c..427ed4bf41f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
@@ -14,7 +14,7 @@ public fun foo(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    @java.lang.Override() public open override /*2*/ fun iterator(): kotlin.collections.MutableIterator<T>
+    @java.lang.Override public open override /*2*/ fun iterator(): kotlin.collections.MutableIterator<T>
     public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
index 54d94f1ea44..ff897dafecd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
@@ -15,7 +15,7 @@ public fun foo(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*2*/ fun get(/*0*/ index: kotlin.Int): T
+    @java.lang.Override public open override /*2*/ fun get(/*0*/ index: kotlin.Int): T
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: T): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
index 0a0cca70fec..16ef1b09dfd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
@@ -15,7 +15,7 @@ public val y: B<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
+    @java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
index b0d2f2e8262..f29fa3b2cf1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
@@ -15,7 +15,7 @@ public fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
+    @java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.txt
index 6973d24692b..d2262b6270b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.txt
@@ -2,4 +2,4 @@ package
 
 @kotlin.jvm.JvmName(name = 42) public fun bar(): kotlin.Unit
 @kotlin.jvm.JvmName(name = "a") public fun baz(): kotlin.Unit
-@kotlin.jvm.JvmName() public fun foo(): kotlin.Unit
+@kotlin.jvm.JvmName public fun foo(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.txt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.txt
index c9967650c93..652fee86205 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.txt
@@ -2,8 +2,8 @@ package
 
 package a {
     public fun test(/*0*/ a: a.A): kotlin.Unit
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers() public fun a.A.forEach(): kotlin.String
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers() public fun a.A.forEach(/*0*/ s: kotlin.String): kotlin.Unit
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers public fun a.A.forEach(): kotlin.String
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers public fun a.A.forEach(/*0*/ s: kotlin.String): kotlin.Unit
 
     public final class A {
         public constructor A()
@@ -17,6 +17,6 @@ package a {
 }
 
 package b {
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers() public fun a.A.forEach(/*0*/ i: kotlin.Int): kotlin.Int
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers() public fun a.A.forEach(/*0*/ s: kotlin.String): kotlin.Unit
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers public fun a.A.forEach(/*0*/ i: kotlin.Int): kotlin.Int
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers public fun a.A.forEach(/*0*/ s: kotlin.String): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.txt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.txt
index 73f9d3540a2..412822fea28 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.txt
@@ -1,7 +1,7 @@
 package
 
 public fun test2(/*0*/ a: A): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers() public fun A.forEach(/*0*/ i: kotlin.Int): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers public fun A.forEach(/*0*/ i: kotlin.Int): kotlin.Int
 
 public final class A {
     public constructor A()
@@ -18,5 +18,5 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun test(/*0*/ a: A): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers() public final fun A.forEach(): B
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.HidesMembers public final fun A.forEach(): B
 }
diff --git a/compiler/testData/foreignAnnotations/tests/android.txt b/compiler/testData/foreignAnnotations/tests/android.txt
index 59b5fe1577b..245c8f0f6c7 100644
--- a/compiler/testData/foreignAnnotations/tests/android.txt
+++ b/compiler/testData/foreignAnnotations/tests/android.txt
@@ -4,11 +4,11 @@ public fun main(/*0*/ a: A<kotlin.String>, /*1*/ a1: A<kotlin.String?>): kotlin.
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @android.support.annotation.Nullable() public final var field: kotlin.String?
-    @android.support.annotation.NonNull() public open fun bar(): kotlin.String
-    @android.support.annotation.Nullable() public open fun baz(/*0*/ @android.support.annotation.NonNull() x: T): T?
+    @android.support.annotation.Nullable public final var field: kotlin.String?
+    @android.support.annotation.NonNull public open fun bar(): kotlin.String
+    @android.support.annotation.Nullable public open fun baz(/*0*/ @android.support.annotation.NonNull x: T): T?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @android.support.annotation.Nullable() public open fun foo(/*0*/ @android.support.annotation.NonNull() x: kotlin.String, /*1*/ @android.support.annotation.Nullable() y: kotlin.CharSequence?): kotlin.String?
+    @android.support.annotation.Nullable public open fun foo(/*0*/ @android.support.annotation.NonNull x: kotlin.String, /*1*/ @android.support.annotation.Nullable y: kotlin.CharSequence?): kotlin.String?
     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/foreignAnnotations/tests/aosp.txt b/compiler/testData/foreignAnnotations/tests/aosp.txt
index cca4c5590a6..ae33cd45aa0 100644
--- a/compiler/testData/foreignAnnotations/tests/aosp.txt
+++ b/compiler/testData/foreignAnnotations/tests/aosp.txt
@@ -4,11 +4,11 @@ public fun main(/*0*/ a: A<kotlin.String>, /*1*/ a1: A<kotlin.String?>): kotlin.
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @com.android.annotations.Nullable() public final var field: kotlin.String?
-    @com.android.annotations.NonNull() public open fun bar(): kotlin.String
-    @com.android.annotations.Nullable() public open fun baz(/*0*/ @com.android.annotations.NonNull() x: T): T?
+    @com.android.annotations.Nullable public final var field: kotlin.String?
+    @com.android.annotations.NonNull public open fun bar(): kotlin.String
+    @com.android.annotations.Nullable public open fun baz(/*0*/ @com.android.annotations.NonNull x: T): T?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @com.android.annotations.Nullable() public open fun foo(/*0*/ @com.android.annotations.NonNull() x: kotlin.String, /*1*/ @com.android.annotations.Nullable() y: kotlin.CharSequence?): kotlin.String?
+    @com.android.annotations.Nullable public open fun foo(/*0*/ @com.android.annotations.NonNull x: kotlin.String, /*1*/ @com.android.annotations.Nullable y: kotlin.CharSequence?): kotlin.String?
     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/foreignAnnotations/tests/eclipse.txt b/compiler/testData/foreignAnnotations/tests/eclipse.txt
index 99fe9e5cd5a..d73832edc45 100644
--- a/compiler/testData/foreignAnnotations/tests/eclipse.txt
+++ b/compiler/testData/foreignAnnotations/tests/eclipse.txt
@@ -4,11 +4,11 @@ public fun main(/*0*/ a: A<kotlin.String>, /*1*/ a1: A<kotlin.String?>): kotlin.
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.eclipse.jdt.annotation.Nullable() public final var field: kotlin.String?
-    @org.eclipse.jdt.annotation.NonNull() public open fun bar(): kotlin.String
-    @org.eclipse.jdt.annotation.Nullable() public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull() x: T): T?
+    @org.eclipse.jdt.annotation.Nullable public final var field: kotlin.String?
+    @org.eclipse.jdt.annotation.NonNull public open fun bar(): kotlin.String
+    @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: T): T?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.eclipse.jdt.annotation.Nullable() public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull() x: kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable() y: kotlin.CharSequence?): kotlin.String?
+    @org.eclipse.jdt.annotation.Nullable public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull x: kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable y: kotlin.CharSequence?): kotlin.String?
     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/foreignAnnotations/tests/findBugsSimple.txt b/compiler/testData/foreignAnnotations/tests/findBugsSimple.txt
index bfadd96085e..b5ada9fb616 100644
--- a/compiler/testData/foreignAnnotations/tests/findBugsSimple.txt
+++ b/compiler/testData/foreignAnnotations/tests/findBugsSimple.txt
@@ -4,10 +4,10 @@ public fun main(/*0*/ a: A): kotlin.Unit
 
 public open class A {
     public constructor A()
-    @edu.umd.cs.findbugs.annotations.Nullable() public final var field: kotlin.String?
-    @edu.umd.cs.findbugs.annotations.NonNull() public open fun bar(): kotlin.String
+    @edu.umd.cs.findbugs.annotations.Nullable public final var field: kotlin.String?
+    @edu.umd.cs.findbugs.annotations.NonNull public open fun bar(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @edu.umd.cs.findbugs.annotations.PossiblyNull() public open fun foo(/*0*/ @edu.umd.cs.findbugs.annotations.NonNull() x: kotlin.String, /*1*/ @edu.umd.cs.findbugs.annotations.UnknownNullness() y: kotlin.CharSequence!): kotlin.String?
+    @edu.umd.cs.findbugs.annotations.PossiblyNull public open fun foo(/*0*/ @edu.umd.cs.findbugs.annotations.NonNull x: kotlin.String, /*1*/ @edu.umd.cs.findbugs.annotations.UnknownNullness y: kotlin.CharSequence!): kotlin.String?
     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/foreignAnnotations/tests/jsr305Simple.txt b/compiler/testData/foreignAnnotations/tests/jsr305Simple.txt
index 21b6b192b14..77aaa765fbf 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305Simple.txt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305Simple.txt
@@ -4,10 +4,10 @@ public fun main(/*0*/ a: A): kotlin.Unit
 
 public open class A {
     public constructor A()
-    @javax.annotation.Nullable() public final var field: kotlin.String?
-    @javax.annotation.Nonnull() public open fun bar(): kotlin.String
+    @javax.annotation.Nullable public final var field: kotlin.String?
+    @javax.annotation.Nonnull public open fun bar(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @javax.annotation.Nullable() public open fun foo(/*0*/ @javax.annotation.Nonnull() x: kotlin.String, /*1*/ @javax.annotation.CheckForNull() y: kotlin.CharSequence?): kotlin.String?
+    @javax.annotation.Nullable public open fun foo(/*0*/ @javax.annotation.Nonnull x: kotlin.String, /*1*/ @javax.annotation.CheckForNull y: kotlin.CharSequence?): kotlin.String?
     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/foreignAnnotations/tests/jsr305Strange.txt b/compiler/testData/foreignAnnotations/tests/jsr305Strange.txt
index 0323ea677e4..02da742751d 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305Strange.txt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305Strange.txt
@@ -5,7 +5,7 @@ public fun main(/*0*/ a: A): kotlin.Unit
 public open class A {
     public constructor A()
     @javax.annotation.Nonnull(when = When.UNKNOWN) public final var field: kotlin.String?
-    @javax.annotation.Nonnull() public open fun bar(): kotlin.String
+    @javax.annotation.Nonnull public open fun bar(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @javax.annotation.Nonnull(when = When.MAYBE) public open fun foo(/*0*/ @javax.annotation.Nonnull(when = When.ALWAYS) x: kotlin.String, /*1*/ @javax.annotation.Nonnull(when = When.NEVER) y: kotlin.CharSequence?): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/foreignAnnotations/tests/lombokSimple.txt b/compiler/testData/foreignAnnotations/tests/lombokSimple.txt
index 699ecfdbaeb..1ee7ffb290e 100644
--- a/compiler/testData/foreignAnnotations/tests/lombokSimple.txt
+++ b/compiler/testData/foreignAnnotations/tests/lombokSimple.txt
@@ -5,7 +5,7 @@ public fun main(/*0*/ a: A): kotlin.Unit
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @lombok.NonNull() public open fun foo(/*0*/ @lombok.NonNull() x: kotlin.String): kotlin.String
+    @lombok.NonNull public open fun foo(/*0*/ @lombok.NonNull x: kotlin.String): kotlin.String
     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/foreignAnnotationsJava8/tests/checkerFramework.txt b/compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.txt
index 4e2a216cfa8..dadab74fad8 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.txt
@@ -4,11 +4,11 @@ public fun main(/*0*/ a: A<kotlin.String>, /*1*/ a1: A<kotlin.String?>): kotlin.
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.checkerframework.checker.nullness.qual.Nullable() public final var field: kotlin.String?
-    @org.checkerframework.checker.nullness.qual.NonNull() public open fun bar(): kotlin.String
-    @org.checkerframework.checker.nullness.qual.Nullable() public open fun baz(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull() x: T): T?
+    @org.checkerframework.checker.nullness.qual.Nullable public final var field: kotlin.String?
+    @org.checkerframework.checker.nullness.qual.NonNull public open fun bar(): kotlin.String
+    @org.checkerframework.checker.nullness.qual.Nullable public open fun baz(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: T): T?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.checkerframework.checker.nullness.qual.Nullable() public open fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull() x: kotlin.String, /*1*/ @org.checkerframework.checker.nullness.qual.Nullable() y: kotlin.CharSequence?): kotlin.String?
+    @org.checkerframework.checker.nullness.qual.Nullable public open fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: kotlin.String, /*1*/ @org.checkerframework.checker.nullness.qual.Nullable y: kotlin.CharSequence?): kotlin.String?
     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/foreignAnnotationsJava8/tests/eclipse.txt b/compiler/testData/foreignAnnotationsJava8/tests/eclipse.txt
index 99fe9e5cd5a..d73832edc45 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/eclipse.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/eclipse.txt
@@ -4,11 +4,11 @@ public fun main(/*0*/ a: A<kotlin.String>, /*1*/ a1: A<kotlin.String?>): kotlin.
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.eclipse.jdt.annotation.Nullable() public final var field: kotlin.String?
-    @org.eclipse.jdt.annotation.NonNull() public open fun bar(): kotlin.String
-    @org.eclipse.jdt.annotation.Nullable() public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull() x: T): T?
+    @org.eclipse.jdt.annotation.Nullable public final var field: kotlin.String?
+    @org.eclipse.jdt.annotation.NonNull public open fun bar(): kotlin.String
+    @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: T): T?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.eclipse.jdt.annotation.Nullable() public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull() x: kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable() y: kotlin.CharSequence?): kotlin.String?
+    @org.eclipse.jdt.annotation.Nullable public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull x: kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable y: kotlin.CharSequence?): kotlin.String?
     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/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.txt b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.txt
index 13c9cefc27e..03461073601 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.txt
@@ -17,7 +17,7 @@ public/*package*/ open class AnnotatedTypeArguments {
     public/*package*/ open inner class B : AnnotatedTypeArguments.A {
         public/*package*/ constructor B()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @org.checkerframework.checker.nullness.qual.Nullable() public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull() x: L<P<L<kotlin.String?>, S<*>>!>): L<P<L<kotlin.String?>, S<*>>!>?
+        @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: L<P<L<kotlin.String?>, S<*>>!>): L<P<L<kotlin.String?>, S<*>>!>?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -41,7 +41,7 @@ public/*package*/ open class AnnotatedTypeArguments {
     public/*package*/ open inner class D2 : AnnotatedTypeArguments.C {
         public/*package*/ constructor D2()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable() x: L<P<L<kotlin.String?>, S<*>>!>!): L<P<L<kotlin.String?>, S<*>>!>
+        @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: L<P<L<kotlin.String?>, S<*>>!>!): L<P<L<kotlin.String?>, S<*>>!>
         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/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.txt
index f9ccf1a6e14..bdbc02a09a8 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.txt
@@ -17,27 +17,27 @@ public/*package*/ open class Outer {
 
     public/*package*/ open inner class B : Outer.A {
         public/*package*/ constructor B()
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.Nullable() public/*package*/ open override /*1*/ fun </*0*/ R : kotlin.Any!> bar(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull() x: Y<R>): X<R!>?
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open override /*1*/ fun </*0*/ R : kotlin.Any!> bar(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: Y<R>): X<R!>?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun </*0*/ T1 : kotlin.Any!, /*1*/ T2 : kotlin.Any!> foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable() x: T1?): T2
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun </*0*/ T1 : kotlin.Any!, /*1*/ T2 : kotlin.Any!> foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: T1?): T2
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
     public/*package*/ open inner class C : Outer.B {
         public/*package*/ constructor C()
-        @java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ E : kotlin.Any!> bar(/*0*/ x: Y<E>): X<E!>?
+        @java.lang.Override public/*package*/ open override /*1*/ fun </*0*/ E : kotlin.Any!> bar(/*0*/ x: Y<E>): X<E!>?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ I : kotlin.Any!, /*1*/ J : kotlin.Any!> foo(/*0*/ x: I?): J
+        @java.lang.Override public/*package*/ open override /*1*/ fun </*0*/ I : kotlin.Any!, /*1*/ J : kotlin.Any!> foo(/*0*/ x: I?): J
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
     public/*package*/ open inner class D : Outer.C {
         public/*package*/ constructor D()
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun </*0*/ F : kotlin.Any!> bar(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable() x: Y<F!>!): X<F!>
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun </*0*/ F : kotlin.Any!> bar(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: Y<F!>!): X<F!>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun </*0*/ U : kotlin.Any!, /*1*/ W : kotlin.Any!> foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable() x: U?): W
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun </*0*/ U : kotlin.Any!, /*1*/ W : kotlin.Any!> foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: U?): W
         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/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.txt b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.txt
index d76f55a97ee..c93a978cf0a 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.txt
@@ -9,7 +9,7 @@ public/*package*/ open class Outer {
     public/*package*/ open inner class A {
         public/*package*/ constructor A()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @org.checkerframework.checker.nullness.qual.Nullable() public/*package*/ open fun foo(): Base<kotlin.String>?
+        @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open fun foo(): Base<kotlin.String>?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -17,7 +17,7 @@ public/*package*/ open class Outer {
     public/*package*/ open inner class B : Outer.A {
         public/*package*/ constructor B()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() public/*package*/ open override /*1*/ fun foo(): Base<kotlin.String>?
+        @java.lang.Override public/*package*/ open override /*1*/ fun foo(): Base<kotlin.String>?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -25,7 +25,7 @@ public/*package*/ open class Outer {
     public/*package*/ open inner class C : Outer.A {
         public/*package*/ constructor C()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun foo(): Base<kotlin.String>
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(): Base<kotlin.String>
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -33,7 +33,7 @@ public/*package*/ open class Outer {
     public/*package*/ open inner class D : Outer.A {
         public/*package*/ constructor D()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() public/*package*/ open override /*1*/ fun foo(): Derived<kotlin.String!>?
+        @java.lang.Override public/*package*/ open override /*1*/ fun foo(): Derived<kotlin.String!>?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -41,7 +41,7 @@ public/*package*/ open class Outer {
     public/*package*/ open inner class E : Outer.A {
         public/*package*/ constructor E()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun foo(): Derived<kotlin.String!>
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(): Derived<kotlin.String!>
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -49,7 +49,7 @@ public/*package*/ open class Outer {
     public/*package*/ open inner class F : Outer.A {
         public/*package*/ constructor F()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @java.lang.Override() @org.checkerframework.checker.nullness.qual.NonNull() public/*package*/ open override /*1*/ fun foo(): Derived<kotlin.String!>
+        @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(): Derived<kotlin.String!>
         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/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.txt b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.txt
index 8cde7cb109a..ec51eaea470 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.txt
@@ -6,7 +6,7 @@ public fun bar2(): Derived<kotlin.String?>
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.checkerframework.checker.nullness.qual.Nullable() public/*package*/ open fun foo(): Base<kotlin.String>?
+    @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open fun foo(): Base<kotlin.String>?
     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/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
index 8759d50a6a7..2db42caf224 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-@test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
+@test.AnnotatedAnnotation public final annotation class AnnotatedAnnotation : kotlin.Annotation {
     public constructor AnnotatedAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
index 61e4041c645..ec79180a29a 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
@@ -3,7 +3,7 @@ package test
 public final enum class AnnotatedEnumEntry : kotlin.Enum<test.AnnotatedEnumEntry!> {
     @test.AnnotatedEnumEntry.Anno(value = "a") enum entry E1
 
-    @test.AnnotatedEnumEntry.Anno(value = "b") @test.AnnotatedEnumEntry.Anno2() enum entry E2
+    @test.AnnotatedEnumEntry.Anno(value = "b") @test.AnnotatedEnumEntry.Anno2 enum entry E2
 
     enum entry E3
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt
index 808191ab40d..33f40fb7eaa 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt
@@ -7,7 +7,7 @@ public open class AnnotationRetentions {
         public constructor BaseAnnotation()
     }
 
-    @test.AnnotationRetentions.BaseAnnotation() public/*package*/ open inner class BaseClass {
+    @test.AnnotationRetentions.BaseAnnotation public/*package*/ open inner class BaseClass {
         public/*package*/ constructor BaseClass()
     }
 
@@ -15,7 +15,7 @@ public open class AnnotationRetentions {
         public constructor BinaryAnnotation()
     }
 
-    @test.AnnotationRetentions.BinaryAnnotation() public/*package*/ open inner class BinaryClass {
+    @test.AnnotationRetentions.BinaryAnnotation public/*package*/ open inner class BinaryClass {
         public/*package*/ constructor BinaryClass()
     }
 
@@ -23,7 +23,7 @@ public open class AnnotationRetentions {
         public constructor RuntimeAnnotation()
     }
 
-    @test.AnnotationRetentions.RuntimeAnnotation() public/*package*/ open inner class RuntimeClass {
+    @test.AnnotationRetentions.RuntimeAnnotation public/*package*/ open inner class RuntimeClass {
         public/*package*/ constructor RuntimeClass()
     }
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
index b317250afbe..8ee4cccf179 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
@@ -9,6 +9,6 @@ public interface InheritNullability {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
+        public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
index f4fe096e027..25b73adf81e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
@@ -4,7 +4,7 @@ public interface Kt3302 {
 
     public interface BSONObject {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun put(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.Any): kotlin.Any!
+        public abstract fun put(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.Any): kotlin.Any!
     }
 
     public interface BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String!, kotlin.Any!>, test.Kt3302.BSONObject {
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
index 6edde558ca5..91b2dd6c4ef 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
@@ -9,6 +9,6 @@ public interface NotNullToNullable {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
+        public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index 94b275c2ea8..d2f0eac38f5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -4,7 +4,7 @@ public interface NullableToNotNull {
 
     public interface Sub : test.NullableToNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
     }
 
     public interface Super {
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
index 65e8474cfd3..d015ccea34e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
@@ -9,7 +9,7 @@ public interface SubclassFromGenericAndNot {
 
     public interface NonGeneric {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
+        public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
     }
 
     public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
index 0640fb8ea9f..6bd653144b6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
@@ -4,7 +4,7 @@ public interface AddNotNullJavaSubtype {
 
     public interface Sub : test.AddNotNullJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.String
+        @org.jetbrains.annotations.NotNull public abstract override /*1*/ fun foo(): kotlin.String
     }
 
     public interface Super {
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
index eb60aff7322..a4eec00d805 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
@@ -4,7 +4,7 @@ public interface AddNotNullSameJavaType {
 
     public interface Sub : test.AddNotNullSameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract override /*1*/ fun foo(): kotlin.CharSequence
     }
 
     public interface Super {
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
index 69a07f1a3f5..aa7f453acdd 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
@@ -9,6 +9,6 @@ public interface AddNullabilityJavaSubtype {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
index ea44841ace3..2618d086f91 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
@@ -9,6 +9,6 @@ public interface AddNullabilitySameJavaType {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
index 7b694c1ebac..c1d9722ea00 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
@@ -9,6 +9,6 @@ public interface InheritNullabilityJavaSubtype {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
index caf6c66ef95..135ae5d7b48 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
@@ -9,6 +9,6 @@ public interface InheritNullabilitySameJavaType {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
index 58d0a4cb914..c736b6bc3b3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
@@ -14,6 +14,6 @@ public interface TwoSuperclassesReturnJavaSubtype {
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
index 01832127c4a..1048dfa175d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
@@ -14,6 +14,6 @@ public interface TwoSuperclassesReturnSameJavaType {
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
index d91a48764d2..65cc32989e9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
@@ -9,6 +9,6 @@ public interface TypeParamOfClass {
 
     public interface Super</*0*/ T : kotlin.Any!> {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): T
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): T
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
index be0a4bd8dae..023765ed689 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
@@ -9,6 +9,6 @@ public interface TypeParamOfClassSubstituted {
 
     public interface Super</*0*/ T : kotlin.Any!> {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun foo(): T
+        @org.jetbrains.annotations.NotNull public abstract fun foo(): T
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
index 76d579f890f..fa253d10d59 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
@@ -9,6 +9,6 @@ public interface TypeParamOfFun {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        @org.jetbrains.annotations.NotNull() public abstract fun </*0*/ T : kotlin.Any!> foo(): T
+        @org.jetbrains.annotations.NotNull public abstract fun </*0*/ T : kotlin.Any!> foo(): T
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
index 97a43f030f0..072674f5f53 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
@@ -11,7 +11,7 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
+    @org.jetbrains.annotations.NotNull public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
index f92237fdf0e..0f13953e099 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterable</*0*/ T : kotlin.Any!> {
-    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
-    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
+    @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
+    @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
index c86346acf9f..5ed9c123195 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterableWithConflict</*0*/ T : kotlin.Any!> {
-    @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.(Mutable)Iterable<T!>!
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.collections.(Mutable)Iterable<T!>!): kotlin.Unit
+    @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.(Mutable)Iterable<T!>!
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.Mutable p0: kotlin.collections.(Mutable)Iterable<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
index 60eb5f63f3b..08351a6bc45 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterableWithNullability</*0*/ T : kotlin.Any!> {
-    @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>
-    @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() @org.jetbrains.annotations.NotNull() p0: kotlin.collections.MutableIterable<T!>): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.NotNull() p0: kotlin.collections.Iterable<T!>): kotlin.Unit
+    @org.jetbrains.annotations.NotNull @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>
+    @org.jetbrains.annotations.NotNull @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable @org.jetbrains.annotations.NotNull p0: kotlin.collections.MutableIterable<T!>): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.NotNull p0: kotlin.collections.Iterable<T!>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
index f26f9f95638..4e662e75a7c 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
@@ -3,10 +3,10 @@ package test
 public interface LoadIterableWithPropagation {
 
     public interface LoadIterable</*0*/ T : kotlin.Any!> {
-        @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
-        @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
-        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
-        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
+        @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
+        @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
+        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
+        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
     }
 
     public open class LoadIterableImpl</*0*/ T : kotlin.Any!> : test.LoadIterableWithPropagation.LoadIterable<T!> {
diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
index 1e753cd2451..d194b74d5d8 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
@@ -2,5 +2,5 @@ package test
 
 public interface ReadOnlyExtendsWildcard {
     public abstract fun bar(): kotlin.Unit
-    public abstract fun foo(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.List<kotlin.CharSequence!>!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.Comparable<kotlin.String!>): kotlin.Unit
+    public abstract fun foo(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.List<kotlin.CharSequence!>!, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.Comparable<kotlin.String!>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
index 871fb96e06c..256a180d2aa 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotNullField {
     public constructor NotNullField()
-    @org.jetbrains.annotations.NotNull() public final var hi: kotlin.String
+    @org.jetbrains.annotations.NotNull public final var hi: kotlin.String
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
index d48a2a51617..db08afb75a2 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotNullIntArray {
     public constructor NotNullIntArray()
-    @org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.IntArray
+    @org.jetbrains.annotations.NotNull public open fun hi(): kotlin.IntArray
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
index 85172a11f55..2eb45808f31 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotNullMethod {
     public constructor NotNullMethod()
-    @org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.String
+    @org.jetbrains.annotations.NotNull public open fun hi(): kotlin.String
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
index e3ac10d98b5..fa03c381db9 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotNullObjectArray {
     public constructor NotNullObjectArray()
-    @org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.Array<(out) kotlin.Any!>
+    @org.jetbrains.annotations.NotNull public open fun hi(): kotlin.Array<(out) kotlin.Any!>
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
index d5cd764b2f0..5a9703077a1 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotNullParameter {
     public constructor NotNullParameter()
-    public open fun hi(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
+    public open fun hi(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.txt
index 44e08723a38..f0afe89c2fc 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.txt
@@ -1,6 +1,6 @@
 package test
 
 public open class ConstructorWithAnnotations {
-    public /*synthesized*/ constructor ConstructorWithAnnotations(/*0*/ p0: (() -> kotlin.Unit)!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.String)
-    public constructor ConstructorWithAnnotations(/*0*/ p0: java.lang.Runnable!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.String)
+    public /*synthesized*/ constructor ConstructorWithAnnotations(/*0*/ p0: (() -> kotlin.Unit)!, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.String)
+    public constructor ConstructorWithAnnotations(/*0*/ p0: java.lang.Runnable!, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.String)
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt
index f870aebf126..2f493dd48e6 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-@test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
+@test.AnnotatedAnnotation public final annotation class AnnotatedAnnotation : kotlin.Annotation {
     /*primary*/ public constructor AnnotatedAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index 0ac835afc78..7ff70e4047b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -9,7 +9,7 @@ public final class Class {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        @field:test.Anno() public final var property: kotlin.Int
+        @field:test.Anno public final var property: kotlin.Int
             public final fun <get-property>(): kotlin.Int
             public final fun <set-property>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt
index 580c423898b..cd507761403 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt
@@ -6,6 +6,6 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @test.Anno() public final val x: kotlin.Int
+    @test.Anno public final val x: kotlin.Int
         public final fun <get-x>(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
index 47e395169b2..d9b81945c4e 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
@@ -13,11 +13,11 @@ public final annotation class Bnno : kotlin.Annotation {
 }
 
 public final enum class Eee : kotlin.Enum<test.Eee> {
-    @test.Anno() enum entry Entry1
+    @test.Anno enum entry Entry1
 
     enum entry Entry2
 
-    @test.Anno(value = "3") @test.Bnno() enum entry Entry3
+    @test.Anno(value = "3") @test.Bnno enum entry Entry3
 
     @test.Anno(value = "4", x = 4) enum entry Entry4
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt
index fa4aeeccf08..869913568d1 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt
@@ -6,5 +6,5 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @test.Anno() public final fun foo(): kotlin.Unit
+    @test.Anno public final fun foo(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt
index 018f255d996..4a322d19fd4 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt
@@ -7,5 +7,5 @@ public final annotation class Anno : kotlin.Annotation {
 public final class Class {
     /*primary*/ public constructor Class()
     public final val property: kotlin.Int
-        @test.Anno() public final fun <get-property>(): kotlin.Int
+        @test.Anno public final fun <get-property>(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt
index ee18c636f85..5927530358b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt
@@ -6,7 +6,7 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @field:test.Anno() public final var property: kotlin.Int
+    @field:test.Anno public final var property: kotlin.Int
         public final fun <get-property>(): kotlin.Int
         public final fun <set-property>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt
index cbb9bc0b34a..a578e660867 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt
@@ -8,5 +8,5 @@ public final class Class {
     /*primary*/ public constructor Class()
     public final var property: kotlin.Int
         public final fun <get-property>(): kotlin.Int
-        @test.Anno() public final fun <set-property>(/*0*/ value: kotlin.Int): kotlin.Unit
+        @test.Anno public final fun <set-property>(/*0*/ value: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt
index e6877abd572..211b291588c 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt
@@ -20,6 +20,6 @@ public final class A {
     }
 }
 
-@test.A.Companion.Anno1() @test.A.Companion.B.Anno2() public final class C {
+@test.A.Companion.Anno1 @test.A.Companion.B.Anno2 public final class C {
     /*primary*/ public constructor C()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt
index ec47b99564a..f0fc4201e75 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt
@@ -10,7 +10,7 @@ public final class Class {
     public companion object Companion {
         /*primary*/ private constructor Companion()
 
-        @test.Anno() public final class Nested {
+        @test.Anno public final class Nested {
             /*primary*/ public constructor Nested()
         }
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt
index 21e9d19d59e..c9ad9f17b4b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt
@@ -7,7 +7,7 @@ public final annotation class Anno : kotlin.Annotation {
 public final class Class {
     /*primary*/ public constructor Class()
 
-    @test.Anno() public companion object Companion {
+    @test.Anno public companion object Companion {
         /*primary*/ private constructor Companion()
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt
index 39e781122a3..855cdfffcac 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt
@@ -4,7 +4,7 @@ public final annotation class `$$$$$$` : kotlin.Annotation {
     /*primary*/ public constructor `$$$$$$`()
 }
 
-@test.`$$$$$$`() public final class A {
+@test.`$$$$$$` public final class A {
     /*primary*/ public constructor A()
 }
 
@@ -12,6 +12,6 @@ public final annotation class `Anno$tation` : kotlin.Annotation {
     /*primary*/ public constructor `Anno$tation`()
 }
 
-@test.`Anno$tation`() public final class `Cla$s` {
+@test.`Anno$tation` public final class `Cla$s` {
     /*primary*/ public constructor `Cla$s`()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt
index 7dc9f2840f7..4f2c0f8b202 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt
@@ -12,6 +12,6 @@ public final annotation class A3 : kotlin.Annotation {
     /*primary*/ public constructor A3()
 }
 
-@test.A1() @test.A2() @test.A3() public final class Class {
+@test.A1 @test.A2 @test.A3 public final class Class {
     /*primary*/ public constructor Class()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt
index 57e36ecd021..553bb65b0d3 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt
@@ -8,7 +8,7 @@ public final class A {
     }
 }
 
-@test.A.Anno() public final class B {
+@test.A.Anno public final class B {
     /*primary*/ public constructor B()
-    @test.A.Anno() public final fun f(): kotlin.Unit
+    @test.A.Anno public final fun f(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt
index e429cc38932..6d7fd8d03e7 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt
@@ -7,11 +7,11 @@ public final annotation class Anno : kotlin.Annotation {
 public final class Class {
     /*primary*/ public constructor Class()
 
-    @test.Anno() public final inner class Inner {
+    @test.Anno public final inner class Inner {
         /*primary*/ public constructor Inner()
     }
 
-    @test.Anno() public final class Nested {
+    @test.Anno public final class Nested {
         /*primary*/ public constructor Nested()
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt
index 5f2ac728039..6dc903c4073 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt
@@ -4,6 +4,6 @@ public final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
-@test.Anno() public final class X {
+@test.Anno public final class X {
     /*primary*/ public constructor X()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt
index 3bed9e83b2f..842c9783f38 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt
@@ -1,6 +1,6 @@
 package test
 
-@test.Anno() public val x: kotlin.Int
+@test.Anno public val x: kotlin.Int
     public fun <get-x>(): kotlin.Int
 
 public final annotation class Anno : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt
index c94eb67754a..6ed76e13093 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt
@@ -1,6 +1,6 @@
 package test
 
-@test.Anno() public fun function(): kotlin.Unit
+@test.Anno public fun function(): kotlin.Unit
 
 public final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt
index 330075011ea..11333ee56e3 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt
@@ -1,7 +1,7 @@
 package test
 
 public val property: kotlin.Int
-    @test.Anno() public fun <get-property>(): kotlin.Int
+    @test.Anno public fun <get-property>(): kotlin.Int
 
 public final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt
index 96a3a240250..f8b9f53abe0 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt
@@ -1,6 +1,6 @@
 package test
 
-@field:test.Anno() public var property: kotlin.Int
+@field:test.Anno public var property: kotlin.Int
     public fun <get-property>(): kotlin.Int
     public fun <set-property>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt
index 55a70ee11a0..955d4bab808 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt
@@ -2,7 +2,7 @@ package test
 
 public var property: kotlin.Int
     public fun <get-property>(): kotlin.Int
-    @test.Anno() public fun <set-property>(/*0*/ value: kotlin.Int): kotlin.Unit
+    @test.Anno public fun <set-property>(/*0*/ value: kotlin.Int): kotlin.Unit
 
 public final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt
index 82c15bac0dd..4f7d9b2790f 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt
@@ -9,7 +9,7 @@ public final annotation class B : kotlin.Annotation {
 }
 
 public final class Class {
-    /*primary*/ public constructor Class(/*0*/ @test.A() x: kotlin.Int, /*1*/ @test.B() y: kotlin.String)
+    /*primary*/ public constructor Class(/*0*/ @test.A x: kotlin.Int, /*1*/ @test.B y: kotlin.String)
     public final val x: kotlin.Int
         public final fun <get-x>(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
index a4f8cd643c7..00ad2cb0817 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -9,7 +9,7 @@ public final annotation class B : kotlin.Annotation {
 }
 
 public final enum class E : kotlin.Enum<test.E> {
-    /*primary*/ private constructor E(/*0*/ @test.A() x: kotlin.String, /*1*/ @test.B() y: kotlin.Int)
+    /*primary*/ private constructor E(/*0*/ @test.A x: kotlin.String, /*1*/ @test.B y: kotlin.Int)
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
         public final override /*1*/ /*fake_override*/ fun <get-name>(): kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt
index a1512a5a7ed..d2c3001217d 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun kotlin.Int.foo(/*0*/ @test.A() x: kotlin.Int): kotlin.Unit
+public fun kotlin.Int.foo(/*0*/ @test.A x: kotlin.Int): kotlin.Unit
 
 public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
index 6e18f0390c2..08c0d628751 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
@@ -6,5 +6,5 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    public final fun kotlin.String.foo(/*0*/ @test.Anno() x: kotlin.Int): kotlin.Int
+    public final fun kotlin.String.foo(/*0*/ @test.Anno x: kotlin.Int): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
index a28155de459..1a4c008bd50 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
@@ -8,5 +8,5 @@ public final class Class {
     /*primary*/ public constructor Class()
     public final var kotlin.Int.foo: kotlin.Int
         public final fun kotlin.Int.<get-foo>(): kotlin.Int
-        public final fun kotlin.Int.<set-foo>(/*0*/ @test.A() value: kotlin.Int): kotlin.Unit
+        public final fun kotlin.Int.<set-foo>(/*0*/ @test.A value: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt
index af1d36bcd4a..4b7ed74384b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt
@@ -6,5 +6,5 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    public final fun foo(/*0*/ @test.Anno() x: kotlin.String): kotlin.Unit
+    public final fun foo(/*0*/ @test.Anno x: kotlin.String): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt
index fdc5b58bbd3..5892d4c70c3 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt
@@ -5,5 +5,5 @@ public final annotation class Anno : kotlin.Annotation {
 }
 
 public interface Trait {
-    public open fun foo(/*0*/ @test.Anno() x: kotlin.String): kotlin.Int
+    public open fun foo(/*0*/ @test.Anno x: kotlin.String): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt
index cb7bbd8afae..b833293e7a0 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt
@@ -1,7 +1,7 @@
 package test
 
-public fun bar(/*0*/ @test.A() @test.B() @test.C() @test.D() x: kotlin.Int): kotlin.Unit
-public fun foo(/*0*/ @test.A() @test.B() x: kotlin.Int, /*1*/ @test.A() @test.C() y: kotlin.Double, /*2*/ @test.B() @test.C() @test.D() z: kotlin.String): kotlin.Unit
+public fun bar(/*0*/ @test.A @test.B @test.C @test.D x: kotlin.Int): kotlin.Unit
+public fun foo(/*0*/ @test.A @test.B x: kotlin.Int, /*1*/ @test.A @test.C y: kotlin.Double, /*2*/ @test.B @test.C @test.D z: kotlin.String): kotlin.Unit
 
 public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt
index 410bc274916..3b5e8079e1f 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt
@@ -8,5 +8,5 @@ public final class Class {
     /*primary*/ public constructor Class()
     public final var foo: kotlin.Int
         public final fun <get-foo>(): kotlin.Int
-        public final fun <set-foo>(/*0*/ @test.A() value: kotlin.Int): kotlin.Unit
+        public final fun <set-foo>(/*0*/ @test.A value: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt
index 194991f0a58..96c19cb68aa 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun foo(/*0*/ @test.Anno() x: kotlin.Int): kotlin.Unit
+public fun foo(/*0*/ @test.Anno x: kotlin.Int): kotlin.Unit
 
 public final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
index e4c0a41414e..24510424825 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
@@ -2,7 +2,7 @@ package test
 
 public var foo: kotlin.Int
     public fun <get-foo>(): kotlin.Int
-    public fun <set-foo>(/*0*/ @test.A() @test.B() value: kotlin.Int): kotlin.Unit
+    public fun <set-foo>(/*0*/ @test.A @test.B value: kotlin.Int): kotlin.Unit
 
 public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
index 21d8a830cc9..9911edec530 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
@@ -6,6 +6,6 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @test.Anno() public final val property: kotlin.Int
+    @test.Anno public final val property: kotlin.Int
         public final fun <get-property>(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
index ae374d4d295..dad9f6101b2 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
@@ -9,7 +9,7 @@ public final class Class {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        @test.Anno() public final val property: kotlin.Int
+        @test.Anno public final val property: kotlin.Int
             public final fun <get-property>(): kotlin.Int
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
index 74bd50082ed..d67151c499a 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
@@ -2,11 +2,11 @@ package test
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @test.DoubleAnno() public final val kotlin.Double.extension: kotlin.Int
+    @test.DoubleAnno public final val kotlin.Double.extension: kotlin.Int
         public final fun kotlin.Double.<get-extension>(): kotlin.Int
-    @test.IntAnno() public final val kotlin.Int.extension: kotlin.Int
+    @test.IntAnno public final val kotlin.Int.extension: kotlin.Int
         public final fun kotlin.Int.<get-extension>(): kotlin.Int
-    @test.StringAnno() public final val kotlin.String.extension: kotlin.String
+    @test.StringAnno public final val kotlin.String.extension: kotlin.String
         public final fun kotlin.String.<get-extension>(): kotlin.String
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
index 62789193f02..3ace5fb8938 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
@@ -1,10 +1,10 @@
 package test
 
-@test.DoubleAnno() public val kotlin.Double.extension: kotlin.Int
+@test.DoubleAnno public val kotlin.Double.extension: kotlin.Int
     public fun kotlin.Double.<get-extension>(): kotlin.Int
-@test.IntAnno() public val kotlin.Int.extension: kotlin.Int
+@test.IntAnno public val kotlin.Int.extension: kotlin.Int
     public fun kotlin.Int.<get-extension>(): kotlin.Int
-@test.StringAnno() public val kotlin.String.extension: kotlin.String
+@test.StringAnno public val kotlin.String.extension: kotlin.String
     public fun kotlin.String.<get-extension>(): kotlin.String
 
 public final annotation class DoubleAnno : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
index f03bfb85277..0741d82f5a2 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
@@ -8,7 +8,7 @@ public final class Class {
     /*primary*/ public constructor Class()
 
     public interface Trait {
-        @test.Anno() public abstract val property: kotlin.Int
+        @test.Anno public abstract val property: kotlin.Int
             public abstract fun <get-property>(): kotlin.Int
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
index 9bbe27db8ca..0c5351cd195 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
@@ -1,6 +1,6 @@
 package test
 
-@test.Anno() public val property: kotlin.Int
+@test.Anno public val property: kotlin.Int
     public fun <get-property>(): kotlin.Int
 
 public final annotation class Anno : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
index 2c81e2fb706..353ea7098b7 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
@@ -5,6 +5,6 @@ public final annotation class Anno : kotlin.Annotation {
 }
 
 public interface Trait {
-    @test.Anno() public abstract val property: kotlin.Int
+    @test.Anno public abstract val property: kotlin.Int
         public abstract fun <get-property>(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
index d5354c038d4..02c83a78893 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
@@ -8,7 +8,7 @@ public interface Trait {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        @test.Anno() public final val property: kotlin.Int
+        @test.Anno public final val property: kotlin.Int
             public final fun <get-property>(): kotlin.Int
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt
index b8aef7a90e0..103edf5e786 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun @test.A() kotlin.String.foo(): kotlin.Unit
+public fun @test.A kotlin.String.foo(): kotlin.Unit
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
index 5af1053830f..afba5801b86 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
@@ -6,5 +6,5 @@ package test
 
 public final class SimpleTypeAnnotation {
     /*primary*/ public constructor SimpleTypeAnnotation()
-    public final fun foo(/*0*/ x: @test.A() kotlin.ranges.IntRange): @test.A() kotlin.Int
+    public final fun foo(/*0*/ x: @test.A kotlin.ranges.IntRange): @test.A kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
index 8966e6532dd..a1da2fa8f48 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
@@ -4,10 +4,10 @@ public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-public interface Foo</*0*/ T : @test.A() kotlin.Number> : @test.A() kotlin.CharSequence {
+public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A kotlin.CharSequence {
     public abstract override /*1*/ /*fake_override*/ val length: kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun <get-length>(): kotlin.Int
-    public abstract fun </*0*/ E, /*1*/ F : @test.A() E> bar(): kotlin.Unit
+    public abstract fun </*0*/ E, /*1*/ F : @test.A E> bar(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
     public abstract override /*1*/ /*fake_override*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt
index 8599ee152bc..18ad3b5884e 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun foo(/*0*/ bar: kotlin.collections.Map<@test.A() kotlin.String, kotlin.collections.List<@test.A() kotlin.Int>>): kotlin.Unit
+public fun foo(/*0*/ bar: kotlin.collections.Map<@test.A kotlin.String, kotlin.collections.List<@test.A kotlin.Int>>): kotlin.Unit
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt
index 87d3b45fbb4..92ab803ac06 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt
@@ -6,5 +6,5 @@ package test
 
 public final class SimpleTypeParameterAnnotation {
     /*primary*/ public constructor SimpleTypeParameterAnnotation()
-    public final fun </*0*/ @test.A() T> foo(/*0*/ x: T): kotlin.Unit
+    public final fun </*0*/ @test.A T> foo(/*0*/ x: T): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
index 9485dfccf42..fb1439c5050 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
@@ -6,7 +6,7 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @delegate:test.Anno() public final val property: kotlin.String
+    @delegate:test.Anno public final val property: kotlin.String
         public final fun <get-property>(): kotlin.String
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
index ee18c636f85..5927530358b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
@@ -6,7 +6,7 @@ public final annotation class Anno : kotlin.Annotation {
 
 public final class Class {
     /*primary*/ public constructor Class()
-    @field:test.Anno() public final var property: kotlin.Int
+    @field:test.Anno public final var property: kotlin.Int
         public final fun <get-property>(): kotlin.Int
         public final fun <set-property>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
index 32e3fe85237..85f13c92af7 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
@@ -2,12 +2,12 @@ package test
 
 public final class A {
     /*primary*/ public constructor A()
-    public final val @receiver:test.Ann() kotlin.String.myLength2: kotlin.Int
-        public final fun @receiver:test.Ann() kotlin.String.<get-myLength2>(): kotlin.Int
-    public final var @receiver:test.Ann() kotlin.String.myLength3: kotlin.Int
-        public final fun @receiver:test.Ann() kotlin.String.<get-myLength3>(): kotlin.Int
-        public final fun @receiver:test.Ann() kotlin.String.<set-myLength3>(/*0*/ v: kotlin.Int): kotlin.Unit
-    public final fun @receiver:test.Ann() kotlin.String.myLength(/*0*/ @test.Ann() q: kotlin.String): kotlin.Int
+    public final val @receiver:test.Ann kotlin.String.myLength2: kotlin.Int
+        public final fun @receiver:test.Ann kotlin.String.<get-myLength2>(): kotlin.Int
+    public final var @receiver:test.Ann kotlin.String.myLength3: kotlin.Int
+        public final fun @receiver:test.Ann kotlin.String.<get-myLength3>(): kotlin.Int
+        public final fun @receiver:test.Ann kotlin.String.<set-myLength3>(/*0*/ v: kotlin.Int): kotlin.Unit
+    public final fun @receiver:test.Ann kotlin.String.myLength(/*0*/ @test.Ann q: kotlin.String): kotlin.Int
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class Ann : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
index e39d2972542..faee360d600 100644
--- a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
+++ b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
@@ -5,5 +5,5 @@ public final annotation class Ann : kotlin.Annotation {
     public final val value: kotlin.String
         public final fun <get-value>(): kotlin.String
 }
-@test.Ann() public typealias A1 = kotlin.String
+@test.Ann public typealias A1 = kotlin.String
 @test.Ann(value = "OK") public typealias A2 = kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt
index 67983d0b703..befcc37228a 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterable</*0*/ T> {
-    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
-    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T>?): kotlin.Unit
+    @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+    @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt
index 21802d8aef6..b8033ebbaca 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterableWithConflict</*0*/ T> {
-    @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
+    @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt
index 85e8f1ba35c..4bdffe33d39 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterableWithNullability</*0*/ T> {
-    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>
-    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T>): kotlin.Unit
+    @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T>
+    @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T>): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt
index 3f6d83ef80b..f88919b6e0f 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt
@@ -3,10 +3,10 @@ package test
 public interface LoadIterableWithPropagation {
 
     public interface LoadIterable</*0*/ T> {
-        @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
-        @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
-        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
-        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T>?): kotlin.Unit
+        @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+        @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
+        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
+        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T>?): kotlin.Unit
     }
 
     public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T> {
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
index 1579aa531d9..9a92f8ee722 100644
--- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
+++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
@@ -8,7 +8,7 @@ public open class Impl : test.Trait {
 
 public open class Subclass : test.Impl {
     public constructor Subclass()
-    @java.lang.Override() public open override /*1*/ fun bar(): kotlin.String
+    @java.lang.Override public open override /*1*/ fun bar(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun foo(): kotlin.String
 }
 
diff --git a/compiler/testData/loadJava8/compiledJava/MapRemove.txt b/compiler/testData/loadJava8/compiledJava/MapRemove.txt
index 50f367b2af5..df6670556f2 100644
--- a/compiler/testData/loadJava8/compiledJava/MapRemove.txt
+++ b/compiler/testData/loadJava8/compiledJava/MapRemove.txt
@@ -17,7 +17,7 @@ public open class MapRemove {
         public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in K!, in V!>!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V?
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V!
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V!
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V!, /*2*/ p2: java.util.function.BiFunction<in V!, in V!, out V!>!): V!
         public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V?
@@ -44,7 +44,7 @@ public open class MapRemove {
         public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in kotlin.String!, in kotlin.Int!>!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String!): kotlin.Int?
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: java.util.function.BiFunction<in kotlin.Int!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Int?
@@ -71,7 +71,7 @@ public open class MapRemove {
         public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in kotlin.String!, in kotlin.Int!>!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String!): kotlin.Int?
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: java.util.function.BiFunction<in kotlin.Int!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Int?
@@ -79,7 +79,7 @@ public open class MapRemove {
         public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String!): kotlin.Int?
         public open fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Boolean
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Boolean
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!): kotlin.Int!
         public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.BiFunction<in kotlin.String!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Unit
diff --git a/compiler/testData/loadJava8/sourceJava/MapRemove.txt b/compiler/testData/loadJava8/sourceJava/MapRemove.txt
index ea998c934d1..512c7490c2a 100644
--- a/compiler/testData/loadJava8/sourceJava/MapRemove.txt
+++ b/compiler/testData/loadJava8/sourceJava/MapRemove.txt
@@ -17,7 +17,7 @@ public open class MapRemove {
         public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in K!, in V!>!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V?
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V!
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V!
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V!, /*2*/ p2: java.util.function.BiFunction<in V!, in V!, out V!>!): V!
         public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V?
@@ -44,7 +44,7 @@ public open class MapRemove {
         public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in kotlin.String!, in kotlin.Int!>!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String!): kotlin.Int?
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: java.util.function.BiFunction<in kotlin.Int!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Int?
@@ -71,7 +71,7 @@ public open class MapRemove {
         public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer<in kotlin.String!, in kotlin.Int!>!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String!): kotlin.Int?
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.Int!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: java.util.function.BiFunction<in kotlin.Int!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Int?
@@ -79,7 +79,7 @@ public open class MapRemove {
         public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!): kotlin.Int!
         public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String!): kotlin.Int?
         public open fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Boolean
-        @kotlin.internal.PlatformDependent() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Boolean
+        @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!): kotlin.Int!
         public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Int!, /*2*/ p2: kotlin.Int!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.BiFunction<in kotlin.String!, in kotlin.Int!, out kotlin.Int!>!): kotlin.Unit
diff --git a/compiler/testData/loadJava8/sourceJava/TypeAnnotations.txt b/compiler/testData/loadJava8/sourceJava/TypeAnnotations.txt
index 908be591bc4..d5160b844ee 100644
--- a/compiler/testData/loadJava8/sourceJava/TypeAnnotations.txt
+++ b/compiler/testData/loadJava8/sourceJava/TypeAnnotations.txt
@@ -15,7 +15,7 @@ public open class TypeAnnotations {
     }
 
     public interface MyClass</*0*/ TT : kotlin.Any!> {
-        public abstract fun f(/*0*/ p: test.TypeAnnotations.G2<@test.TypeAnnotations.A() kotlin.String!, @test.TypeAnnotations.A(value = "abc") kotlin.Int!>!): kotlin.Unit
-        public abstract fun f(/*0*/ p: test.TypeAnnotations.G<@test.TypeAnnotations.A() kotlin.String!>!): kotlin.Unit
+        public abstract fun f(/*0*/ p: test.TypeAnnotations.G2<@test.TypeAnnotations.A kotlin.String!, @test.TypeAnnotations.A(value = "abc") kotlin.Int!>!): kotlin.Unit
+        public abstract fun f(/*0*/ p: test.TypeAnnotations.G<@test.TypeAnnotations.A kotlin.String!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava8/sourceJava/TypeParameterAnnotations.txt b/compiler/testData/loadJava8/sourceJava/TypeParameterAnnotations.txt
index 2d5f7734808..879c43153af 100644
--- a/compiler/testData/loadJava8/sourceJava/TypeParameterAnnotations.txt
+++ b/compiler/testData/loadJava8/sourceJava/TypeParameterAnnotations.txt
@@ -8,7 +8,7 @@ public open class TypeParameterAnnotations {
         public final val value: kotlin.String
     }
 
-    public/*package*/ interface G</*0*/ @test.TypeParameterAnnotations.A() T : kotlin.Any!> {
+    public/*package*/ interface G</*0*/ @test.TypeParameterAnnotations.A T : kotlin.Any!> {
         public abstract fun </*0*/ @test.TypeParameterAnnotations.A(value = "abc") R : kotlin.Any!> foo(/*0*/ r: R!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/renderer/GlobalFunctions.kt b/compiler/testData/renderer/GlobalFunctions.kt
index 3c104bef0f8..bc3cf44439f 100644
--- a/compiler/testData/renderer/GlobalFunctions.kt
+++ b/compiler/testData/renderer/GlobalFunctions.kt
@@ -35,4 +35,4 @@ fun <P> funTypeParameterWithTwoUpperBounds() where P : Foo, P : Bar = 17
 //public interface Bar defined in rendererTest
 //public fun <P : rendererTest.Foo> funTypeParameterWithTwoUpperBounds(): kotlin.Int where P : rendererTest.Bar defined in rendererTest
 //<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
-//@kotlin.Deprecated public fun deprecatedFun(): kotlin.Unit defined in rendererTest
+//@kotlin.Deprecated(message = "") public fun deprecatedFun(): kotlin.Unit defined in rendererTest
diff --git a/compiler/testData/renderer/GlobalProperties.kt b/compiler/testData/renderer/GlobalProperties.kt
index 5f73f703d8d..6be5442f3dd 100644
--- a/compiler/testData/renderer/GlobalProperties.kt
+++ b/compiler/testData/renderer/GlobalProperties.kt
@@ -23,7 +23,7 @@ get() {}
 //private var private: kotlin.Int defined in rendererTest
 //public val kotlin.Int.ext: kotlin.Int defined in rendererTest
 //public fun kotlin.Int.<get-ext>(): kotlin.Int defined in rendererTest
-//@kotlin.Deprecated public val deprecatedVal: kotlin.Int defined in rendererTest
+//@kotlin.Deprecated(message = "") public val deprecatedVal: kotlin.Int defined in rendererTest
 //public val <T : kotlin.CharSequence> T.extWithTwoUpperBounds: kotlin.Int where T : kotlin.Number defined in rendererTest
 //<T : kotlin.CharSequence & kotlin.Number> defined in rendererTest.extWithTwoUpperBounds
 //public fun T.<get-extWithTwoUpperBounds>(): kotlin.Int defined in rendererTest
diff --git a/compiler/testData/renderer/TypeAnnotations.kt b/compiler/testData/renderer/TypeAnnotations.kt
new file mode 100644
index 00000000000..9c054ced0e9
--- /dev/null
+++ b/compiler/testData/renderer/TypeAnnotations.kt
@@ -0,0 +1,35 @@
+annotation class Ann1(val p1: Int, val p2: Int)
+annotation class Ann2
+annotation class Ann3(val p: Int)
+annotation class Ann4
+annotation class Ann5
+annotation class Ann6
+
+var v1: @Ann1(1, 2) String
+var v2: @Ann2 Int?
+var v3: @Ann3(0) (String, Int) -> Char
+var v4: @Ann4 X // currently annotations are lost for error types
+var v5: @Ann5() (String.() -> Unit)
+var v6: @Ann6() (() -> Unit)?
+
+//public final annotation class Ann1 : kotlin.Annotation defined in root package
+//public constructor Ann1(p1: kotlin.Int, p2: kotlin.Int) defined in Ann1
+//value-parameter p1: kotlin.Int defined in Ann1.<init>
+//value-parameter p2: kotlin.Int defined in Ann1.<init>
+//public final annotation class Ann2 : kotlin.Annotation defined in root package
+//public constructor Ann2() defined in Ann2
+//public final annotation class Ann3 : kotlin.Annotation defined in root package
+//public constructor Ann3(p: kotlin.Int) defined in Ann3
+//value-parameter p: kotlin.Int defined in Ann3.<init>
+//public final annotation class Ann4 : kotlin.Annotation defined in root package
+//public constructor Ann4() defined in Ann4
+//public final annotation class Ann5 : kotlin.Annotation defined in root package
+//public constructor Ann5() defined in Ann5
+//public final annotation class Ann6 : kotlin.Annotation defined in root package
+//public constructor Ann6() defined in Ann6
+//public var v1: @Ann1(p1 = 1, p2 = 2) kotlin.String defined in root package
+//public var v2: @Ann2 kotlin.Int? defined in root package
+//public var v3: @Ann3(p = 0) (kotlin.String, kotlin.Int) -> kotlin.Char defined in root package
+//public var v4: [ERROR : X] defined in root package
+//public var v5: @Ann5() (kotlin.String.() -> kotlin.Unit) defined in root package
+//public var v6: @Ann6() (() -> kotlin.Unit)? defined in root package
\ No newline at end of file
diff --git a/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt b/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt
index d20c75d598b..e33b7a0b1e8 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt
@@ -11,11 +11,11 @@ public final annotation class Bnno : kotlin.Annotation {
 }
 
 public final enum class Eee : kotlin.Enum<test.Eee> {
-    @test.Anno() enum entry Entry1
+    @test.Anno enum entry Entry1
 
     enum entry Entry2
 
-    @test.Anno(value = "3") @test.Bnno() enum entry Entry3
+    @test.Anno(value = "3") @test.Bnno enum entry Entry3
 
     @test.Anno(value = "4", x = 4) enum entry Entry4
 
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
index 100c97e7ed4..2acf18f4bee 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
@@ -5,11 +5,11 @@ public final annotation class AnnotationArray : kotlin.Annotation {
     public final val annotationArray: kotlin.Array<test.JustAnnotation>
 }
 
-@test.JustAnnotation(annotation = test.Empty()) @test.AnnotationArray(annotationArray = {}) public final class C1 {
+@test.JustAnnotation(annotation = test.Empty) @test.AnnotationArray(annotationArray = {}) public final class C1 {
     public constructor C1()
 }
 
-@test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Empty()), test.JustAnnotation(annotation = test.Empty())}) public final class C2 {
+@test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Empty), test.JustAnnotation(annotation = test.Empty)}) public final class C2 {
     public constructor C2()
 }
 
diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
index f47b0650133..04d634269ba 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+++ b/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
@@ -66,6 +66,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
             parameterNameRenderingPolicy = ParameterNameRenderingPolicy.NONE
             includePropertyConstant = false
             verbose = true
+            includeAnnotationArguments = true
             renderDefaultAnnotationArguments = true
             modifiers = DescriptorRendererModifier.ALL
         }
diff --git a/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
index 4109d5a0e2e..68cc5e1435e 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+++ b/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
@@ -143,6 +143,7 @@ abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment() {
         val renderer = DescriptorRenderer.withOptions {
             classifierNamePolicy = ClassifierNamePolicy.FULLY_QUALIFIED
             modifiers = DescriptorRendererModifier.ALL
+            includeAnnotationArguments = true
         }
         val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n")
 
diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
index 2f20ffb856b..6feeca1cf84 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
@@ -62,6 +62,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest
                 @Override
                 public Unit invoke(DescriptorRendererOptions options) {
                     options.setVerbose(true);
+                    options.setIncludeAnnotationArguments(true);
                     options.setClassifierNamePolicy(ClassifierNamePolicy.SHORT.INSTANCE);
                     options.setModifiers(DescriptorRendererModifier.ALL);
                     return Unit.INSTANCE;
diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
index 8e5e0ed0deb..c710596902e 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
@@ -56,6 +56,7 @@ public class RecursiveDescriptorComparator {
                     options.setIncludePropertyConstant(true);
                     options.setClassifierNamePolicy(ClassifierNamePolicy.FULLY_QUALIFIED.INSTANCE);
                     options.setVerbose(true);
+                    options.setIncludeAnnotationArguments(true);
                     options.setModifiers(DescriptorRendererModifier.ALL);
                     return Unit.INSTANCE;
                 }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java
index 50f32beea78..856d9811f5b 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java
@@ -55,6 +55,7 @@ public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithT
                                     options.setWithDefinedIn(false);
                                     options.setParameterNameRenderingPolicy(ParameterNameRenderingPolicy.NONE);
                                     options.setVerbose(true);
+                                    options.setIncludeAnnotationArguments(true);
                                     options.setExcludedAnnotationClasses(Collections.singleton(new FqName(Retention.class.getName())));
                                     options.setModifiers(DescriptorRendererModifier.ALL);
                                     return Unit.INSTANCE;
diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt
index 9490d6d5d39..039cf0337ae 100644
--- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt
@@ -57,6 +57,7 @@ abstract class AbstractFunctionDescriptorInExpressionRendererTest : KotlinTestWi
             classifierNamePolicy = ClassifierNamePolicy.FULLY_QUALIFIED
             modifiers = DescriptorRendererModifier.ALL
             verbose = true
+            includeAnnotationArguments = true
         }
         val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n")
 
diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java
index c6477749e55..28a51909b13 100644
--- a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java
@@ -107,6 +107,12 @@ public class DescriptorRendererTestGenerated extends AbstractDescriptorRendererT
         doTest(fileName);
     }
 
+    @TestMetadata("TypeAnnotations.kt")
+    public void testTypeAnnotations() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/TypeAnnotations.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("UnitType.kt")
     public void testUnitType() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt
index b4021cfbc49..c1a6470d054 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt
@@ -51,6 +51,7 @@ abstract class AbstractBuiltInsWithJDKMembersTest : KotlinTestWithEnvironment()
                     withDefinedIn = false
                     overrideRenderingPolicy = OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE
                     verbose = true
+                    includeAnnotationArguments = true
                     modifiers = DescriptorRendererModifier.ALL
                 })
 
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
index 27e99227db0..1f5e65d3c8f 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
@@ -73,6 +73,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment {
                                         options.setWithDefinedIn(false);
                                         options.setOverrideRenderingPolicy(OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE);
                                         options.setVerbose(true);
+                                        options.setIncludeAnnotationArguments(true);
                                         options.setModifiers(DescriptorRendererModifier.ALL);
                                         return Unit.INSTANCE;
                                     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
index 4623407c263..00a2d4a4daf 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
@@ -178,6 +178,7 @@ interface DescriptorRendererOptions {
     var textFormat: RenderingFormat
     var excludedAnnotationClasses: Set<FqName>
     var excludedTypeAnnotationClasses: Set<FqName>
+    var includeAnnotationArguments: Boolean
     var includePropertyConstant: Boolean
     var parameterNameRenderingPolicy: ParameterNameRenderingPolicy
     var withoutTypeParameters: Boolean
@@ -223,7 +224,9 @@ object ExcludedTypeAnnotations {
     val internalAnnotationsForResolve = setOf(
             FqName("kotlin.internal.NoInfer"),
             FqName("kotlin.internal.Exact"),
-            KotlinBuiltIns.FQ_NAMES.parameterName)
+            KotlinBuiltIns.FQ_NAMES.extensionFunctionType,
+            KotlinBuiltIns.FQ_NAMES.parameterName
+    )
 }
 
 enum class RenderingFormat {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 120b2c7d2d3..a3cfb7e88e9 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -175,6 +175,7 @@ internal class DescriptorRendererImpl(
             }
             return
         }
+
         if (type.isError) {
             renderDefaultType(type)
             return
@@ -227,7 +228,7 @@ internal class DescriptorRendererImpl(
     }
 
     private fun StringBuilder.renderDefaultType(type: KotlinType) {
-        renderAnnotations(type, this)
+        this.renderAnnotations(type)
 
         if (type.isError) {
             append(type.constructor.toString()) // Debug name of an error type is more informative
@@ -292,10 +293,25 @@ internal class DescriptorRendererImpl(
     }
 
     private fun StringBuilder.renderFunctionType(type: KotlinType) {
-        val isNullable = type.isMarkedNullable
-        if (isNullable) append("(")
+        val lengthBefore = length
+        renderAnnotations(type)
+        val hasAnnotations = length != lengthBefore
 
+        val isNullable = type.isMarkedNullable
         val receiverType = type.getReceiverTypeFromFunctionType()
+
+        val needParenthesis = isNullable || (hasAnnotations && receiverType != null)
+
+        if (needParenthesis && hasAnnotations) {
+            assert(last() == ' ')
+            if (get(lastIndex - 1) != ')') {
+                // last annotation rendered without parenthesis - need to add them otherwise parsing will be incorrect
+                insert(lastIndex, "()")
+            }
+        }
+
+        if (needParenthesis) append("(")
+
         if (receiverType != null) {
             val surroundReceiver = shouldRenderAsPrettyFunctionType(receiverType) && !receiverType.isMarkedNullable
             if (surroundReceiver) {
@@ -325,7 +341,9 @@ internal class DescriptorRendererImpl(
         append(") ").append(arrow()).append(" ")
         renderNormalizedType(type.getReturnTypeFromFunctionType())
 
-        if (isNullable) append(")?")
+        if (needParenthesis) append(")")
+
+        if (isNullable) append("?")
     }
 
 
@@ -346,27 +364,24 @@ internal class DescriptorRendererImpl(
             append(if (fqName.isRoot) "root package" else renderFqName(fqName))
         }
     }
-    private fun renderAnnotations(annotated: Annotated, builder: StringBuilder) {
+
+    private fun StringBuilder.renderAnnotations(annotated: Annotated) {
         if (DescriptorRendererModifier.ANNOTATIONS !in modifiers) return
 
         val excluded = if (annotated is KotlinType) excludedTypeAnnotationClasses else excludedAnnotationClasses
 
-        val annotationsBuilder = StringBuilder().apply {
-            // Sort is needed just to fix some order when annotations resolved from modifiers
-            // See AnnotationResolver.resolveAndAppendAnnotationsFromModifiers for clarification
-            // This hack can be removed when modifiers will be resolved without annotations
+        // Sort is needed just to fix some order when annotations resolved from modifiers
+        // See AnnotationResolver.resolveAndAppendAnnotationsFromModifiers for clarification
+        // This hack can be removed when modifiers will be resolved without annotations
 
-            val sortedAnnotations = annotated.annotations.getAllAnnotations()
-            for ((annotation, target) in sortedAnnotations) {
-                val annotationClass = annotation.type.constructor.declarationDescriptor as ClassDescriptor
+        val sortedAnnotations = annotated.annotations.getAllAnnotations()
+        for ((annotation, target) in sortedAnnotations) {
+            val annotationClass = annotation.type.constructor.declarationDescriptor as ClassDescriptor
 
-                if (!excluded.contains(DescriptorUtils.getFqNameSafe(annotationClass))) {
-                    append(renderAnnotation(annotation, target)).append(" ")
-                }
+            if (!excluded.contains(DescriptorUtils.getFqNameSafe(annotationClass))) {
+                append(renderAnnotation(annotation, target)).append(" ")
             }
         }
-
-        builder.append(annotationsBuilder)
     }
 
     override fun renderAnnotation(annotation: AnnotationDescriptor, target: AnnotationUseSiteTarget?): String {
@@ -377,12 +392,17 @@ internal class DescriptorRendererImpl(
             }
             val annotationType = annotation.type
             append(renderType(annotationType))
-            if (verbose) {
-                renderAndSortAnnotationArguments(annotation).joinTo(this, ", ", "(", ")")
-                if (annotationType.isError || annotationType.constructor.declarationDescriptor is NotFoundClasses.MockClassDescriptor) {
-                    append(" /* annotation class not found */")
+
+            if (includeAnnotationArguments) {
+                val arguments = renderAndSortAnnotationArguments(annotation)
+                if (arguments.isNotEmpty()) {
+                    arguments.joinTo(this, ", ", "(", ")")
                 }
             }
+
+            if (verbose && (annotationType.isError || annotationType.constructor.declarationDescriptor is NotFoundClasses.MockClassDescriptor)) {
+                append(" /* annotation class not found */")
+            }
         }
     }
 
@@ -526,7 +546,7 @@ internal class DescriptorRendererImpl(
             builder.append(renderKeyword(variance)).append(" ")
         }
 
-        renderAnnotations(typeParameter, builder)
+        builder.renderAnnotations(typeParameter)
 
         renderName(typeParameter, builder)
         val upperBoundsCount = typeParameter.upperBounds.size
@@ -588,7 +608,7 @@ internal class DescriptorRendererImpl(
     /* FUNCTIONS */
     private fun renderFunction(function: FunctionDescriptor, builder: StringBuilder) {
         if (!startFromName) {
-            renderAnnotations(function, builder)
+            builder.renderAnnotations(function)
             renderVisibility(function.visibility, builder)
             renderModalityForCallable(function, builder)
 
@@ -650,7 +670,7 @@ internal class DescriptorRendererImpl(
     }
 
     private fun renderConstructor(constructor: ConstructorDescriptor, builder: StringBuilder) {
-        renderAnnotations(constructor, builder)
+        builder.renderAnnotations(constructor)
         renderVisibility(constructor.visibility, builder)
         renderMemberKind(constructor, builder)
 
@@ -724,7 +744,7 @@ internal class DescriptorRendererImpl(
             builder.append("/*").append(valueParameter.index).append("*/ ")
         }
 
-        renderAnnotations(valueParameter, builder)
+        builder.renderAnnotations(valueParameter)
 
         if (valueParameter.isCrossinline) {
             builder.append("crossinline ")
@@ -781,7 +801,7 @@ internal class DescriptorRendererImpl(
 
     private fun renderProperty(property: PropertyDescriptor, builder: StringBuilder) {
         if (!startFromName) {
-            renderAnnotations(property, builder)
+            builder.renderAnnotations(property)
             renderVisibility(property.visibility, builder)
 
             if (property.isConst) {
@@ -816,7 +836,7 @@ internal class DescriptorRendererImpl(
     }
 
     private fun renderTypeAlias(typeAlias: TypeAliasDescriptor, builder: StringBuilder) {
-        renderAnnotations(typeAlias, builder)
+        builder.renderAnnotations(typeAlias)
         renderVisibility(typeAlias.visibility, builder)
         builder.append(renderKeyword("typealias")).append(" ")
         renderName(typeAlias, builder)
@@ -843,7 +863,7 @@ internal class DescriptorRendererImpl(
         val isEnumEntry = klass.kind == ClassKind.ENUM_ENTRY
 
         if (!startFromName) {
-            renderAnnotations(klass, builder)
+            builder.renderAnnotations(klass)
             if (!isEnumEntry) {
                 renderVisibility(klass.visibility, builder)
             }
@@ -874,7 +894,7 @@ internal class DescriptorRendererImpl(
             val primaryConstructor = klass.unsubstitutedPrimaryConstructor
             if (primaryConstructor != null) {
                 builder.append(" ")
-                renderAnnotations(primaryConstructor, builder)
+                builder.renderAnnotations(primaryConstructor)
                 renderVisibility(primaryConstructor.visibility, builder)
                 builder.append("constructor")
                 renderValueParameters(primaryConstructor.valueParameters, primaryConstructor.hasSynthesizedParameterNames(), builder)
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
index 3bc0b4958c8..ca4d529be27 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
@@ -97,6 +97,8 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
             ExcludedTypeAnnotations.annotationsForNullabilityAndMutability
                     + ExcludedTypeAnnotations.internalAnnotationsForResolve)
 
+    override var includeAnnotationArguments: Boolean by property(false)
+
     override var alwaysRenderModifiers by property(false)
 
     override var renderConstructorKeyword by property(true)
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
index f5ddb9bb130..c04df53254a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
@@ -39,6 +39,7 @@ public class MemberComparator implements Comparator<DeclarationDescriptor> {
                 public Unit invoke(DescriptorRendererOptions options) {
                     options.setWithDefinedIn(false);
                     options.setVerbose(true);
+                    options.setIncludeAnnotationArguments(true);
                     options.setModifiers(DescriptorRendererModifier.ALL);
                     return Unit.INSTANCE;
                 }
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
index 75cc9e53618..313c7551805 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
@@ -52,6 +52,7 @@ object IdeDescriptorRenderers {
         unitReturnType = false
         modifiers = DescriptorRendererModifier.ALL
         renderUnabbreviatedType = false
+        includeAnnotationArguments = true
     }
 
     @JvmField val SOURCE_CODE: DescriptorRenderer = BASE.withOptions {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt
index eefb50399eb..c7fdc9c26b8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt
@@ -39,7 +39,9 @@ fun DescriptorRendererOptions.defaultDecompilerRendererOptions() {
     classWithPrimaryConstructor = true
     secondaryConstructorsAsPrimary = false
     modifiers = DescriptorRendererModifier.ALL
-    excludedTypeAnnotationClasses = (ExcludedTypeAnnotations.annotationsForNullabilityAndMutability + KotlinBuiltIns.FQ_NAMES.parameterName).toSet()
+    excludedTypeAnnotationClasses = (ExcludedTypeAnnotations.annotationsForNullabilityAndMutability +
+                                     KotlinBuiltIns.FQ_NAMES.extensionFunctionType +
+                                     KotlinBuiltIns.FQ_NAMES.parameterName).toSet()
     alwaysRenderModifiers = true
     parameterNamesInFunctionalTypes = false // to support parameters names in decompiled text we need to load annotation arguments
 }