From 5dec5a4c282949e3528fabd65857cee42e1b6f5b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 26 Dec 2012 19:01:00 +0400
Subject: [PATCH] Regenerated all test data which uses NamespaceComparator.

---
 compiler/testData/builtin-classes.txt         | 2835 +++++++++--------
 .../DeeplyInnerClass_non_static.txt           |   25 +-
 .../staticMembers/DeeplyInnerClass_static.txt |    1 -
 .../staticMembers/Enum_non_static.txt         |   39 +-
 .../staticMembers/InnerClass_non_static.txt   |   11 +-
 .../staticMembers/InnerClass_static.txt       |    6 +-
 .../staticMembers/Simple_non_static.txt       |    6 +-
 .../staticMembers/Simple_static.txt           |    3 +-
 .../InnerClassNameClash.txt                   |   16 +-
 .../OverrideWithErrors.txt                    |   13 +-
 .../classObjectAnnotation.txt                 |   14 +-
 .../namespaceComparator/classObjectHeader.txt |   16 +-
 .../lazyResolve/namespaceComparator/enum.txt  |   39 +-
 .../fileDependencyRecursion.txt               |    5 +-
 .../namespaceComparator/genericFunction.txt   |    3 +-
 .../namespaceComparator/objectInClass.txt     |   13 +-
 .../namespaceComparator/objectMembers.txt     |    8 +-
 .../packageLevelObject.txt                    |    6 +-
 .../namespaceComparator/simpleClass.txt       |   36 +-
 .../namespaceComparator/varargIterator.txt    |    6 +-
 .../testData/loadJava/ArrayTypeVariance.txt   |    6 +-
 .../loadJava/ClassDoesNotOverrideMethod.txt   |   46 +-
 compiler/testData/loadJava/ClassWithTypeP.txt |    4 +-
 .../ClassWithTypePExtendsIterableP.txt        |    6 +-
 .../testData/loadJava/ClassWithTypePP.txt     |    4 +-
 .../loadJava/ClassWithTypePRefNext.txt        |    4 +-
 .../loadJava/ClassWithTypePRefSelf.txt        |    4 +-
 compiler/testData/loadJava/FieldAsVar.txt     |    6 +-
 .../testData/loadJava/FieldOfArrayType.txt    |    6 +-
 .../testData/loadJava/FinalFieldAsVal.txt     |    6 +-
 compiler/testData/loadJava/InnerClass.txt     |    9 +-
 .../loadJava/InnerClassReferencesOuterTP.txt  |    9 +-
 .../loadJava/InnerClassesInGeneric.txt        |   16 +-
 .../loadJava/MethodReferencesOuterClassTP.txt |   11 +-
 .../loadJava/MethodTypePOneUpperBound.txt     |    6 +-
 .../loadJava/MethodTypePTwoUpperBounds.txt    |    6 +-
 .../testData/loadJava/MethodWithTypeP.txt     |    6 +-
 .../testData/loadJava/MethodWithTypePP.txt    |    6 +-
 .../loadJava/MethodWithTypePRefClassP.txt     |    6 +-
 .../testData/loadJava/MethosWithPRefTP.txt    |    6 +-
 compiler/testData/loadJava/MyException.txt    |    4 +-
 .../RemoveRedundantProjectionKind.txt         |    6 +-
 compiler/testData/loadJava/Simple.txt         |    4 +-
 compiler/testData/loadJava/TwoFields.txt      |    8 +-
 .../testData/loadJava/UnboundWildcard.txt     |    9 +-
 .../annotation/AnnotatedAnnotation.txt        |    4 +-
 .../loadJava/annotation/AnnotatedMethod.txt   |    6 +-
 .../loadJava/annotation/SimpleAnnotation.txt  |    4 +-
 .../constructor/ConstructorGenericDeep.txt    |    4 +-
 .../constructor/ConstructorGenericSimple.txt  |    4 +-
 .../ConstructorGenericUpperBound.txt          |    4 +-
 .../javaBean/DifferentGetterAndSetter.txt     |    8 +-
 .../javaBean/JavaBeanAbstractGetter.txt       |    4 +-
 .../loadJava/javaBean/JavaBeanVal.txt         |    6 +-
 .../loadJava/javaBean/JavaBeanVar.txt         |    8 +-
 .../javaBean/JavaBeanVarOfGenericType.txt     |    8 +-
 .../testData/loadJava/javaBean/TwoSetters.txt |    8 +-
 .../loadJava/kotlinSignature/ArrayType.txt    |    6 +-
 .../ConstructorWithNewTypeParams.txt          |    4 +-
 .../ConstructorWithParentTypeParams.txt       |    4 +-
 .../ConstructorWithSeveralParams.txt          |    4 +-
 .../ConstructorWithoutParams.txt              |    4 +-
 .../kotlinSignature/CustomVariance.txt        |    6 +-
 .../MethodWithFunctionTypes.txt               |    6 +-
 .../kotlinSignature/MethodWithGenerics.txt    |    6 +-
 .../MethodWithMappedClasses.txt               |    6 +-
 .../MethodWithTypeParameters.txt              |    6 +-
 .../kotlinSignature/MethodWithVararg.txt      |    6 +-
 .../kotlinSignature/PropertyArrayTypes.txt    |   10 +-
 .../kotlinSignature/PropertyComplexTypes.txt  |   12 +-
 .../kotlinSignature/PropertySimpleType.txt    |    8 +-
 .../kotlinSignature/StarProjection.txt        |    9 +-
 .../error/AddingNullability.txt               |    6 +-
 .../error/ExplicitFieldGettersAndSetters.txt  |    6 +-
 .../kotlinSignature/error/ExtraUpperBound.txt |    6 +-
 .../error/MissingUpperBound.txt               |    6 +-
 .../kotlinSignature/error/NoFieldTypeRef.txt  |    6 +-
 .../error/NotVarargReplacedWithVararg.txt     |    6 +-
 .../error/ReturnTypeMissing.txt               |    6 +-
 .../kotlinSignature/error/SyntaxError.txt     |    6 +-
 .../error/SyntaxErrorInFieldAnnotation.txt    |    6 +-
 .../error/VarargReplacedWithNotVararg.txt     |    6 +-
 .../error/WrongFieldInitializer.txt           |    6 +-
 .../error/WrongFieldMutability.txt            |    8 +-
 .../kotlinSignature/error/WrongFieldName.txt  |    6 +-
 .../kotlinSignature/error/WrongMethodName.txt |    6 +-
 .../error/WrongReturnTypeStructure.txt        |    6 +-
 .../kotlinSignature/error/WrongTypeName1.txt  |    6 +-
 .../kotlinSignature/error/WrongTypeName2.txt  |    6 +-
 .../kotlinSignature/error/WrongTypeName3.txt  |    6 +-
 .../WrongTypeParameterBoundStructure1.txt     |    6 +-
 .../WrongTypeParameterBoundStructure2.txt     |    6 +-
 .../error/WrongTypeParametersCount.txt        |    6 +-
 .../error/WrongTypeVariance.txt               |    6 +-
 .../error/WrongValueParameterStructure1.txt   |    6 +-
 .../error/WrongValueParameterStructure2.txt   |    6 +-
 .../error/WrongValueParametersCount.txt       |    6 +-
 .../PropagateTypeArgumentNullable.txt         |   32 +-
 .../parameter/ChangeProjectionKind1.txt       |   12 +-
 .../parameter/ChangeProjectionKind2.txt       |   12 +-
 .../parameter/InheritMutability.txt           |   12 +-
 .../parameter/InheritNotVararg.txt            |   12 +-
 .../parameter/InheritNotVarargInteger.txt     |   12 +-
 .../parameter/InheritNotVarargNotNull.txt     |   12 +-
 .../parameter/InheritNotVarargPrimitive.txt   |   12 +-
 .../parameter/InheritNullability.txt          |   12 +-
 .../parameter/InheritProjectionKind.txt       |   12 +-
 .../parameter/InheritReadOnliness.txt         |   12 +-
 .../propagation/parameter/InheritVararg.txt   |   12 +-
 .../parameter/InheritVarargInteger.txt        |   12 +-
 .../parameter/InheritVarargNotNull.txt        |   12 +-
 .../parameter/InheritVarargPrimitive.txt      |   12 +-
 .../parameter/MutableToReadOnly.txt           |   12 +-
 .../parameter/NotNullToNullable.txt           |   12 +-
 .../parameter/NullableToNotNull.txt           |   12 +-
 .../NullableToNotNullKotlinSignature.txt      |   12 +-
 .../parameter/ReadOnlyToMutable.txt           |   12 +-
 .../return/AddNotNullJavaSubtype.txt          |   12 +-
 .../return/AddNotNullSameJavaType.txt         |   12 +-
 .../return/AddNullabilityJavaSubtype.txt      |   12 +-
 .../return/AddNullabilitySameGenericType1.txt |   12 +-
 .../return/AddNullabilitySameGenericType2.txt |   12 +-
 .../return/AddNullabilitySameJavaType.txt     |   12 +-
 .../return/CantMakeImmutableInSubclass.txt    |   12 +-
 .../return/HalfSubstitutedTypeParameters.txt  |   61 +-
 ...nheritNullabilityGenericSubclassSimple.txt |   12 +-
 .../return/InheritNullabilityJavaSubtype.txt  |   12 +-
 .../InheritNullabilitySameGenericType.txt     |   12 +-
 .../return/InheritNullabilitySameJavaType.txt |   12 +-
 .../return/InheritReadOnlinessOfArgument.txt  |   12 +-
 .../return/InheritReadOnlinessSameClass.txt   |   12 +-
 .../return/InheritReadOnlinessSubclass.txt    |   12 +-
 .../propagation/return/InheritVariance.txt    |   12 +-
 .../propagation/return/SameProjectionKind.txt |   12 +-
 .../return/SubclassOfCollection.txt           |   28 +-
 .../propagation/return/SubclassOfMapEntry.txt |    8 +-
 ...SuperclassesConflictingProjectionKinds.txt |   17 +-
 ...esInvariantAndCovariantInferMutability.txt |   17 +-
 ...sInvariantAndCovariantInferNullability.txt |   17 +-
 .../return/TwoSuperclassesMutableAndNot.txt   |   17 +-
 .../TwoSuperclassesReturnJavaSubtype.txt      |   17 +-
 .../TwoSuperclassesReturnSameJavaType.txt     |   17 +-
 .../TwoSuperclassesSupplementNotNull.txt      |   17 +-
 .../propagation/return/TypeParamOfClass.txt   |   12 +-
 .../return/TypeParamOfClassSubstituted.txt    |   12 +-
 .../propagation/return/TypeParamOfFun.txt     |   12 +-
 .../typeParameter/InheritMutability.txt       |   12 +-
 .../typeParameter/InheritNullability.txt      |   12 +-
 .../typeParameter/InheritReadOnliness.txt     |   12 +-
 .../propagation/typeParameter/TwoBounds.txt   |   12 +-
 .../typeParameter/TwoSuperclasses.txt         |   17 +-
 .../typeParameter/TwoTypeParameters.txt       |   12 +-
 .../UseParameterAsUpperBound.txt              |   12 +-
 .../UseParameterInUpperBound.txt              |   12 +-
 ...rameterInUpperBoundWithKotlinSignature.txt |   12 +-
 .../loadJava/library/LoadIterable.txt         |    6 +-
 .../loadJava/library/LoadIterator.txt         |    6 +-
 .../modality/ModalityOfFakeOverrides.txt      |   54 +-
 .../loadJava/notNull/NotNullField.txt         |    6 +-
 .../loadJava/notNull/NotNullMethod.txt        |    6 +-
 .../loadJava/notNull/NotNullParameter.txt     |    6 +-
 .../testData/loadJava/vararg/VarargInt.txt    |    6 +-
 .../testData/loadJava/vararg/VarargString.txt |    6 +-
 .../testData/loadJavaCustom/enum/expected.txt |   21 +-
 compiler/testData/loadJavaCustom/inner.txt    |    4 +-
 ...woSuperclassesInconsistentGenericTypes.txt |   16 +-
 .../TwoSuperclassesVarargAndNot.txt           |   19 +-
 .../packageLocalVisibility/expected.txt       |    6 +-
 .../rawSuperType/RawSuperType.txt             |   16 +-
 .../loadJavaCustom/staticFinal/expected.txt   |    3 +-
 .../SubclassWithRawType.txt                   |   40 +-
 .../subclassingKotlinInJava/expected.txt      |   13 +-
 compiler/testData/loadKotlin/class/Class.txt  |    4 +-
 .../loadKotlin/class/ClassInParam.txt         |    4 +-
 .../loadKotlin/class/ClassInnerClass.txt      |    9 +-
 .../loadKotlin/class/ClassOutParam.txt        |    4 +-
 .../testData/loadKotlin/class/ClassParam.txt  |    4 +-
 .../class/ClassParamReferencesParam.txt       |    4 +-
 .../class/ClassParamReferencesParam2.txt      |    4 +-
 .../class/ClassParamReferencesSelf.txt        |    7 +-
 .../class/ClassParamUpperClassBound.txt       |    4 +-
 .../ClassParamUpperClassInterfaceBound.txt    |    4 +-
 .../class/ClassParamUpperInterfaceBound.txt   |    4 +-
 .../ClassParamUpperInterfaceClassBound.txt    |    4 +-
 .../loadKotlin/class/ClassTwoParams.txt       |    4 +-
 .../loadKotlin/class/ClassTwoParams2.txt      |    4 +-
 .../EnumWithGenericConstructorParameter.txt   |   17 +-
 .../EnumWithPrimitiveConstructorParameter.txt |   17 +-
 .../loadKotlin/class/InheritClassSimple.txt   |    9 +-
 .../class/InheritClassWithParam.txt           |    9 +-
 .../class/InheritTraitWithParam.txt           |    7 +-
 .../testData/loadKotlin/class/InnerClass.txt  |    9 +-
 .../class/InnerClassExtendInnerClass.txt      |   14 +-
 .../testData/loadKotlin/class/NamedObject.txt |   10 +-
 .../class/NamedObjectInClassObject.txt        |   20 +-
 .../class/NamedObjectInNamedObject.txt        |   17 +-
 ...NamedObjectWithAnotherTopLevelProperty.txt |   12 +-
 compiler/testData/loadKotlin/class/Trait.txt  |    2 +-
 .../classFun/ClassInParamUsedInFun.txt        |    6 +-
 .../classFun/ClassParamUsedInFun.txt          |    6 +-
 .../classFun/FunDelegationToTraitImpl.txt     |   11 +-
 .../loadKotlin/classFun/FunInParamSuper.txt   |   13 +-
 .../loadKotlin/classFun/TraitFinalFun.txt     |    4 +-
 .../loadKotlin/classFun/TraitOpenFun.txt      |    4 +-
 .../classObject/ClassObjectDeclaresVal.txt    |   11 +-
 .../classObject/ClassObjectDeclaresVar.txt    |   11 +-
 .../classObject/ClassObjectExtendsTrait.txt   |   12 +-
 .../ClassObjectExtendsTraitWithTP.txt         |   12 +-
 .../classObject/SimpleClassObject.txt         |    9 +-
 .../loadKotlin/constructor/Constructor0.txt   |    4 +-
 .../loadKotlin/constructor/Constructor1.txt   |    4 +-
 .../Constructor1WithParamDefaultValue.txt     |    4 +-
 .../ConstructorCollectionParameter.txt        |    6 +-
 .../ConstructorWithTwoTypeParameters.txt      |    4 +-
 ...oTypeParametersAndOneIntValueParameter.txt |    4 +-
 ...TwoTypeParametersAndOnePValueParameter.txt |    4 +-
 .../ConstructorWithTypeParameter.txt          |    4 +-
 ...thTypeParametersEAndOnePValueParameter.txt |    4 +-
 .../loadKotlin/dataClass/MixedComponents.txt  |   14 +-
 .../loadKotlin/dataClass/NoComponents.txt     |    4 +-
 .../testData/loadKotlin/dataClass/OneVal.txt  |   10 +-
 .../loadKotlin/dataClass/OpenDataClass.txt    |   10 +-
 .../dataClass/OpenPropertyFinalComponent.txt  |   10 +-
 .../testData/loadKotlin/dataClass/TwoVals.txt |   14 +-
 .../testData/loadKotlin/dataClass/TwoVars.txt |   14 +-
 .../fun/PropagateSubclassOfComparable.txt     |    6 +-
 .../FunGenericParam.txt                       |    3 +-
 .../FunParamParam.txt                         |    3 +-
 .../FunParamParamErased.txt                   |    3 +-
 .../FunParamReferencesParam.txt               |    3 +-
 .../FunParamTwoUpperBounds.txt                |    7 +-
 .../FunParamUpperClassBound.txt               |    3 +-
 .../FunParamUpperClassInterfaceBound.txt      |    3 +-
 .../FunParamUpperInterfaceBound.txt           |    3 +-
 .../FunParamUpperInterfaceClassBound.txt      |    3 +-
 .../FunParamVaragParam.txt                    |    3 +-
 .../FunTwoTypeParams.txt                      |    3 +-
 .../FunClassParamNotNull.txt                  |    3 +-
 .../FunClassParamNullable.txt                 |    3 +-
 .../FunParamNullable.txt                      |    3 +-
 .../ReturnTypeClassParamNotNull.txt           |    3 +-
 .../ReturnTypeClassParamNullable.txt          |    3 +-
 .../loadKotlin/fun/nonGeneric/ClassFun.txt    |    6 +-
 .../fun/nonGeneric/ClassFunGetFoo.txt         |    6 +-
 .../fun/nonGeneric/ClassFunGetFooSetFoo.txt   |    8 +-
 .../fun/nonGeneric/ClassFunSetFoo.txt         |    6 +-
 .../loadKotlin/fun/nonGeneric/ExtFun.txt      |    3 +-
 .../fun/nonGeneric/ExtFunInClass.txt          |    6 +-
 .../fun/nonGeneric/FunDefaultArg.txt          |    3 +-
 .../fun/nonGeneric/FunParamNotNull.txt        |    3 +-
 .../fun/nonGeneric/FunVarargInt.txt           |    3 +-
 .../fun/nonGeneric/FunVarargInteger.txt       |    3 +-
 .../fun/nonGeneric/ModifierAbstract.txt       |    6 +-
 .../fun/nonGeneric/ModifierOpen.txt           |    6 +-
 .../loadKotlin/fun/nonGeneric/NsFun.txt       |    3 +-
 .../loadKotlin/fun/nonGeneric/NsFunGetFoo.txt |    3 +-
 .../fun/nonGeneric/ReturnTypeNotNull.txt      |    3 +-
 .../fun/nonGeneric/ReturnTypeNullable.txt     |    3 +-
 .../testData/loadKotlin/prop/ClassVal.txt     |    6 +-
 .../loadKotlin/prop/ClassValAbstract.txt      |    6 +-
 .../testData/loadKotlin/prop/ClassVar.txt     |    6 +-
 .../loadKotlin/prop/CollectionSize.txt        |    3 +-
 .../testData/loadKotlin/prop/ExtValClass.txt  |    3 +-
 .../loadKotlin/prop/ExtValInClass.txt         |    6 +-
 .../testData/loadKotlin/prop/ExtValInt.txt    |    3 +-
 .../loadKotlin/prop/ExtValIntCharSequence.txt |    3 +-
 .../prop/ExtValIntCharSequenceQ.txt           |    3 +-
 .../prop/ExtValIntListQOfIntInClass.txt       |    6 +-
 .../loadKotlin/prop/ExtValIntTInClass.txt     |    6 +-
 .../loadKotlin/prop/ExtValIntTQInClass.txt    |    6 +-
 .../loadKotlin/prop/ExtValTIntInClass.txt     |    6 +-
 .../testData/loadKotlin/prop/ExtVarClass.txt  |    3 +-
 .../loadKotlin/prop/ExtVarInClass.txt         |    6 +-
 .../testData/loadKotlin/prop/ExtVarInt.txt    |    3 +-
 .../loadKotlin/prop/ExtVarIntTInClass.txt     |    6 +-
 .../loadKotlin/prop/ExtVarIntTQInClass.txt    |    6 +-
 .../loadKotlin/prop/ExtVarMapPQInt.txt        |    3 +-
 .../loadKotlin/prop/ExtVarTIntInClass.txt     |    6 +-
 .../loadKotlin/prop/ExtVarTQIntInClass.txt    |    6 +-
 compiler/testData/loadKotlin/prop/ExtVarl.txt |    5 +-
 compiler/testData/loadKotlin/prop/NsVal.txt   |    3 +-
 compiler/testData/loadKotlin/prop/NsVar.txt   |    3 +-
 .../loadKotlin/prop/OverrideClassVal.txt      |   13 +-
 .../loadKotlin/prop/OverrideTraitVal.txt      |   11 +-
 .../loadKotlin/prop/PropFromSuperclass.txt    |   13 +-
 .../loadKotlin/prop/TraitFinalVar.txt         |    4 +-
 .../testData/loadKotlin/prop/TraitOpenVal.txt |    4 +-
 .../prop/VarDelegationToTraitImpl.txt         |   11 +-
 compiler/testData/loadKotlin/type/Any.txt     |    3 +-
 compiler/testData/loadKotlin/type/AnyQ.txt    |    3 +-
 .../loadKotlin/type/ArrayOfInNumber.txt       |    3 +-
 .../testData/loadKotlin/type/ArrayOfInt.txt   |    3 +-
 .../loadKotlin/type/ArrayOfInteger.txt        |    3 +-
 .../loadKotlin/type/ArrayOfOutNumber.txt      |    3 +-
 .../testData/loadKotlin/type/ArrayOfOutT.txt  |    3 +-
 .../loadKotlin/type/ArrayOfString.txt         |    3 +-
 .../loadKotlin/type/Function1IntString.txt    |    3 +-
 compiler/testData/loadKotlin/type/Int.txt     |    3 +-
 .../testData/loadKotlin/type/IntArray.txt     |    3 +-
 compiler/testData/loadKotlin/type/IntQ.txt    |    3 +-
 .../testData/loadKotlin/type/ListOfAny.txt    |    3 +-
 .../testData/loadKotlin/type/ListOfAnyQ.txt   |    3 +-
 .../testData/loadKotlin/type/ListOfStar.txt   |    3 +-
 .../testData/loadKotlin/type/ListOfString.txt |    3 +-
 .../loadKotlin/type/ListOfjlString.txt        |    3 +-
 compiler/testData/loadKotlin/type/Nothing.txt |    3 +-
 .../testData/loadKotlin/type/NothingQ.txt     |    3 +-
 compiler/testData/loadKotlin/type/String.txt  |    3 +-
 compiler/testData/loadKotlin/type/StringQ.txt |    3 +-
 compiler/testData/loadKotlin/type/Tuple0.txt  |    3 +-
 .../testData/loadKotlin/type/jlInteger.txt    |    3 +-
 .../testData/loadKotlin/type/jlIntegerQ.txt   |    3 +-
 .../testData/loadKotlin/type/jlNumber.txt     |    3 +-
 .../testData/loadKotlin/type/jlObject.txt     |    3 +-
 .../testData/loadKotlin/type/jlObjectQ.txt    |    3 +-
 .../testData/loadKotlin/type/jlString.txt     |    3 +-
 .../testData/loadKotlin/type/jlStringQ.txt    |    3 +-
 ...InternalAbstractTraitMembersOverridden.txt |   19 +-
 .../loadKotlin/visibility/InternalClass.txt   |    4 +-
 .../visibility/InternalConstructor.txt        |    4 +-
 .../visibility/InternalTopLevelMembers.txt    |    5 +-
 .../visibility/InternalTraitMembers.txt       |    8 +-
 .../InternalTraitMembersInherited.txt         |   19 +-
 .../loadKotlin/visibility/PrivateClass.txt    |    4 +-
 .../visibility/PrivateTopLevelFun.txt         |    3 +-
 .../visibility/PrivateTopLevelVal.txt         |    3 +-
 .../TopLevelVarWithPrivateSetter.txt          |    3 +-
 .../enum/enumVisibilityBinary.txt             |   59 +-
 .../enum/enumVisibilitySource.txt             |   86 +-
 .../loadKotlinCustom/enum/innerEnumBinary.txt |   29 +-
 .../innerEnumExistingClassObjectBinary.txt    |   29 +-
 .../innerEnumExistingClassObjectSource.txt    |   38 +-
 .../loadKotlinCustom/enum/innerEnumSource.txt |   38 +-
 .../enum/simpleEnumBinary.txt                 |   19 +-
 .../enum/simpleEnumSource.txt                 |   28 +-
 335 files changed, 3084 insertions(+), 2792 deletions(-)

diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index f80806eb6a2..20f59590fb7 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -1,1476 +1,1623 @@
 namespace jet
 
-public abstract trait jet.Annotation : jet.Any {
+public trait Annotation {
 }
-public open class jet.Any {
-    public final /*constructor*/ fun <init>(): jet.Any
+
+public open class Any {
+    public constructor Any()
 }
-public final class jet.Array</*0,r*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(/*0*/ size: jet.Int, /*1*/ init: jet.Function1<jet.Int, T>): jet.Array<T>
-    public final fun get(/*0*/ index: jet.Int): T
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.Iterator<T>
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: T): jet.Tuple0
-    public final val size: jet.Int
+
+public final class Array</*0*/ reified T> {
+    public constructor Array</*0*/ reified T>(/*0*/ size : jet.Int, /*1*/ init : (jet.Int) -> T)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : T
+    public final fun iterator() : jet.Iterator<T>
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : T) : Unit
 }
-public final class jet.Boolean : jet.Any {
-    public final /*constructor*/ fun <init>(): jet.Boolean
-    public final fun and(/*0*/ other: jet.Boolean): jet.Boolean
-    public final fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public final fun not(): jet.Boolean
-    public final fun or(/*0*/ other: jet.Boolean): jet.Boolean
-    public final fun xor(/*0*/ other: jet.Boolean): jet.Boolean
+
+public final class Boolean {
+    public constructor Boolean()
+    public final fun and(/*0*/ other : jet.Boolean) : jet.Boolean
+    public final fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public final fun not() : jet.Boolean
+    public final fun or(/*0*/ other : jet.Boolean) : jet.Boolean
+    public final fun xor(/*0*/ other : jet.Boolean) : jet.Boolean
 }
-public final class jet.BooleanArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.BooleanArray
-    public final fun get(/*0*/ index: jet.Int): jet.Boolean
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.BooleanIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Boolean): jet.Tuple0
-    public final val size: jet.Int
+
+public final class BooleanArray {
+    public constructor BooleanArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Boolean
+    public final fun iterator() : jet.BooleanIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Boolean) : Unit
 }
-public abstract trait jet.BooleanIterable : jet.Iterable<jet.Boolean> {
-    public abstract override /*1*/ fun iterator(): jet.BooleanIterator
+
+public trait BooleanIterable : jet.Iterable<jet.Boolean> {
+    public abstract override /*1*/ fun iterator() : jet.BooleanIterator
 }
-public abstract class jet.BooleanIterator : jet.Iterator<jet.Boolean> {
-    public final /*constructor*/ fun <init>(): jet.BooleanIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Boolean
-    public abstract fun nextBoolean(): jet.Boolean
+
+public abstract class BooleanIterator : jet.Iterator<jet.Boolean> {
+    public constructor BooleanIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Boolean
+    public abstract fun nextBoolean() : jet.Boolean
 }
-public final class jet.Byte : jet.Number, jet.Comparable<jet.Byte> {
-    public final /*constructor*/ fun <init>(): jet.Byte
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Byte
-    public final fun div(/*0*/ other: jet.Byte): jet.Int
-    public final fun div(/*0*/ other: jet.Char): jet.Int
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Float
-    public final fun div(/*0*/ other: jet.Int): jet.Int
-    public final fun div(/*0*/ other: jet.Long): jet.Long
-    public final fun div(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Byte
-    public final fun minus(): jet.Byte
-    public final fun minus(/*0*/ other: jet.Byte): jet.Int
-    public final fun minus(/*0*/ other: jet.Char): jet.Int
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Float
-    public final fun minus(/*0*/ other: jet.Int): jet.Int
-    public final fun minus(/*0*/ other: jet.Long): jet.Long
-    public final fun minus(/*0*/ other: jet.Short): jet.Int
-    public final fun mod(/*0*/ other: jet.Byte): jet.Int
-    public final fun mod(/*0*/ other: jet.Char): jet.Int
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Float
-    public final fun mod(/*0*/ other: jet.Int): jet.Int
-    public final fun mod(/*0*/ other: jet.Long): jet.Long
-    public final fun mod(/*0*/ other: jet.Short): jet.Int
-    public final fun plus(): jet.Byte
-    public final fun plus(/*0*/ other: jet.Byte): jet.Int
-    public final fun plus(/*0*/ other: jet.Char): jet.Int
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Float
-    public final fun plus(/*0*/ other: jet.Int): jet.Int
-    public final fun plus(/*0*/ other: jet.Long): jet.Long
-    public final fun plus(/*0*/ other: jet.Short): jet.Int
-    public final fun rangeTo(/*0*/ other: jet.Byte): jet.ByteRange
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.CharRange
-    public final fun rangeTo(/*0*/ other: jet.Double): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Float): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Int): jet.IntRange
-    public final fun rangeTo(/*0*/ other: jet.Long): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Short): jet.ShortRange
-    public final fun times(/*0*/ other: jet.Byte): jet.Int
-    public final fun times(/*0*/ other: jet.Char): jet.Int
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Float
-    public final fun times(/*0*/ other: jet.Int): jet.Int
-    public final fun times(/*0*/ other: jet.Long): jet.Long
-    public final fun times(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
+
+public final class Byte : jet.Number, jet.Comparable<jet.Byte> {
+    public constructor Byte()
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Byte
+    public final fun div(/*0*/ other : jet.Byte) : jet.Int
+    public final fun div(/*0*/ other : jet.Char) : jet.Int
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Float
+    public final fun div(/*0*/ other : jet.Int) : jet.Int
+    public final fun div(/*0*/ other : jet.Long) : jet.Long
+    public final fun div(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Byte
+    public final fun minus() : jet.Byte
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun minus(/*0*/ other : jet.Char) : jet.Int
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Float
+    public final fun minus(/*0*/ other : jet.Int) : jet.Int
+    public final fun minus(/*0*/ other : jet.Long) : jet.Long
+    public final fun minus(/*0*/ other : jet.Short) : jet.Int
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Int
+    public final fun mod(/*0*/ other : jet.Char) : jet.Int
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Float
+    public final fun mod(/*0*/ other : jet.Int) : jet.Int
+    public final fun mod(/*0*/ other : jet.Long) : jet.Long
+    public final fun mod(/*0*/ other : jet.Short) : jet.Int
+    public final fun plus() : jet.Byte
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun plus(/*0*/ other : jet.Char) : jet.Int
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Float
+    public final fun plus(/*0*/ other : jet.Int) : jet.Int
+    public final fun plus(/*0*/ other : jet.Long) : jet.Long
+    public final fun plus(/*0*/ other : jet.Short) : jet.Int
+    public final fun rangeTo(/*0*/ other : jet.Byte) : jet.ByteRange
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.CharRange
+    public final fun rangeTo(/*0*/ other : jet.Double) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Float) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Int) : jet.IntRange
+    public final fun rangeTo(/*0*/ other : jet.Long) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Short) : jet.ShortRange
+    public final fun times(/*0*/ other : jet.Byte) : jet.Int
+    public final fun times(/*0*/ other : jet.Char) : jet.Int
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Float
+    public final fun times(/*0*/ other : jet.Int) : jet.Int
+    public final fun times(/*0*/ other : jet.Long) : jet.Long
+    public final fun times(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
 }
-public final class jet.ByteArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.ByteArray
-    public final fun get(/*0*/ index: jet.Int): jet.Byte
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.ByteIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Byte): jet.Tuple0
-    public final val size: jet.Int
+
+public final class ByteArray {
+    public constructor ByteArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Byte
+    public final fun iterator() : jet.ByteIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Byte) : Unit
 }
-public abstract trait jet.ByteIterable : jet.Iterable<jet.Byte> {
-    public abstract override /*1*/ fun iterator(): jet.ByteIterator
+
+public trait ByteIterable : jet.Iterable<jet.Byte> {
+    public abstract override /*1*/ fun iterator() : jet.ByteIterator
 }
-public abstract class jet.ByteIterator : jet.Iterator<jet.Byte> {
-    public final /*constructor*/ fun <init>(): jet.ByteIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Byte
-    public abstract fun nextByte(): jet.Byte
+
+public abstract class ByteIterator : jet.Iterator<jet.Byte> {
+    public constructor ByteIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Byte
+    public abstract fun nextByte() : jet.Byte
 }
-public final class jet.ByteRange : jet.Range<jet.Byte>, jet.ByteIterable {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Byte, /*1*/ size: jet.Int): jet.ByteRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Byte): jet.Boolean
-    public final val end: jet.Byte
-    public final val isReversed: jet.Boolean
-    public open override /*1*/ fun iterator(): jet.ByteIterator
-    public final val iteratorStart: jet.Byte
-    public final val size: jet.Int
-    public final val start: jet.Byte
-    public final fun step(/*0*/ step: jet.Int): jet.ByteIterator
-    public final class object jet.ByteRange.<class-object-for-ByteRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.ByteRange.<class-object-for-ByteRange>
-        public final val EMPTY: jet.ByteRange
+
+public final class ByteRange : jet.Range<jet.Byte>, jet.ByteIterable {
+    public constructor ByteRange(/*0*/ start : jet.Byte, /*1*/ size : jet.Int)
+    public final val end : jet.Byte
+    public final val isReversed : jet.Boolean
+    public final val iteratorStart : jet.Byte
+    public final val size : jet.Int
+    public final val start : jet.Byte
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Byte) : jet.Boolean
+    public open override /*1*/ fun iterator() : jet.ByteIterator
+    public final fun step(/*0*/ step : jet.Int) : jet.ByteIterator
+    
+    public class object <class-object-for-ByteRange> {
+        private constructor <class-object-for-ByteRange>()
+        public final val EMPTY : jet.ByteRange
     }
 }
-public final class jet.Char : jet.Number, jet.Comparable<jet.Char> {
-    public final /*constructor*/ fun <init>(): jet.Char
-    public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Char
-    public final fun div(/*0*/ other: jet.Byte): jet.Int
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Float
-    public final fun div(/*0*/ other: jet.Int): jet.Int
-    public final fun div(/*0*/ other: jet.Long): jet.Long
-    public final fun div(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Char
-    public final fun minus(): jet.Int
-    public final fun minus(/*0*/ other: jet.Byte): jet.Int
-    public final fun minus(/*0*/ other: jet.Char): jet.Int
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Float
-    public final fun minus(/*0*/ other: jet.Int): jet.Int
-    public final fun minus(/*0*/ other: jet.Long): jet.Long
-    public final fun minus(/*0*/ other: jet.Short): jet.Int
-    public final fun mod(/*0*/ other: jet.Byte): jet.Int
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Float
-    public final fun mod(/*0*/ other: jet.Int): jet.Int
-    public final fun mod(/*0*/ other: jet.Long): jet.Long
-    public final fun mod(/*0*/ other: jet.Short): jet.Int
-    public final fun plus(): jet.Int
-    public final fun plus(/*0*/ other: jet.Byte): jet.Int
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Float
-    public final fun plus(/*0*/ other: jet.Int): jet.Int
-    public final fun plus(/*0*/ other: jet.Long): jet.Long
-    public final fun plus(/*0*/ other: jet.Short): jet.Int
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.CharRange
-    public final fun times(/*0*/ other: jet.Byte): jet.Int
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Float
-    public final fun times(/*0*/ other: jet.Int): jet.Int
-    public final fun times(/*0*/ other: jet.Long): jet.Long
-    public final fun times(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
+
+public final class Char : jet.Number, jet.Comparable<jet.Char> {
+    public constructor Char()
+    public final fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Char
+    public final fun div(/*0*/ other : jet.Byte) : jet.Int
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Float
+    public final fun div(/*0*/ other : jet.Int) : jet.Int
+    public final fun div(/*0*/ other : jet.Long) : jet.Long
+    public final fun div(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Char
+    public final fun minus() : jet.Int
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun minus(/*0*/ other : jet.Char) : jet.Int
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Float
+    public final fun minus(/*0*/ other : jet.Int) : jet.Int
+    public final fun minus(/*0*/ other : jet.Long) : jet.Long
+    public final fun minus(/*0*/ other : jet.Short) : jet.Int
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Int
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Float
+    public final fun mod(/*0*/ other : jet.Int) : jet.Int
+    public final fun mod(/*0*/ other : jet.Long) : jet.Long
+    public final fun mod(/*0*/ other : jet.Short) : jet.Int
+    public final fun plus() : jet.Int
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Float
+    public final fun plus(/*0*/ other : jet.Int) : jet.Int
+    public final fun plus(/*0*/ other : jet.Long) : jet.Long
+    public final fun plus(/*0*/ other : jet.Short) : jet.Int
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.CharRange
+    public final fun times(/*0*/ other : jet.Byte) : jet.Int
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Float
+    public final fun times(/*0*/ other : jet.Int) : jet.Int
+    public final fun times(/*0*/ other : jet.Long) : jet.Long
+    public final fun times(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
 }
-public final class jet.CharArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.CharArray
-    public final fun get(/*0*/ index: jet.Int): jet.Char
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.CharIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Char): jet.Tuple0
-    public final val size: jet.Int
+
+public final class CharArray {
+    public constructor CharArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Char
+    public final fun iterator() : jet.CharIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Char) : Unit
 }
-public abstract trait jet.CharIterable : jet.Iterable<jet.Char> {
-    public abstract override /*1*/ fun iterator(): jet.CharIterator
+
+public trait CharIterable : jet.Iterable<jet.Char> {
+    public abstract override /*1*/ fun iterator() : jet.CharIterator
 }
-public abstract class jet.CharIterator : jet.Iterator<jet.Char> {
-    public final /*constructor*/ fun <init>(): jet.CharIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Char
-    public abstract fun nextChar(): jet.Char
+
+public abstract class CharIterator : jet.Iterator<jet.Char> {
+    public constructor CharIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Char
+    public abstract fun nextChar() : jet.Char
 }
-public final class jet.CharRange : jet.Range<jet.Char>, jet.CharIterable {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Char, /*1*/ size: jet.Int): jet.CharRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Char): jet.Boolean
-    public final val end: jet.Char
-    public final val isReversed: jet.Boolean
-    public open override /*1*/ fun iterator(): jet.CharIterator
-    public final val iteratorStart: jet.Char
-    public final val size: jet.Int
-    public final val start: jet.Char
-    public final fun step(/*0*/ step: jet.Int): jet.CharIterator
-    public final class object jet.CharRange.<class-object-for-CharRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.CharRange.<class-object-for-CharRange>
-        public final val EMPTY: jet.CharRange
+
+public final class CharRange : jet.Range<jet.Char>, jet.CharIterable {
+    public constructor CharRange(/*0*/ start : jet.Char, /*1*/ size : jet.Int)
+    public final val end : jet.Char
+    public final val isReversed : jet.Boolean
+    public final val iteratorStart : jet.Char
+    public final val size : jet.Int
+    public final val start : jet.Char
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Char) : jet.Boolean
+    public open override /*1*/ fun iterator() : jet.CharIterator
+    public final fun step(/*0*/ step : jet.Int) : jet.CharIterator
+    
+    public class object <class-object-for-CharRange> {
+        private constructor <class-object-for-CharRange>()
+        public final val EMPTY : jet.CharRange
     }
 }
-public abstract trait jet.CharSequence : jet.Any {
-    public abstract fun get(/*0*/ index: jet.Int): jet.Char
-    public abstract val length: jet.Int
-    public abstract fun toString(): jet.String
+
+public trait CharSequence {
+    public abstract val length : jet.Int
+    public abstract fun get(/*0*/ index : jet.Int) : jet.Char
+    public abstract fun toString() : jet.String
 }
-public abstract trait jet.Collection</*0*/ out E : jet.Any?> : jet.Iterable<E>, jet.Hashable {
-    public abstract fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract fun isEmpty(): jet.Boolean
-    public abstract override /*1*/ fun iterator(): jet.Iterator<E>
-    public abstract fun size(): jet.Int
-    public abstract fun toArray(): jet.Array<jet.Any?>
-    public abstract fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+
+public trait Collection</*0*/ out E> : jet.Iterable<E>, jet.Hashable {
+    public abstract fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract fun isEmpty() : jet.Boolean
+    public abstract override /*1*/ fun iterator() : jet.Iterator<E>
+    public abstract fun size() : jet.Int
+    public abstract fun toArray() : jet.Array<jet.Any?>
+    public abstract fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }
-public abstract trait jet.Comparable</*0*/ in T : jet.Any?> : jet.Any {
-    public abstract fun compareTo(/*0*/ other: T): jet.Int
+
+public trait Comparable</*0*/ in T> {
+    public abstract fun compareTo(/*0*/ other : T) : jet.Int
 }
-public final class jet.Double : jet.Number, jet.Comparable<jet.Double> {
-    public final /*constructor*/ fun <init>(): jet.Double
-    public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Double
-    public final fun div(/*0*/ other: jet.Byte): jet.Double
-    public final fun div(/*0*/ other: jet.Char): jet.Double
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Double
-    public final fun div(/*0*/ other: jet.Int): jet.Double
-    public final fun div(/*0*/ other: jet.Long): jet.Double
-    public final fun div(/*0*/ other: jet.Short): jet.Double
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Double
-    public final fun minus(): jet.Double
-    public final fun minus(/*0*/ other: jet.Byte): jet.Double
-    public final fun minus(/*0*/ other: jet.Char): jet.Double
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Double
-    public final fun minus(/*0*/ other: jet.Int): jet.Double
-    public final fun minus(/*0*/ other: jet.Long): jet.Double
-    public final fun minus(/*0*/ other: jet.Short): jet.Double
-    public final fun mod(/*0*/ other: jet.Byte): jet.Double
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Double
-    public final fun mod(/*0*/ other: jet.Int): jet.Double
-    public final fun mod(/*0*/ other: jet.Long): jet.Double
-    public final fun mod(/*0*/ other: jet.Short): jet.Double
-    public final fun plus(): jet.Double
-    public final fun plus(/*0*/ other: jet.Byte): jet.Double
-    public final fun plus(/*0*/ other: jet.Char): jet.Double
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Double
-    public final fun plus(/*0*/ other: jet.Int): jet.Double
-    public final fun plus(/*0*/ other: jet.Long): jet.Double
-    public final fun plus(/*0*/ other: jet.Short): jet.Double
-    public final fun rangeTo(/*0*/ other: jet.Byte): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Double): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Float): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Int): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Long): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Short): jet.DoubleRange
-    public final fun times(/*0*/ other: jet.Byte): jet.Double
-    public final fun times(/*0*/ other: jet.Char): jet.Double
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Double
-    public final fun times(/*0*/ other: jet.Int): jet.Double
-    public final fun times(/*0*/ other: jet.Long): jet.Double
-    public final fun times(/*0*/ other: jet.Short): jet.Double
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
+
+public final class Double : jet.Number, jet.Comparable<jet.Double> {
+    public constructor Double()
+    public final fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Double
+    public final fun div(/*0*/ other : jet.Byte) : jet.Double
+    public final fun div(/*0*/ other : jet.Char) : jet.Double
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Double
+    public final fun div(/*0*/ other : jet.Int) : jet.Double
+    public final fun div(/*0*/ other : jet.Long) : jet.Double
+    public final fun div(/*0*/ other : jet.Short) : jet.Double
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Double
+    public final fun minus() : jet.Double
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Double
+    public final fun minus(/*0*/ other : jet.Char) : jet.Double
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Double
+    public final fun minus(/*0*/ other : jet.Int) : jet.Double
+    public final fun minus(/*0*/ other : jet.Long) : jet.Double
+    public final fun minus(/*0*/ other : jet.Short) : jet.Double
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Double
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Double
+    public final fun mod(/*0*/ other : jet.Int) : jet.Double
+    public final fun mod(/*0*/ other : jet.Long) : jet.Double
+    public final fun mod(/*0*/ other : jet.Short) : jet.Double
+    public final fun plus() : jet.Double
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Double
+    public final fun plus(/*0*/ other : jet.Char) : jet.Double
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Double
+    public final fun plus(/*0*/ other : jet.Int) : jet.Double
+    public final fun plus(/*0*/ other : jet.Long) : jet.Double
+    public final fun plus(/*0*/ other : jet.Short) : jet.Double
+    public final fun rangeTo(/*0*/ other : jet.Byte) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Double) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Float) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Int) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Long) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Short) : jet.DoubleRange
+    public final fun times(/*0*/ other : jet.Byte) : jet.Double
+    public final fun times(/*0*/ other : jet.Char) : jet.Double
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Double
+    public final fun times(/*0*/ other : jet.Int) : jet.Double
+    public final fun times(/*0*/ other : jet.Long) : jet.Double
+    public final fun times(/*0*/ other : jet.Short) : jet.Double
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
 }
-public final class jet.DoubleArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.DoubleArray
-    public final fun get(/*0*/ index: jet.Int): jet.Double
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.DoubleIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Double): jet.Tuple0
-    public final val size: jet.Int
+
+public final class DoubleArray {
+    public constructor DoubleArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Double
+    public final fun iterator() : jet.DoubleIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Double) : Unit
 }
-public abstract trait jet.DoubleIterable : jet.Iterable<jet.Double> {
-    public abstract override /*1*/ fun iterator(): jet.DoubleIterator
+
+public trait DoubleIterable : jet.Iterable<jet.Double> {
+    public abstract override /*1*/ fun iterator() : jet.DoubleIterator
 }
-public abstract class jet.DoubleIterator : jet.Iterator<jet.Double> {
-    public final /*constructor*/ fun <init>(): jet.DoubleIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Double
-    public abstract fun nextDouble(): jet.Double
+
+public abstract class DoubleIterator : jet.Iterator<jet.Double> {
+    public constructor DoubleIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Double
+    public abstract fun nextDouble() : jet.Double
 }
-public final class jet.DoubleRange : jet.Range<jet.Double> {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Double, /*1*/ size: jet.Double): jet.DoubleRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Double): jet.Boolean
-    public final val end: jet.Double
-    public final val isReversed: jet.Boolean
-    public final val size: jet.Double
-    public final val start: jet.Double
-    public final fun step(/*0*/ step: jet.Double): jet.DoubleIterator
-    public final class object jet.DoubleRange.<class-object-for-DoubleRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.DoubleRange.<class-object-for-DoubleRange>
-        public final val EMPTY: jet.DoubleRange
+
+public final class DoubleRange : jet.Range<jet.Double> {
+    public constructor DoubleRange(/*0*/ start : jet.Double, /*1*/ size : jet.Double)
+    public final val end : jet.Double
+    public final val isReversed : jet.Boolean
+    public final val size : jet.Double
+    public final val start : jet.Double
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Double) : jet.Boolean
+    public final fun step(/*0*/ step : jet.Double) : jet.DoubleIterator
+    
+    public class object <class-object-for-DoubleRange> {
+        private constructor <class-object-for-DoubleRange>()
+        public final val EMPTY : jet.DoubleRange
     }
 }
-public abstract class jet.Enum</*0*/ E : jet.Enum<E>> : jet.Any {
-    public final /*constructor*/ fun </*0*/ E : jet.Enum<E>><init>(/*0*/ name: jet.String, /*1*/ ordinal: jet.Int): jet.Enum<E>
-    public final fun name(): jet.String
-    public final fun ordinal(): jet.Int
+
+public abstract class Enum</*0*/ E : jet.Enum<E>> {
+    public constructor Enum</*0*/ E : jet.Enum<E>>(/*0*/ name : jet.String, /*1*/ ordinal : jet.Int)
+    public final fun name() : jet.String
+    public final fun ordinal() : jet.Int
 }
-public abstract class jet.ExtensionFunction0</*0*/ in T : jet.Any?, /*1*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ out R : jet.Any?><init>(): jet.ExtensionFunction0<T, R>
-    public abstract fun T.invoke(): R
+
+public abstract class ExtensionFunction0</*0*/ in T, /*1*/ out R> {
+    public constructor ExtensionFunction0</*0*/ in T, /*1*/ out R>()
+    public abstract fun T.invoke() : R
 }
-public abstract class jet.ExtensionFunction1</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ out R : jet.Any?><init>(): jet.ExtensionFunction1<T, P1, R>
-    public abstract fun T.invoke(/*0*/ p1: P1): R
+
+public abstract class ExtensionFunction1</*0*/ in T, /*1*/ in P1, /*2*/ out R> {
+    public constructor ExtensionFunction1</*0*/ in T, /*1*/ in P1, /*2*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1) : R
 }
-public abstract class jet.ExtensionFunction10</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ out R : jet.Any?><init>(): jet.ExtensionFunction10<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R
+
+public abstract class ExtensionFunction10</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ out R> {
+    public constructor ExtensionFunction10</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10) : R
 }
-public abstract class jet.ExtensionFunction11</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ out R : jet.Any?><init>(): jet.ExtensionFunction11<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R
+
+public abstract class ExtensionFunction11</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ out R> {
+    public constructor ExtensionFunction11</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11) : R
 }
-public abstract class jet.ExtensionFunction12</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ out R : jet.Any?><init>(): jet.ExtensionFunction12<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R
+
+public abstract class ExtensionFunction12</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ out R> {
+    public constructor ExtensionFunction12</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12) : R
 }
-public abstract class jet.ExtensionFunction13</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ out R : jet.Any?><init>(): jet.ExtensionFunction13<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R
+
+public abstract class ExtensionFunction13</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ out R> {
+    public constructor ExtensionFunction13</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13) : R
 }
-public abstract class jet.ExtensionFunction14</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ out R : jet.Any?><init>(): jet.ExtensionFunction14<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R
+
+public abstract class ExtensionFunction14</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ out R> {
+    public constructor ExtensionFunction14</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14) : R
 }
-public abstract class jet.ExtensionFunction15</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ out R : jet.Any?><init>(): jet.ExtensionFunction15<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R
+
+public abstract class ExtensionFunction15</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ out R> {
+    public constructor ExtensionFunction15</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15) : R
 }
-public abstract class jet.ExtensionFunction16</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ out R : jet.Any?><init>(): jet.ExtensionFunction16<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R
+
+public abstract class ExtensionFunction16</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ out R> {
+    public constructor ExtensionFunction16</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16) : R
 }
-public abstract class jet.ExtensionFunction17</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ out R : jet.Any?><init>(): jet.ExtensionFunction17<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R
+
+public abstract class ExtensionFunction17</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ out R> {
+    public constructor ExtensionFunction17</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17) : R
 }
-public abstract class jet.ExtensionFunction18</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ out R : jet.Any?><init>(): jet.ExtensionFunction18<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R
+
+public abstract class ExtensionFunction18</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ out R> {
+    public constructor ExtensionFunction18</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18) : R
 }
-public abstract class jet.ExtensionFunction19</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ out R : jet.Any?><init>(): jet.ExtensionFunction19<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R
+
+public abstract class ExtensionFunction19</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ out R> {
+    public constructor ExtensionFunction19</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19) : R
 }
-public abstract class jet.ExtensionFunction2</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ out R : jet.Any?><init>(): jet.ExtensionFunction2<T, P1, P2, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2): R
+
+public abstract class ExtensionFunction2</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ out R> {
+    public constructor ExtensionFunction2</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2) : R
 }
-public abstract class jet.ExtensionFunction20</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ in P20 : jet.Any?, /*21*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ in P20 : jet.Any?, /*21*/ out R : jet.Any?><init>(): jet.ExtensionFunction20<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R
+
+public abstract class ExtensionFunction20</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ out R> {
+    public constructor ExtensionFunction20</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19, /*19*/ p20 : P20) : R
 }
-public abstract class jet.ExtensionFunction21</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ in P20 : jet.Any?, /*21*/ in P21 : jet.Any?, /*22*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ in P20 : jet.Any?, /*21*/ in P21 : jet.Any?, /*22*/ out R : jet.Any?><init>(): jet.ExtensionFunction21<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R
+
+public abstract class ExtensionFunction21</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ out R> {
+    public constructor ExtensionFunction21</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19, /*19*/ p20 : P20, /*20*/ p21 : P21) : R
 }
-public abstract class jet.ExtensionFunction22</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ in P20 : jet.Any?, /*21*/ in P21 : jet.Any?, /*22*/ in P22 : jet.Any?, /*23*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ in P10 : jet.Any?, /*11*/ in P11 : jet.Any?, /*12*/ in P12 : jet.Any?, /*13*/ in P13 : jet.Any?, /*14*/ in P14 : jet.Any?, /*15*/ in P15 : jet.Any?, /*16*/ in P16 : jet.Any?, /*17*/ in P17 : jet.Any?, /*18*/ in P18 : jet.Any?, /*19*/ in P19 : jet.Any?, /*20*/ in P20 : jet.Any?, /*21*/ in P21 : jet.Any?, /*22*/ in P22 : jet.Any?, /*23*/ out R : jet.Any?><init>(): jet.ExtensionFunction22<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R
+
+public abstract class ExtensionFunction22</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ in P22, /*23*/ out R> {
+    public constructor ExtensionFunction22</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ in P22, /*23*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19, /*19*/ p20 : P20, /*20*/ p21 : P21, /*21*/ p22 : P22) : R
 }
-public abstract class jet.ExtensionFunction3</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ out R : jet.Any?><init>(): jet.ExtensionFunction3<T, P1, P2, P3, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R
+
+public abstract class ExtensionFunction3</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ out R> {
+    public constructor ExtensionFunction3</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3) : R
 }
-public abstract class jet.ExtensionFunction4</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ out R : jet.Any?><init>(): jet.ExtensionFunction4<T, P1, P2, P3, P4, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R
+
+public abstract class ExtensionFunction4</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ out R> {
+    public constructor ExtensionFunction4</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4) : R
 }
-public abstract class jet.ExtensionFunction5</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ out R : jet.Any?><init>(): jet.ExtensionFunction5<T, P1, P2, P3, P4, P5, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R
+
+public abstract class ExtensionFunction5</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ out R> {
+    public constructor ExtensionFunction5</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5) : R
 }
-public abstract class jet.ExtensionFunction6</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ out R : jet.Any?><init>(): jet.ExtensionFunction6<T, P1, P2, P3, P4, P5, P6, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R
+
+public abstract class ExtensionFunction6</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ out R> {
+    public constructor ExtensionFunction6</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6) : R
 }
-public abstract class jet.ExtensionFunction7</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ out R : jet.Any?><init>(): jet.ExtensionFunction7<T, P1, P2, P3, P4, P5, P6, P7, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R
+
+public abstract class ExtensionFunction7</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ out R> {
+    public constructor ExtensionFunction7</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7) : R
 }
-public abstract class jet.ExtensionFunction8</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ out R : jet.Any?><init>(): jet.ExtensionFunction8<T, P1, P2, P3, P4, P5, P6, P7, P8, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R
+
+public abstract class ExtensionFunction8</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ out R> {
+    public constructor ExtensionFunction8</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8) : R
 }
-public abstract class jet.ExtensionFunction9</*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?, /*1*/ in P1 : jet.Any?, /*2*/ in P2 : jet.Any?, /*3*/ in P3 : jet.Any?, /*4*/ in P4 : jet.Any?, /*5*/ in P5 : jet.Any?, /*6*/ in P6 : jet.Any?, /*7*/ in P7 : jet.Any?, /*8*/ in P8 : jet.Any?, /*9*/ in P9 : jet.Any?, /*10*/ out R : jet.Any?><init>(): jet.ExtensionFunction9<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, R>
-    public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R
+
+public abstract class ExtensionFunction9</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ out R> {
+    public constructor ExtensionFunction9</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ out R>()
+    public abstract fun T.invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9) : R
 }
-public final class jet.Float : jet.Number, jet.Comparable<jet.Float> {
-    public final /*constructor*/ fun <init>(): jet.Float
-    public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Float
-    public final fun div(/*0*/ other: jet.Byte): jet.Float
-    public final fun div(/*0*/ other: jet.Char): jet.Float
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Float
-    public final fun div(/*0*/ other: jet.Int): jet.Float
-    public final fun div(/*0*/ other: jet.Long): jet.Float
-    public final fun div(/*0*/ other: jet.Short): jet.Float
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Float
-    public final fun minus(): jet.Float
-    public final fun minus(/*0*/ other: jet.Byte): jet.Float
-    public final fun minus(/*0*/ other: jet.Char): jet.Float
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Float
-    public final fun minus(/*0*/ other: jet.Int): jet.Float
-    public final fun minus(/*0*/ other: jet.Long): jet.Float
-    public final fun minus(/*0*/ other: jet.Short): jet.Float
-    public final fun mod(/*0*/ other: jet.Byte): jet.Float
-    public final fun mod(/*0*/ other: jet.Char): jet.Float
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Float
-    public final fun mod(/*0*/ other: jet.Int): jet.Float
-    public final fun mod(/*0*/ other: jet.Long): jet.Float
-    public final fun mod(/*0*/ other: jet.Short): jet.Float
-    public final fun plus(): jet.Float
-    public final fun plus(/*0*/ other: jet.Byte): jet.Float
-    public final fun plus(/*0*/ other: jet.Char): jet.Float
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Float
-    public final fun plus(/*0*/ other: jet.Int): jet.Float
-    public final fun plus(/*0*/ other: jet.Long): jet.Float
-    public final fun plus(/*0*/ other: jet.Short): jet.Float
-    public final fun rangeTo(/*0*/ other: jet.Byte): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Double): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Float): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Int): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Long): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Short): jet.FloatRange
-    public final fun times(/*0*/ other: jet.Byte): jet.Float
-    public final fun times(/*0*/ other: jet.Char): jet.Float
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Float
-    public final fun times(/*0*/ other: jet.Int): jet.Float
-    public final fun times(/*0*/ other: jet.Long): jet.Float
-    public final fun times(/*0*/ other: jet.Short): jet.Float
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
+
+public final class Float : jet.Number, jet.Comparable<jet.Float> {
+    public constructor Float()
+    public final fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Float
+    public final fun div(/*0*/ other : jet.Byte) : jet.Float
+    public final fun div(/*0*/ other : jet.Char) : jet.Float
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Float
+    public final fun div(/*0*/ other : jet.Int) : jet.Float
+    public final fun div(/*0*/ other : jet.Long) : jet.Float
+    public final fun div(/*0*/ other : jet.Short) : jet.Float
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Float
+    public final fun minus() : jet.Float
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Float
+    public final fun minus(/*0*/ other : jet.Char) : jet.Float
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Float
+    public final fun minus(/*0*/ other : jet.Int) : jet.Float
+    public final fun minus(/*0*/ other : jet.Long) : jet.Float
+    public final fun minus(/*0*/ other : jet.Short) : jet.Float
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Float
+    public final fun mod(/*0*/ other : jet.Char) : jet.Float
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Float
+    public final fun mod(/*0*/ other : jet.Int) : jet.Float
+    public final fun mod(/*0*/ other : jet.Long) : jet.Float
+    public final fun mod(/*0*/ other : jet.Short) : jet.Float
+    public final fun plus() : jet.Float
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Float
+    public final fun plus(/*0*/ other : jet.Char) : jet.Float
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Float
+    public final fun plus(/*0*/ other : jet.Int) : jet.Float
+    public final fun plus(/*0*/ other : jet.Long) : jet.Float
+    public final fun plus(/*0*/ other : jet.Short) : jet.Float
+    public final fun rangeTo(/*0*/ other : jet.Byte) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Double) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Float) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Int) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Long) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Short) : jet.FloatRange
+    public final fun times(/*0*/ other : jet.Byte) : jet.Float
+    public final fun times(/*0*/ other : jet.Char) : jet.Float
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Float
+    public final fun times(/*0*/ other : jet.Int) : jet.Float
+    public final fun times(/*0*/ other : jet.Long) : jet.Float
+    public final fun times(/*0*/ other : jet.Short) : jet.Float
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
 }
-public final class jet.FloatArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.FloatArray
-    public final fun get(/*0*/ index: jet.Int): jet.Float
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.FloatIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Float): jet.Tuple0
-    public final val size: jet.Int
+
+public final class FloatArray {
+    public constructor FloatArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Float
+    public final fun iterator() : jet.FloatIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Float) : Unit
 }
-public abstract trait jet.FloatIterable : jet.Iterable<jet.Float> {
-    public abstract override /*1*/ fun iterator(): jet.FloatIterator
+
+public trait FloatIterable : jet.Iterable<jet.Float> {
+    public abstract override /*1*/ fun iterator() : jet.FloatIterator
 }
-public abstract class jet.FloatIterator : jet.Iterator<jet.Float> {
-    public final /*constructor*/ fun <init>(): jet.FloatIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Float
-    public abstract fun nextFloat(): jet.Float
+
+public abstract class FloatIterator : jet.Iterator<jet.Float> {
+    public constructor FloatIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Float
+    public abstract fun nextFloat() : jet.Float
 }
-public final class jet.FloatRange : jet.Range<jet.Float> {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Float, /*1*/ size: jet.Float): jet.FloatRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Float): jet.Boolean
-    public final val end: jet.Float
-    public final val isReversed: jet.Boolean
-    public final val size: jet.Float
-    public final val start: jet.Float
-    public final fun step(/*0*/ step: jet.Float): jet.FloatIterator
-    public final class object jet.FloatRange.<class-object-for-FloatRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.FloatRange.<class-object-for-FloatRange>
-        public final val EMPTY: jet.FloatRange
+
+public final class FloatRange : jet.Range<jet.Float> {
+    public constructor FloatRange(/*0*/ start : jet.Float, /*1*/ size : jet.Float)
+    public final val end : jet.Float
+    public final val isReversed : jet.Boolean
+    public final val size : jet.Float
+    public final val start : jet.Float
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Float) : jet.Boolean
+    public final fun step(/*0*/ step : jet.Float) : jet.FloatIterator
+    
+    public class object <class-object-for-FloatRange> {
+        private constructor <class-object-for-FloatRange>()
+        public final val EMPTY : jet.FloatRange
     }
 }
-public abstract class jet.Function0</*0*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out R : jet.Any?><init>(): jet.Function0<R>
-    public abstract fun invoke(): R
+
+public abstract class Function0</*0*/ out R> {
+    public constructor Function0</*0*/ out R>()
+    public abstract fun invoke() : R
 }
-public abstract class jet.Function1</*0*/ in P1 : jet.Any?, /*1*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ out R : jet.Any?><init>(): jet.Function1<P1, R>
-    public abstract fun invoke(/*0*/ p1: P1): R
+
+public abstract class Function1</*0*/ in P1, /*1*/ out R> {
+    public constructor Function1</*0*/ in P1, /*1*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1) : R
 }
-public abstract class jet.Function10</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ out R : jet.Any?><init>(): jet.Function10<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R
+
+public abstract class Function10</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ out R> {
+    public constructor Function10</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10) : R
 }
-public abstract class jet.Function11</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ out R : jet.Any?><init>(): jet.Function11<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R
+
+public abstract class Function11</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ out R> {
+    public constructor Function11</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11) : R
 }
-public abstract class jet.Function12</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ out R : jet.Any?><init>(): jet.Function12<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R
+
+public abstract class Function12</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ out R> {
+    public constructor Function12</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12) : R
 }
-public abstract class jet.Function13</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ out R : jet.Any?><init>(): jet.Function13<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R
+
+public abstract class Function13</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ out R> {
+    public constructor Function13</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13) : R
 }
-public abstract class jet.Function14</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ out R : jet.Any?><init>(): jet.Function14<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R
+
+public abstract class Function14</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ out R> {
+    public constructor Function14</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14) : R
 }
-public abstract class jet.Function15</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ out R : jet.Any?><init>(): jet.Function15<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R
+
+public abstract class Function15</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ out R> {
+    public constructor Function15</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15) : R
 }
-public abstract class jet.Function16</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ out R : jet.Any?><init>(): jet.Function16<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R
+
+public abstract class Function16</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ out R> {
+    public constructor Function16</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16) : R
 }
-public abstract class jet.Function17</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ out R : jet.Any?><init>(): jet.Function17<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R
+
+public abstract class Function17</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ out R> {
+    public constructor Function17</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17) : R
 }
-public abstract class jet.Function18</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ out R : jet.Any?><init>(): jet.Function18<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R
+
+public abstract class Function18</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ out R> {
+    public constructor Function18</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18) : R
 }
-public abstract class jet.Function19</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ out R : jet.Any?><init>(): jet.Function19<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R
+
+public abstract class Function19</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ out R> {
+    public constructor Function19</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19) : R
 }
-public abstract class jet.Function2</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ out R : jet.Any?><init>(): jet.Function2<P1, P2, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2): R
+
+public abstract class Function2</*0*/ in P1, /*1*/ in P2, /*2*/ out R> {
+    public constructor Function2</*0*/ in P1, /*1*/ in P2, /*2*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2) : R
 }
-public abstract class jet.Function20</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ in P20 : jet.Any?, /*20*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ in P20 : jet.Any?, /*20*/ out R : jet.Any?><init>(): jet.Function20<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R
+
+public abstract class Function20</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ out R> {
+    public constructor Function20</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19, /*19*/ p20 : P20) : R
 }
-public abstract class jet.Function21</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ in P20 : jet.Any?, /*20*/ in P21 : jet.Any?, /*21*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ in P20 : jet.Any?, /*20*/ in P21 : jet.Any?, /*21*/ out R : jet.Any?><init>(): jet.Function21<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R
+
+public abstract class Function21</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ out R> {
+    public constructor Function21</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19, /*19*/ p20 : P20, /*20*/ p21 : P21) : R
 }
-public abstract class jet.Function22</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ in P20 : jet.Any?, /*20*/ in P21 : jet.Any?, /*21*/ in P22 : jet.Any?, /*22*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ in P10 : jet.Any?, /*10*/ in P11 : jet.Any?, /*11*/ in P12 : jet.Any?, /*12*/ in P13 : jet.Any?, /*13*/ in P14 : jet.Any?, /*14*/ in P15 : jet.Any?, /*15*/ in P16 : jet.Any?, /*16*/ in P17 : jet.Any?, /*17*/ in P18 : jet.Any?, /*18*/ in P19 : jet.Any?, /*19*/ in P20 : jet.Any?, /*20*/ in P21 : jet.Any?, /*21*/ in P22 : jet.Any?, /*22*/ out R : jet.Any?><init>(): jet.Function22<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R
+
+public abstract class Function22</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ in P22, /*22*/ out R> {
+    public constructor Function22</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ in P22, /*22*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9, /*9*/ p10 : P10, /*10*/ p11 : P11, /*11*/ p12 : P12, /*12*/ p13 : P13, /*13*/ p14 : P14, /*14*/ p15 : P15, /*15*/ p16 : P16, /*16*/ p17 : P17, /*17*/ p18 : P18, /*18*/ p19 : P19, /*19*/ p20 : P20, /*20*/ p21 : P21, /*21*/ p22 : P22) : R
 }
-public abstract class jet.Function3</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ out R : jet.Any?><init>(): jet.Function3<P1, P2, P3, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R
+
+public abstract class Function3</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ out R> {
+    public constructor Function3</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3) : R
 }
-public abstract class jet.Function4</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ out R : jet.Any?><init>(): jet.Function4<P1, P2, P3, P4, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R
+
+public abstract class Function4</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ out R> {
+    public constructor Function4</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4) : R
 }
-public abstract class jet.Function5</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ out R : jet.Any?><init>(): jet.Function5<P1, P2, P3, P4, P5, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R
+
+public abstract class Function5</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ out R> {
+    public constructor Function5</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5) : R
 }
-public abstract class jet.Function6</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ out R : jet.Any?><init>(): jet.Function6<P1, P2, P3, P4, P5, P6, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R
+
+public abstract class Function6</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ out R> {
+    public constructor Function6</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6) : R
 }
-public abstract class jet.Function7</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ out R : jet.Any?><init>(): jet.Function7<P1, P2, P3, P4, P5, P6, P7, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R
+
+public abstract class Function7</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ out R> {
+    public constructor Function7</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7) : R
 }
-public abstract class jet.Function8</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ out R : jet.Any?><init>(): jet.Function8<P1, P2, P3, P4, P5, P6, P7, P8, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R
+
+public abstract class Function8</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ out R> {
+    public constructor Function8</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8) : R
 }
-public abstract class jet.Function9</*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ out R : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in P1 : jet.Any?, /*1*/ in P2 : jet.Any?, /*2*/ in P3 : jet.Any?, /*3*/ in P4 : jet.Any?, /*4*/ in P5 : jet.Any?, /*5*/ in P6 : jet.Any?, /*6*/ in P7 : jet.Any?, /*7*/ in P8 : jet.Any?, /*8*/ in P9 : jet.Any?, /*9*/ out R : jet.Any?><init>(): jet.Function9<P1, P2, P3, P4, P5, P6, P7, P8, P9, R>
-    public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R
+
+public abstract class Function9</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ out R> {
+    public constructor Function9</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ out R>()
+    public abstract fun invoke(/*0*/ p1 : P1, /*1*/ p2 : P2, /*2*/ p3 : P3, /*3*/ p4 : P4, /*4*/ p5 : P5, /*5*/ p6 : P6, /*6*/ p7 : P7, /*7*/ p8 : P8, /*8*/ p9 : P9) : R
 }
-public abstract trait jet.Hashable : jet.Any {
-    public abstract fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract fun hashCode(): jet.Int
+
+public trait Hashable {
+    public abstract fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract fun hashCode() : jet.Int
 }
-public final class jet.Int : jet.Number, jet.Comparable<jet.Int> {
-    public final /*constructor*/ fun <init>(): jet.Int
-    public final fun and(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Int
-    public final fun div(/*0*/ other: jet.Byte): jet.Int
-    public final fun div(/*0*/ other: jet.Char): jet.Int
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Float
-    public final fun div(/*0*/ other: jet.Int): jet.Int
-    public final fun div(/*0*/ other: jet.Long): jet.Long
-    public final fun div(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Int
-    public final fun inv(): jet.Int
-    public final fun minus(): jet.Int
-    public final fun minus(/*0*/ other: jet.Byte): jet.Int
-    public final fun minus(/*0*/ other: jet.Char): jet.Int
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Float
-    public final fun minus(/*0*/ other: jet.Int): jet.Int
-    public final fun minus(/*0*/ other: jet.Long): jet.Long
-    public final fun minus(/*0*/ other: jet.Short): jet.Int
-    public final fun mod(/*0*/ other: jet.Byte): jet.Int
-    public final fun mod(/*0*/ other: jet.Char): jet.Int
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Float
-    public final fun mod(/*0*/ other: jet.Int): jet.Int
-    public final fun mod(/*0*/ other: jet.Long): jet.Long
-    public final fun mod(/*0*/ other: jet.Short): jet.Int
-    public final fun or(/*0*/ other: jet.Int): jet.Int
-    public final fun plus(): jet.Int
-    public final fun plus(/*0*/ other: jet.Byte): jet.Int
-    public final fun plus(/*0*/ other: jet.Char): jet.Int
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Float
-    public final fun plus(/*0*/ other: jet.Int): jet.Int
-    public final fun plus(/*0*/ other: jet.Long): jet.Long
-    public final fun plus(/*0*/ other: jet.Short): jet.Int
-    public final fun rangeTo(/*0*/ other: jet.Byte): jet.IntRange
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.IntRange
-    public final fun rangeTo(/*0*/ other: jet.Double): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Float): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Int): jet.IntRange
-    public final fun rangeTo(/*0*/ other: jet.Long): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Short): jet.IntRange
-    public final fun shl(/*0*/ bits: jet.Int): jet.Int
-    public final fun shr(/*0*/ bits: jet.Int): jet.Int
-    public final fun times(/*0*/ other: jet.Byte): jet.Int
-    public final fun times(/*0*/ other: jet.Char): jet.Int
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Float
-    public final fun times(/*0*/ other: jet.Int): jet.Int
-    public final fun times(/*0*/ other: jet.Long): jet.Long
-    public final fun times(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
-    public final fun ushr(/*0*/ bits: jet.Int): jet.Int
-    public final fun xor(/*0*/ other: jet.Int): jet.Int
+
+public final class Int : jet.Number, jet.Comparable<jet.Int> {
+    public constructor Int()
+    public final fun and(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Int
+    public final fun div(/*0*/ other : jet.Byte) : jet.Int
+    public final fun div(/*0*/ other : jet.Char) : jet.Int
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Float
+    public final fun div(/*0*/ other : jet.Int) : jet.Int
+    public final fun div(/*0*/ other : jet.Long) : jet.Long
+    public final fun div(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Int
+    public final fun inv() : jet.Int
+    public final fun minus() : jet.Int
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun minus(/*0*/ other : jet.Char) : jet.Int
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Float
+    public final fun minus(/*0*/ other : jet.Int) : jet.Int
+    public final fun minus(/*0*/ other : jet.Long) : jet.Long
+    public final fun minus(/*0*/ other : jet.Short) : jet.Int
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Int
+    public final fun mod(/*0*/ other : jet.Char) : jet.Int
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Float
+    public final fun mod(/*0*/ other : jet.Int) : jet.Int
+    public final fun mod(/*0*/ other : jet.Long) : jet.Long
+    public final fun mod(/*0*/ other : jet.Short) : jet.Int
+    public final fun or(/*0*/ other : jet.Int) : jet.Int
+    public final fun plus() : jet.Int
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun plus(/*0*/ other : jet.Char) : jet.Int
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Float
+    public final fun plus(/*0*/ other : jet.Int) : jet.Int
+    public final fun plus(/*0*/ other : jet.Long) : jet.Long
+    public final fun plus(/*0*/ other : jet.Short) : jet.Int
+    public final fun rangeTo(/*0*/ other : jet.Byte) : jet.IntRange
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.IntRange
+    public final fun rangeTo(/*0*/ other : jet.Double) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Float) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Int) : jet.IntRange
+    public final fun rangeTo(/*0*/ other : jet.Long) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Short) : jet.IntRange
+    public final fun shl(/*0*/ bits : jet.Int) : jet.Int
+    public final fun shr(/*0*/ bits : jet.Int) : jet.Int
+    public final fun times(/*0*/ other : jet.Byte) : jet.Int
+    public final fun times(/*0*/ other : jet.Char) : jet.Int
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Float
+    public final fun times(/*0*/ other : jet.Int) : jet.Int
+    public final fun times(/*0*/ other : jet.Long) : jet.Long
+    public final fun times(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
+    public final fun ushr(/*0*/ bits : jet.Int) : jet.Int
+    public final fun xor(/*0*/ other : jet.Int) : jet.Int
 }
-public final class jet.IntArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.IntArray
-    public final fun get(/*0*/ index: jet.Int): jet.Int
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.IntIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Int): jet.Tuple0
-    public final val size: jet.Int
+
+public final class IntArray {
+    public constructor IntArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Int
+    public final fun iterator() : jet.IntIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Int) : Unit
 }
-public abstract trait jet.IntIterable : jet.Iterable<jet.Int> {
-    public abstract override /*1*/ fun iterator(): jet.IntIterator
+
+public trait IntIterable : jet.Iterable<jet.Int> {
+    public abstract override /*1*/ fun iterator() : jet.IntIterator
 }
-public abstract class jet.IntIterator : jet.Iterator<jet.Int> {
-    public final /*constructor*/ fun <init>(): jet.IntIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Int
-    public abstract fun nextInt(): jet.Int
+
+public abstract class IntIterator : jet.Iterator<jet.Int> {
+    public constructor IntIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Int
+    public abstract fun nextInt() : jet.Int
 }
-public final class jet.IntRange : jet.Range<jet.Int>, jet.IntIterable {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Int, /*1*/ size: jet.Int): jet.IntRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Int): jet.Boolean
-    public final val end: jet.Int
-    public final val isReversed: jet.Boolean
-    public open override /*1*/ fun iterator(): jet.IntIterator
-    public final val iteratorStart: jet.Int
-    public final val size: jet.Int
-    public final val start: jet.Int
-    public final fun step(/*0*/ step: jet.Int): jet.IntIterator
-    public final class object jet.IntRange.<class-object-for-IntRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.IntRange.<class-object-for-IntRange>
-        public final val EMPTY: jet.IntRange
+
+public final class IntRange : jet.Range<jet.Int>, jet.IntIterable {
+    public constructor IntRange(/*0*/ start : jet.Int, /*1*/ size : jet.Int)
+    public final val end : jet.Int
+    public final val isReversed : jet.Boolean
+    public final val iteratorStart : jet.Int
+    public final val size : jet.Int
+    public final val start : jet.Int
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Int) : jet.Boolean
+    public open override /*1*/ fun iterator() : jet.IntIterator
+    public final fun step(/*0*/ step : jet.Int) : jet.IntIterator
+    
+    public class object <class-object-for-IntRange> {
+        private constructor <class-object-for-IntRange>()
+        public final val EMPTY : jet.IntRange
     }
 }
-public abstract trait jet.Iterable</*0*/ out T : jet.Any?> : jet.Any {
-    public abstract fun iterator(): jet.Iterator<T>
+
+public trait Iterable</*0*/ out T> {
+    public abstract fun iterator() : jet.Iterator<T>
 }
-public abstract trait jet.Iterator</*0*/ out T : jet.Any?> : jet.Any {
-    public abstract fun hasNext(): jet.Boolean
-    public abstract fun next(): T
+
+public trait Iterator</*0*/ out T> {
+    public abstract fun hasNext() : jet.Boolean
+    public abstract fun next() : T
 }
-public abstract trait jet.List</*0*/ out E : jet.Any?> : jet.Collection<E> {
-    public abstract override /*1*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract fun get(/*0*/ index: jet.Int): E
-    public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract fun indexOf(/*0*/ o: jet.Any?): jet.Int
-    public abstract override /*1*/ fun isEmpty(): jet.Boolean
-    public abstract override /*1*/ fun iterator(): jet.Iterator<E>
-    public abstract fun lastIndexOf(/*0*/ o: jet.Any?): jet.Int
-    public abstract fun listIterator(): jet.ListIterator<E>
-    public abstract fun listIterator(/*0*/ index: jet.Int): jet.ListIterator<E>
-    public abstract override /*1*/ fun size(): jet.Int
-    public abstract fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.List<E>
-    public abstract override /*1*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+
+public trait List</*0*/ out E> : jet.Collection<E> {
+    public abstract override /*1*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract fun get(/*0*/ index : jet.Int) : E
+    public abstract override /*1*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract fun indexOf(/*0*/ o : jet.Any?) : jet.Int
+    public abstract override /*1*/ fun isEmpty() : jet.Boolean
+    public abstract override /*1*/ fun iterator() : jet.Iterator<E>
+    public abstract fun lastIndexOf(/*0*/ o : jet.Any?) : jet.Int
+    public abstract fun listIterator() : jet.ListIterator<E>
+    public abstract fun listIterator(/*0*/ index : jet.Int) : jet.ListIterator<E>
+    public abstract override /*1*/ fun size() : jet.Int
+    public abstract fun subList(/*0*/ fromIndex : jet.Int, /*1*/ toIndex : jet.Int) : jet.List<E>
+    public abstract override /*1*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*1*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }
-public abstract trait jet.ListIterator</*0*/ out T : jet.Any?> : jet.Iterator<T> {
-    public abstract override /*1*/ fun hasNext(): jet.Boolean
-    public abstract fun hasPrevious(): jet.Boolean
-    public abstract override /*1*/ fun next(): T
-    public abstract fun nextIndex(): jet.Int
-    public abstract fun previous(): T
-    public abstract fun previousIndex(): jet.Int
+
+public trait ListIterator</*0*/ out T> : jet.Iterator<T> {
+    public abstract override /*1*/ fun hasNext() : jet.Boolean
+    public abstract fun hasPrevious() : jet.Boolean
+    public abstract override /*1*/ fun next() : T
+    public abstract fun nextIndex() : jet.Int
+    public abstract fun previous() : T
+    public abstract fun previousIndex() : jet.Int
 }
-public final class jet.Long : jet.Number, jet.Comparable<jet.Long> {
-    public final /*constructor*/ fun <init>(): jet.Long
-    public final fun and(/*0*/ other: jet.Long): jet.Long
-    public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Long
-    public final fun div(/*0*/ other: jet.Byte): jet.Long
-    public final fun div(/*0*/ other: jet.Char): jet.Long
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Float
-    public final fun div(/*0*/ other: jet.Int): jet.Long
-    public final fun div(/*0*/ other: jet.Long): jet.Long
-    public final fun div(/*0*/ other: jet.Short): jet.Long
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Long
-    public final fun inv(): jet.Long
-    public final fun minus(): jet.Long
-    public final fun minus(/*0*/ other: jet.Byte): jet.Long
-    public final fun minus(/*0*/ other: jet.Char): jet.Long
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Float
-    public final fun minus(/*0*/ other: jet.Int): jet.Long
-    public final fun minus(/*0*/ other: jet.Long): jet.Long
-    public final fun minus(/*0*/ other: jet.Short): jet.Long
-    public final fun mod(/*0*/ other: jet.Byte): jet.Long
-    public final fun mod(/*0*/ other: jet.Char): jet.Long
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Float
-    public final fun mod(/*0*/ other: jet.Int): jet.Long
-    public final fun mod(/*0*/ other: jet.Long): jet.Long
-    public final fun mod(/*0*/ other: jet.Short): jet.Long
-    public final fun or(/*0*/ other: jet.Long): jet.Long
-    public final fun plus(): jet.Long
-    public final fun plus(/*0*/ other: jet.Byte): jet.Long
-    public final fun plus(/*0*/ other: jet.Char): jet.Long
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Float
-    public final fun plus(/*0*/ other: jet.Int): jet.Long
-    public final fun plus(/*0*/ other: jet.Long): jet.Long
-    public final fun plus(/*0*/ other: jet.Short): jet.Long
-    public final fun rangeTo(/*0*/ other: jet.Byte): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Double): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Float): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Int): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Long): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Short): jet.LongRange
-    public final fun shl(/*0*/ bits: jet.Int): jet.Long
-    public final fun shr(/*0*/ bits: jet.Int): jet.Long
-    public final fun times(/*0*/ other: jet.Byte): jet.Long
-    public final fun times(/*0*/ other: jet.Char): jet.Long
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Float
-    public final fun times(/*0*/ other: jet.Int): jet.Long
-    public final fun times(/*0*/ other: jet.Long): jet.Long
-    public final fun times(/*0*/ other: jet.Short): jet.Long
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
-    public final fun ushr(/*0*/ bits: jet.Int): jet.Long
-    public final fun xor(/*0*/ other: jet.Long): jet.Long
+
+public final class Long : jet.Number, jet.Comparable<jet.Long> {
+    public constructor Long()
+    public final fun and(/*0*/ other : jet.Long) : jet.Long
+    public final fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Long
+    public final fun div(/*0*/ other : jet.Byte) : jet.Long
+    public final fun div(/*0*/ other : jet.Char) : jet.Long
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Float
+    public final fun div(/*0*/ other : jet.Int) : jet.Long
+    public final fun div(/*0*/ other : jet.Long) : jet.Long
+    public final fun div(/*0*/ other : jet.Short) : jet.Long
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Long
+    public final fun inv() : jet.Long
+    public final fun minus() : jet.Long
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Long
+    public final fun minus(/*0*/ other : jet.Char) : jet.Long
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Float
+    public final fun minus(/*0*/ other : jet.Int) : jet.Long
+    public final fun minus(/*0*/ other : jet.Long) : jet.Long
+    public final fun minus(/*0*/ other : jet.Short) : jet.Long
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Long
+    public final fun mod(/*0*/ other : jet.Char) : jet.Long
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Float
+    public final fun mod(/*0*/ other : jet.Int) : jet.Long
+    public final fun mod(/*0*/ other : jet.Long) : jet.Long
+    public final fun mod(/*0*/ other : jet.Short) : jet.Long
+    public final fun or(/*0*/ other : jet.Long) : jet.Long
+    public final fun plus() : jet.Long
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Long
+    public final fun plus(/*0*/ other : jet.Char) : jet.Long
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Float
+    public final fun plus(/*0*/ other : jet.Int) : jet.Long
+    public final fun plus(/*0*/ other : jet.Long) : jet.Long
+    public final fun plus(/*0*/ other : jet.Short) : jet.Long
+    public final fun rangeTo(/*0*/ other : jet.Byte) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Double) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Float) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Int) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Long) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Short) : jet.LongRange
+    public final fun shl(/*0*/ bits : jet.Int) : jet.Long
+    public final fun shr(/*0*/ bits : jet.Int) : jet.Long
+    public final fun times(/*0*/ other : jet.Byte) : jet.Long
+    public final fun times(/*0*/ other : jet.Char) : jet.Long
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Float
+    public final fun times(/*0*/ other : jet.Int) : jet.Long
+    public final fun times(/*0*/ other : jet.Long) : jet.Long
+    public final fun times(/*0*/ other : jet.Short) : jet.Long
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
+    public final fun ushr(/*0*/ bits : jet.Int) : jet.Long
+    public final fun xor(/*0*/ other : jet.Long) : jet.Long
 }
-public final class jet.LongArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.LongArray
-    public final fun get(/*0*/ index: jet.Int): jet.Long
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.LongIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Long): jet.Tuple0
-    public final val size: jet.Int
+
+public final class LongArray {
+    public constructor LongArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Long
+    public final fun iterator() : jet.LongIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Long) : Unit
 }
-public abstract trait jet.LongIterable : jet.Iterable<jet.Long> {
-    public abstract override /*1*/ fun iterator(): jet.LongIterator
+
+public trait LongIterable : jet.Iterable<jet.Long> {
+    public abstract override /*1*/ fun iterator() : jet.LongIterator
 }
-public abstract class jet.LongIterator : jet.Iterator<jet.Long> {
-    public final /*constructor*/ fun <init>(): jet.LongIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Long
-    public abstract fun nextLong(): jet.Long
+
+public abstract class LongIterator : jet.Iterator<jet.Long> {
+    public constructor LongIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Long
+    public abstract fun nextLong() : jet.Long
 }
-public final class jet.LongRange : jet.Range<jet.Long>, jet.LongIterable {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Long, /*1*/ size: jet.Long): jet.LongRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Long): jet.Boolean
-    public final val end: jet.Long
-    public final val isReversed: jet.Boolean
-    public open override /*1*/ fun iterator(): jet.LongIterator
-    public final val iteratorStart: jet.Long
-    public final val size: jet.Long
-    public final val start: jet.Long
-    public final fun step(/*0*/ step: jet.Long): jet.LongIterator
-    public final class object jet.LongRange.<class-object-for-LongRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.LongRange.<class-object-for-LongRange>
-        public final val EMPTY: jet.LongRange
+
+public final class LongRange : jet.Range<jet.Long>, jet.LongIterable {
+    public constructor LongRange(/*0*/ start : jet.Long, /*1*/ size : jet.Long)
+    public final val end : jet.Long
+    public final val isReversed : jet.Boolean
+    public final val iteratorStart : jet.Long
+    public final val size : jet.Long
+    public final val start : jet.Long
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Long) : jet.Boolean
+    public open override /*1*/ fun iterator() : jet.LongIterator
+    public final fun step(/*0*/ step : jet.Long) : jet.LongIterator
+    
+    public class object <class-object-for-LongRange> {
+        private constructor <class-object-for-LongRange>()
+        public final val EMPTY : jet.LongRange
     }
 }
-public abstract trait jet.Map</*0*/ K : jet.Any?, /*1*/ out V : jet.Any?> : jet.Any {
-    public abstract fun containsKey(/*0*/ key: jet.Any?): jet.Boolean
-    public abstract fun containsValue(/*0*/ value: jet.Any?): jet.Boolean
-    public abstract fun entrySet(): jet.Set<jet.Map.Entry<K, V>>
-    public abstract fun get(/*0*/ key: jet.Any?): V?
-    public abstract fun isEmpty(): jet.Boolean
-    public abstract trait jet.Map.Entry</*0*/ out K : jet.Any?, /*1*/ out V : jet.Any?> : jet.Hashable {
-        public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-        public abstract fun getKey(): K
-        public abstract fun getValue(): V
-        public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int
-    }
-    public abstract fun keySet(): jet.Set<K>
-    public abstract fun size(): jet.Int
-    public abstract fun values(): jet.Collection<V>
-}
-public abstract trait jet.MutableCollection</*0*/ E : jet.Any?> : jet.Collection<E>, jet.MutableIterable<E> {
-    public abstract fun add(/*0*/ e: E): jet.Boolean
-    public abstract fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-    public abstract fun clear(): jet.Tuple0
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public abstract override /*2*/ fun iterator(): jet.MutableIterator<E>
-    public abstract fun remove(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
-    public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
-}
-public abstract trait jet.MutableIterable</*0*/ out T : jet.Any?> : jet.Iterable<T> {
-    public abstract override /*1*/ fun iterator(): jet.MutableIterator<T>
-}
-public abstract trait jet.MutableIterator</*0*/ out T : jet.Any?> : jet.Iterator<T> {
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun next(): T
-    public abstract fun remove(): jet.Tuple0
-}
-public abstract trait jet.MutableList</*0*/ E : jet.Any?> : jet.List<E>, jet.MutableCollection<E> {
-    public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean
-    public abstract fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Tuple0
-    public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-    public abstract fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection<E>): jet.Boolean
-    public abstract override /*1*/ fun clear(): jet.Tuple0
-    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: jet.Int): E
-    public abstract override /*2*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: jet.Any?): jet.Int
-    public abstract override /*2*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun iterator(): jet.Iterator<E>
-    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: jet.Any?): jet.Int
-    public abstract override /*1*/ fun listIterator(): jet.MutableListIterator<E>
-    public abstract override /*1*/ fun listIterator(/*0*/ index: jet.Int): jet.MutableListIterator<E>
-    public abstract fun remove(/*0*/ index: jet.Int): E
-    public abstract override /*1*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract fun set(/*0*/ index: jet.Int, /*1*/ element: E): E
-    public abstract override /*2*/ /*fake_override*/ fun size(): jet.Int
-    public abstract override /*1*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList<E>
-    public abstract override /*2*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*2*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
-}
-public abstract trait jet.MutableListIterator</*0*/ T : jet.Any?> : jet.ListIterator<T>, jet.MutableIterator<T> {
-    public abstract fun add(/*0*/ e: T): jet.Tuple0
-    public abstract override /*2*/ fun hasNext(): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun hasPrevious(): jet.Boolean
-    public abstract override /*2*/ fun next(): T
-    public abstract override /*1*/ /*fake_override*/ fun nextIndex(): jet.Int
-    public abstract override /*1*/ /*fake_override*/ fun previous(): T
-    public abstract override /*1*/ /*fake_override*/ fun previousIndex(): jet.Int
-    public abstract override /*1*/ fun remove(): jet.Tuple0
-    public abstract fun set(/*0*/ e: T): jet.Tuple0
-}
-public abstract trait jet.MutableMap</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.Map<K, V> {
-    public abstract fun clear(): jet.Tuple0
-    public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: jet.Any?): jet.Boolean
-    public abstract override /*1*/ fun entrySet(): jet.MutableSet<jet.MutableMap.MutableEntry<K, V>>
-    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: jet.Any?): V?
-    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public abstract trait jet.MutableMap.MutableEntry</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.Map.Entry<K, V>, jet.Hashable {
-        public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun getKey(): K
-        public abstract override /*1*/ /*fake_override*/ fun getValue(): V
-        public abstract override /*2*/ /*fake_override*/ fun hashCode(): jet.Int
-        public abstract fun setValue(/*0*/ value: V): V
-    }
-    public abstract override /*1*/ fun keySet(): jet.MutableSet<K>
-    public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
-    public abstract fun putAll(/*0*/ m: jet.Map<out K, out V>): jet.Tuple0
-    public abstract fun remove(/*0*/ key: jet.Any?): V?
-    public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
-    public abstract override /*1*/ fun values(): jet.MutableCollection<V>
-}
-public abstract trait jet.MutableSet</*0*/ E : jet.Any?> : jet.Set<E>, jet.MutableCollection<E> {
-    public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean
-    public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-    public abstract override /*1*/ fun clear(): jet.Tuple0
-    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract override /*2*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public abstract override /*2*/ fun iterator(): jet.MutableIterator<E>
-    public abstract override /*1*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun size(): jet.Int
-    public abstract override /*2*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*2*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
-}
-public final class jet.Nothing {
-    private final /*constructor*/ fun <init>(): jet.Nothing
-}
-public abstract class jet.Number : jet.Hashable {
-    public final /*constructor*/ fun <init>(): jet.Number
-    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract fun toByte(): jet.Byte
-    public abstract fun toChar(): jet.Char
-    public abstract fun toDouble(): jet.Double
-    public abstract fun toFloat(): jet.Float
-    public abstract fun toInt(): jet.Int
-    public abstract fun toLong(): jet.Long
-    public abstract fun toShort(): jet.Short
-}
-public abstract trait jet.Range</*0*/ in T : jet.Comparable<T>> : jet.Any {
-    public abstract fun contains(/*0*/ item: T): jet.Boolean
-}
-public abstract trait jet.Set</*0*/ out E : jet.Any?> : jet.Collection<E> {
-    public abstract override /*1*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int
-    public abstract override /*1*/ fun isEmpty(): jet.Boolean
-    public abstract override /*1*/ fun iterator(): jet.Iterator<E>
-    public abstract override /*1*/ fun size(): jet.Int
-    public abstract override /*1*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
-}
-public final class jet.Short : jet.Number, jet.Comparable<jet.Short> {
-    public final /*constructor*/ fun <init>(): jet.Short
-    public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Char): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Double): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Float): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Int): jet.Int
-    public final fun compareTo(/*0*/ other: jet.Long): jet.Int
-    public open override /*1*/ fun compareTo(/*0*/ other: jet.Short): jet.Int
-    public final fun dec(): jet.Short
-    public final fun div(/*0*/ other: jet.Byte): jet.Int
-    public final fun div(/*0*/ other: jet.Char): jet.Int
-    public final fun div(/*0*/ other: jet.Double): jet.Double
-    public final fun div(/*0*/ other: jet.Float): jet.Float
-    public final fun div(/*0*/ other: jet.Int): jet.Int
-    public final fun div(/*0*/ other: jet.Long): jet.Long
-    public final fun div(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final fun inc(): jet.Short
-    public final fun minus(): jet.Short
-    public final fun minus(/*0*/ other: jet.Byte): jet.Int
-    public final fun minus(/*0*/ other: jet.Char): jet.Int
-    public final fun minus(/*0*/ other: jet.Double): jet.Double
-    public final fun minus(/*0*/ other: jet.Float): jet.Float
-    public final fun minus(/*0*/ other: jet.Int): jet.Int
-    public final fun minus(/*0*/ other: jet.Long): jet.Long
-    public final fun minus(/*0*/ other: jet.Short): jet.Int
-    public final fun mod(/*0*/ other: jet.Byte): jet.Int
-    public final fun mod(/*0*/ other: jet.Char): jet.Int
-    public final fun mod(/*0*/ other: jet.Double): jet.Double
-    public final fun mod(/*0*/ other: jet.Float): jet.Float
-    public final fun mod(/*0*/ other: jet.Int): jet.Int
-    public final fun mod(/*0*/ other: jet.Long): jet.Long
-    public final fun mod(/*0*/ other: jet.Short): jet.Int
-    public final fun plus(): jet.Short
-    public final fun plus(/*0*/ other: jet.Byte): jet.Int
-    public final fun plus(/*0*/ other: jet.Char): jet.Int
-    public final fun plus(/*0*/ other: jet.Double): jet.Double
-    public final fun plus(/*0*/ other: jet.Float): jet.Float
-    public final fun plus(/*0*/ other: jet.Int): jet.Int
-    public final fun plus(/*0*/ other: jet.Long): jet.Long
-    public final fun plus(/*0*/ other: jet.Short): jet.Int
-    public final fun rangeTo(/*0*/ other: jet.Byte): jet.ShortRange
-    public final fun rangeTo(/*0*/ other: jet.Char): jet.ShortRange
-    public final fun rangeTo(/*0*/ other: jet.Double): jet.DoubleRange
-    public final fun rangeTo(/*0*/ other: jet.Float): jet.FloatRange
-    public final fun rangeTo(/*0*/ other: jet.Int): jet.IntRange
-    public final fun rangeTo(/*0*/ other: jet.Long): jet.LongRange
-    public final fun rangeTo(/*0*/ other: jet.Short): jet.ShortRange
-    public final fun times(/*0*/ other: jet.Byte): jet.Int
-    public final fun times(/*0*/ other: jet.Char): jet.Int
-    public final fun times(/*0*/ other: jet.Double): jet.Double
-    public final fun times(/*0*/ other: jet.Float): jet.Float
-    public final fun times(/*0*/ other: jet.Int): jet.Int
-    public final fun times(/*0*/ other: jet.Long): jet.Long
-    public final fun times(/*0*/ other: jet.Short): jet.Int
-    public open override /*1*/ fun toByte(): jet.Byte
-    public open override /*1*/ fun toChar(): jet.Char
-    public open override /*1*/ fun toDouble(): jet.Double
-    public open override /*1*/ fun toFloat(): jet.Float
-    public open override /*1*/ fun toInt(): jet.Int
-    public open override /*1*/ fun toLong(): jet.Long
-    public open override /*1*/ fun toShort(): jet.Short
-}
-public final class jet.ShortArray : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ size: jet.Int): jet.ShortArray
-    public final fun get(/*0*/ index: jet.Int): jet.Short
-    public final val indices: jet.IntRange
-    public final fun iterator(): jet.ShortIterator
-    public final fun set(/*0*/ index: jet.Int, /*1*/ value: jet.Short): jet.Tuple0
-    public final val size: jet.Int
-}
-public abstract trait jet.ShortIterable : jet.Iterable<jet.Short> {
-    public abstract override /*1*/ fun iterator(): jet.ShortIterator
-}
-public abstract class jet.ShortIterator : jet.Iterator<jet.Short> {
-    public final /*constructor*/ fun <init>(): jet.ShortIterator
-    public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean
-    public open override /*1*/ fun next(): jet.Short
-    public abstract fun nextShort(): jet.Short
-}
-public final class jet.ShortRange : jet.Range<jet.Short>, jet.ShortIterable {
-    public final /*constructor*/ fun <init>(/*0*/ start: jet.Short, /*1*/ size: jet.Int): jet.ShortRange
-    public open override /*1*/ fun contains(/*0*/ elem: jet.Short): jet.Boolean
-    public final val end: jet.Short
-    public final val isReversed: jet.Boolean
-    public open override /*1*/ fun iterator(): jet.ShortIterator
-    public final val iteratorStart: jet.Short
-    public final val size: jet.Int
-    public final val start: jet.Short
-    public final fun step(/*0*/ step: jet.Int): jet.ShortIterator
-    public final class object jet.ShortRange.<class-object-for-ShortRange> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.ShortRange.<class-object-for-ShortRange>
-        public final val EMPTY: jet.ShortRange
+
+public trait Map</*0*/ K, /*1*/ out V> {
+    public abstract fun containsKey(/*0*/ key : jet.Any?) : jet.Boolean
+    public abstract fun containsValue(/*0*/ value : jet.Any?) : jet.Boolean
+    public abstract fun entrySet() : jet.Set<jet.Map.Entry<K, V>>
+    public abstract fun get(/*0*/ key : jet.Any?) : V?
+    public abstract fun isEmpty() : jet.Boolean
+    public abstract fun keySet() : jet.Set<K>
+    public abstract fun size() : jet.Int
+    public abstract fun values() : jet.Collection<V>
+    
+    public trait Entry</*0*/ out K, /*1*/ out V> : jet.Hashable {
+        public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+        public abstract fun getKey() : K
+        public abstract fun getValue() : V
+        public abstract override /*1*/ /*fake_override*/ fun hashCode() : jet.Int
     }
 }
-public final class jet.String : jet.Comparable<jet.String>, jet.CharSequence {
-    public final /*constructor*/ fun <init>(): jet.String
-    public open override /*1*/ fun compareTo(/*0*/ that: jet.String): jet.Int
-    public final fun equals(/*0*/ other: jet.Any?): jet.Boolean
-    public open override /*1*/ fun get(/*0*/ index: jet.Int): jet.Char
-    public open override /*1*/ val length: jet.Int
-    public final fun plus(/*0*/ other: jet.Any?): jet.String
-    public open override /*1*/ fun toString(): jet.String
+
+public trait MutableCollection</*0*/ E> : jet.Collection<E>, jet.MutableIterable<E> {
+    public abstract fun add(/*0*/ e : E) : jet.Boolean
+    public abstract fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+    public abstract fun clear() : Unit
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public abstract override /*2*/ fun iterator() : jet.MutableIterator<E>
+    public abstract fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }
-public open class jet.Throwable : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ message: jet.String? = ?, /*1*/ cause: jet.Throwable? = ?): jet.Throwable
-    public final fun getCause(): jet.Throwable?
-    public final fun getMessage(): jet.String?
-    public final fun printStackTrace(): jet.Tuple0
+
+public trait MutableIterable</*0*/ out T> : jet.Iterable<T> {
+    public abstract override /*1*/ fun iterator() : jet.MutableIterator<T>
 }
-public final class jet.Tuple0 : jet.Any {
-    private final /*constructor*/ fun <init>(): jet.Tuple0
-    public final class object jet.Tuple0.<class-object-for-Tuple0> : jet.Any {
-        private final /*constructor*/ fun <init>(): jet.Tuple0.<class-object-for-Tuple0>
-        public final val VALUE: jet.Tuple0
+
+public trait MutableIterator</*0*/ out T> : jet.Iterator<T> {
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun next() : T
+    public abstract fun remove() : Unit
+}
+
+public trait MutableList</*0*/ E> : jet.List<E>, jet.MutableCollection<E> {
+    public abstract override /*1*/ fun add(/*0*/ e : E) : jet.Boolean
+    public abstract fun add(/*0*/ index : jet.Int, /*1*/ element : E) : Unit
+    public abstract override /*1*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+    public abstract fun addAll(/*0*/ index : jet.Int, /*1*/ c : jet.Collection<E>) : jet.Boolean
+    public abstract override /*1*/ fun clear() : Unit
+    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index : jet.Int) : E
+    public abstract override /*2*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o : jet.Any?) : jet.Int
+    public abstract override /*2*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun iterator() : jet.Iterator<E>
+    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o : jet.Any?) : jet.Int
+    public abstract override /*1*/ fun listIterator() : jet.MutableListIterator<E>
+    public abstract override /*1*/ fun listIterator(/*0*/ index : jet.Int) : jet.MutableListIterator<E>
+    public abstract override /*1*/ fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract fun remove(/*0*/ index : jet.Int) : E
+    public abstract override /*1*/ fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract fun set(/*0*/ index : jet.Int, /*1*/ element : E) : E
+    public abstract override /*2*/ /*fake_override*/ fun size() : jet.Int
+    public abstract override /*1*/ fun subList(/*0*/ fromIndex : jet.Int, /*1*/ toIndex : jet.Int) : jet.MutableList<E>
+    public abstract override /*2*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*2*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
+}
+
+public trait MutableListIterator</*0*/ T> : jet.ListIterator<T>, jet.MutableIterator<T> {
+    public abstract fun add(/*0*/ e : T) : Unit
+    public abstract override /*2*/ fun hasNext() : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun hasPrevious() : jet.Boolean
+    public abstract override /*2*/ fun next() : T
+    public abstract override /*1*/ /*fake_override*/ fun nextIndex() : jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun previous() : T
+    public abstract override /*1*/ /*fake_override*/ fun previousIndex() : jet.Int
+    public abstract override /*1*/ fun remove() : Unit
+    public abstract fun set(/*0*/ e : T) : Unit
+}
+
+public trait MutableMap</*0*/ K, /*1*/ V> : jet.Map<K, V> {
+    public abstract fun clear() : Unit
+    public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ fun entrySet() : jet.MutableSet<jet.MutableMap.MutableEntry<K, V>>
+    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key : jet.Any?) : V?
+    public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public abstract override /*1*/ fun keySet() : jet.MutableSet<K>
+    public abstract fun put(/*0*/ key : K, /*1*/ value : V) : V?
+    public abstract fun putAll(/*0*/ m : jet.Map<out K, out V>) : Unit
+    public abstract fun remove(/*0*/ key : jet.Any?) : V?
+    public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
+    public abstract override /*1*/ fun values() : jet.MutableCollection<V>
+    
+    public trait MutableEntry</*0*/ K, /*1*/ V> : jet.Map.Entry<K, V>, jet.Hashable {
+        public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun getKey() : K
+        public abstract override /*1*/ /*fake_override*/ fun getValue() : V
+        public abstract override /*2*/ /*fake_override*/ fun hashCode() : jet.Int
+        public abstract fun setValue(/*0*/ value : V) : V
     }
 }
-public final class jet.Tuple1</*0*/ out T1 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?><init>(/*0*/ _1: T1): jet.Tuple1<T1>
-    public final val _1: T1
+
+public trait MutableSet</*0*/ E> : jet.Set<E>, jet.MutableCollection<E> {
+    public abstract override /*1*/ fun add(/*0*/ e : E) : jet.Boolean
+    public abstract override /*1*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+    public abstract override /*1*/ fun clear() : Unit
+    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract override /*2*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public abstract override /*2*/ fun iterator() : jet.MutableIterator<E>
+    public abstract override /*1*/ fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun size() : jet.Int
+    public abstract override /*2*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*2*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }
-public final class jet.Tuple10</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10): jet.Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-    public final val _10: T10
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class Nothing {
+    private constructor Nothing()
 }
-public final class jet.Tuple11</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11): jet.Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public abstract class Number : jet.Hashable {
+    public constructor Number()
+    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract fun toByte() : jet.Byte
+    public abstract fun toChar() : jet.Char
+    public abstract fun toDouble() : jet.Double
+    public abstract fun toFloat() : jet.Float
+    public abstract fun toInt() : jet.Int
+    public abstract fun toLong() : jet.Long
+    public abstract fun toShort() : jet.Short
 }
-public final class jet.Tuple12</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12): jet.Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public trait Range</*0*/ in T : jet.Comparable<T>> {
+    public abstract fun contains(/*0*/ item : T) : jet.Boolean
 }
-public final class jet.Tuple13</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13): jet.Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public trait Set</*0*/ out E> : jet.Collection<E> {
+    public abstract override /*1*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun hashCode() : jet.Int
+    public abstract override /*1*/ fun isEmpty() : jet.Boolean
+    public abstract override /*1*/ fun iterator() : jet.Iterator<E>
+    public abstract override /*1*/ fun size() : jet.Int
+    public abstract override /*1*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*1*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }
-public final class jet.Tuple14</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14): jet.Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class Short : jet.Number, jet.Comparable<jet.Short> {
+    public constructor Short()
+    public final fun compareTo(/*0*/ other : jet.Byte) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Char) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Double) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Float) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Int) : jet.Int
+    public final fun compareTo(/*0*/ other : jet.Long) : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ other : jet.Short) : jet.Int
+    public final fun dec() : jet.Short
+    public final fun div(/*0*/ other : jet.Byte) : jet.Int
+    public final fun div(/*0*/ other : jet.Char) : jet.Int
+    public final fun div(/*0*/ other : jet.Double) : jet.Double
+    public final fun div(/*0*/ other : jet.Float) : jet.Float
+    public final fun div(/*0*/ other : jet.Int) : jet.Int
+    public final fun div(/*0*/ other : jet.Long) : jet.Long
+    public final fun div(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun hashCode() : jet.Int
+    public final fun inc() : jet.Short
+    public final fun minus() : jet.Short
+    public final fun minus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun minus(/*0*/ other : jet.Char) : jet.Int
+    public final fun minus(/*0*/ other : jet.Double) : jet.Double
+    public final fun minus(/*0*/ other : jet.Float) : jet.Float
+    public final fun minus(/*0*/ other : jet.Int) : jet.Int
+    public final fun minus(/*0*/ other : jet.Long) : jet.Long
+    public final fun minus(/*0*/ other : jet.Short) : jet.Int
+    public final fun mod(/*0*/ other : jet.Byte) : jet.Int
+    public final fun mod(/*0*/ other : jet.Char) : jet.Int
+    public final fun mod(/*0*/ other : jet.Double) : jet.Double
+    public final fun mod(/*0*/ other : jet.Float) : jet.Float
+    public final fun mod(/*0*/ other : jet.Int) : jet.Int
+    public final fun mod(/*0*/ other : jet.Long) : jet.Long
+    public final fun mod(/*0*/ other : jet.Short) : jet.Int
+    public final fun plus() : jet.Short
+    public final fun plus(/*0*/ other : jet.Byte) : jet.Int
+    public final fun plus(/*0*/ other : jet.Char) : jet.Int
+    public final fun plus(/*0*/ other : jet.Double) : jet.Double
+    public final fun plus(/*0*/ other : jet.Float) : jet.Float
+    public final fun plus(/*0*/ other : jet.Int) : jet.Int
+    public final fun plus(/*0*/ other : jet.Long) : jet.Long
+    public final fun plus(/*0*/ other : jet.Short) : jet.Int
+    public final fun rangeTo(/*0*/ other : jet.Byte) : jet.ShortRange
+    public final fun rangeTo(/*0*/ other : jet.Char) : jet.ShortRange
+    public final fun rangeTo(/*0*/ other : jet.Double) : jet.DoubleRange
+    public final fun rangeTo(/*0*/ other : jet.Float) : jet.FloatRange
+    public final fun rangeTo(/*0*/ other : jet.Int) : jet.IntRange
+    public final fun rangeTo(/*0*/ other : jet.Long) : jet.LongRange
+    public final fun rangeTo(/*0*/ other : jet.Short) : jet.ShortRange
+    public final fun times(/*0*/ other : jet.Byte) : jet.Int
+    public final fun times(/*0*/ other : jet.Char) : jet.Int
+    public final fun times(/*0*/ other : jet.Double) : jet.Double
+    public final fun times(/*0*/ other : jet.Float) : jet.Float
+    public final fun times(/*0*/ other : jet.Int) : jet.Int
+    public final fun times(/*0*/ other : jet.Long) : jet.Long
+    public final fun times(/*0*/ other : jet.Short) : jet.Int
+    public open override /*1*/ fun toByte() : jet.Byte
+    public open override /*1*/ fun toChar() : jet.Char
+    public open override /*1*/ fun toDouble() : jet.Double
+    public open override /*1*/ fun toFloat() : jet.Float
+    public open override /*1*/ fun toInt() : jet.Int
+    public open override /*1*/ fun toLong() : jet.Long
+    public open override /*1*/ fun toShort() : jet.Short
 }
-public final class jet.Tuple15</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15): jet.Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class ShortArray {
+    public constructor ShortArray(/*0*/ size : jet.Int)
+    public final val indices : jet.IntRange
+    public final val size : jet.Int
+    public final fun get(/*0*/ index : jet.Int) : jet.Short
+    public final fun iterator() : jet.ShortIterator
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Short) : Unit
 }
-public final class jet.Tuple16</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16): jet.Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public trait ShortIterable : jet.Iterable<jet.Short> {
+    public abstract override /*1*/ fun iterator() : jet.ShortIterator
 }
-public final class jet.Tuple17</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16, /*16*/ _17: T17): jet.Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _17: T17
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public abstract class ShortIterator : jet.Iterator<jet.Short> {
+    public constructor ShortIterator()
+    public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
+    public open override /*1*/ fun next() : jet.Short
+    public abstract fun nextShort() : jet.Short
 }
-public final class jet.Tuple18</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16, /*16*/ _17: T17, /*17*/ _18: T18): jet.Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _17: T17
-    public final val _18: T18
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class ShortRange : jet.Range<jet.Short>, jet.ShortIterable {
+    public constructor ShortRange(/*0*/ start : jet.Short, /*1*/ size : jet.Int)
+    public final val end : jet.Short
+    public final val isReversed : jet.Boolean
+    public final val iteratorStart : jet.Short
+    public final val size : jet.Int
+    public final val start : jet.Short
+    public open override /*1*/ fun contains(/*0*/ elem : jet.Short) : jet.Boolean
+    public open override /*1*/ fun iterator() : jet.ShortIterator
+    public final fun step(/*0*/ step : jet.Int) : jet.ShortIterator
+    
+    public class object <class-object-for-ShortRange> {
+        private constructor <class-object-for-ShortRange>()
+        public final val EMPTY : jet.ShortRange
+    }
 }
-public final class jet.Tuple19</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16, /*16*/ _17: T17, /*17*/ _18: T18, /*18*/ _19: T19): jet.Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _17: T17
-    public final val _18: T18
-    public final val _19: T19
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class String : jet.Comparable<jet.String>, jet.CharSequence {
+    public constructor String()
+    public open override /*1*/ val length : jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ that : jet.String) : jet.Int
+    public final fun equals(/*0*/ other : jet.Any?) : jet.Boolean
+    public open override /*1*/ fun get(/*0*/ index : jet.Int) : jet.Char
+    public final fun plus(/*0*/ other : jet.Any?) : jet.String
+    public open override /*1*/ fun toString() : jet.String
 }
-public final class jet.Tuple2</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2): jet.Tuple2<T1, T2>
-    public final val _1: T1
-    public final val _2: T2
+
+public open class Throwable {
+    public constructor Throwable(/*0*/ message : jet.String? = ..., /*1*/ cause : jet.Throwable? = ...)
+    public final fun getCause() : jet.Throwable?
+    public final fun getMessage() : jet.String?
+    public final fun printStackTrace() : Unit
 }
-public final class jet.Tuple20</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?, /*19*/ out T20 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?, /*19*/ out T20 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16, /*16*/ _17: T17, /*17*/ _18: T18, /*18*/ _19: T19, /*19*/ _20: T20): jet.Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _17: T17
-    public final val _18: T18
-    public final val _19: T19
-    public final val _1: T1
-    public final val _20: T20
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class Tuple0 {
+    private constructor Tuple0()
+    
+    public class object <class-object-for-Tuple0> {
+        private constructor <class-object-for-Tuple0>()
+        public final val VALUE : Unit
+    }
 }
-public final class jet.Tuple21</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?, /*19*/ out T20 : jet.Any?, /*20*/ out T21 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?, /*19*/ out T20 : jet.Any?, /*20*/ out T21 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16, /*16*/ _17: T17, /*17*/ _18: T18, /*18*/ _19: T19, /*19*/ _20: T20, /*20*/ _21: T21): jet.Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _17: T17
-    public final val _18: T18
-    public final val _19: T19
-    public final val _1: T1
-    public final val _20: T20
-    public final val _21: T21
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class Tuple1</*0*/ out T1> {
+    public constructor Tuple1</*0*/ out T1>(/*0*/ _1 : T1)
+    public final val _1 : T1
 }
-public final class jet.Tuple22</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?, /*19*/ out T20 : jet.Any?, /*20*/ out T21 : jet.Any?, /*21*/ out T22 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?, /*9*/ out T10 : jet.Any?, /*10*/ out T11 : jet.Any?, /*11*/ out T12 : jet.Any?, /*12*/ out T13 : jet.Any?, /*13*/ out T14 : jet.Any?, /*14*/ out T15 : jet.Any?, /*15*/ out T16 : jet.Any?, /*16*/ out T17 : jet.Any?, /*17*/ out T18 : jet.Any?, /*18*/ out T19 : jet.Any?, /*19*/ out T20 : jet.Any?, /*20*/ out T21 : jet.Any?, /*21*/ out T22 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9, /*9*/ _10: T10, /*10*/ _11: T11, /*11*/ _12: T12, /*12*/ _13: T13, /*13*/ _14: T14, /*14*/ _15: T15, /*15*/ _16: T16, /*16*/ _17: T17, /*17*/ _18: T18, /*18*/ _19: T19, /*19*/ _20: T20, /*20*/ _21: T21, /*21*/ _22: T22): jet.Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>
-    public final val _10: T10
-    public final val _11: T11
-    public final val _12: T12
-    public final val _13: T13
-    public final val _14: T14
-    public final val _15: T15
-    public final val _16: T16
-    public final val _17: T17
-    public final val _18: T18
-    public final val _19: T19
-    public final val _1: T1
-    public final val _20: T20
-    public final val _21: T21
-    public final val _22: T22
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class Tuple10</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10> {
+    public constructor Tuple10</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple3</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3): jet.Tuple3<T1, T2, T3>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
+
+public final class Tuple11</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11> {
+    public constructor Tuple11</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple4</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4): jet.Tuple4<T1, T2, T3, T4>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
+
+public final class Tuple12</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12> {
+    public constructor Tuple12</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple5</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5): jet.Tuple5<T1, T2, T3, T4, T5>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
+
+public final class Tuple13</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13> {
+    public constructor Tuple13</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple6</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6): jet.Tuple6<T1, T2, T3, T4, T5, T6>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
+
+public final class Tuple14</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14> {
+    public constructor Tuple14</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple7</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7): jet.Tuple7<T1, T2, T3, T4, T5, T6, T7>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
+
+public final class Tuple15</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15> {
+    public constructor Tuple15</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple8</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8): jet.Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
+
+public final class Tuple16</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16> {
+    public constructor Tuple16</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final class jet.Tuple9</*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T1 : jet.Any?, /*1*/ out T2 : jet.Any?, /*2*/ out T3 : jet.Any?, /*3*/ out T4 : jet.Any?, /*4*/ out T5 : jet.Any?, /*5*/ out T6 : jet.Any?, /*6*/ out T7 : jet.Any?, /*7*/ out T8 : jet.Any?, /*8*/ out T9 : jet.Any?><init>(/*0*/ _1: T1, /*1*/ _2: T2, /*2*/ _3: T3, /*3*/ _4: T4, /*4*/ _5: T5, /*5*/ _6: T6, /*6*/ _7: T7, /*7*/ _8: T8, /*8*/ _9: T9): jet.Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>
-    public final val _1: T1
-    public final val _2: T2
-    public final val _3: T3
-    public final val _4: T4
-    public final val _5: T5
-    public final val _6: T6
-    public final val _7: T7
-    public final val _8: T8
-    public final val _9: T9
+
+public final class Tuple17</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17> {
+    public constructor Tuple17</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _17 : T17
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final annotation class jet.atomic : jet.Annotation {
-    public final /*constructor*/ fun <init>(): jet.atomic
+
+public final class Tuple18</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18> {
+    public constructor Tuple18</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _17 : T17
+    public final val _18 : T18
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final annotation class jet.data : jet.Annotation {
-    public final /*constructor*/ fun <init>(): jet.data
+
+public final class Tuple19</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19> {
+    public constructor Tuple19</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _17 : T17
+    public final val _18 : T18
+    public final val _19 : T19
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final annotation class jet.deprecated : jet.Annotation {
-    public final /*constructor*/ fun <init>(/*0*/ value: jet.String): jet.deprecated
+
+public final class Tuple2</*0*/ out T1, /*1*/ out T2> {
+    public constructor Tuple2</*0*/ out T1, /*1*/ out T2>(/*0*/ _1 : T1, /*1*/ _2 : T2)
+    public final val _1 : T1
+    public final val _2 : T2
 }
-public final annotation class jet.volatile : jet.Annotation {
-    public final /*constructor*/ fun <init>(): jet.volatile
+
+public final class Tuple20</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20> {
+    public constructor Tuple20</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19, /*19*/ _20 : T20)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _17 : T17
+    public final val _18 : T18
+    public final val _19 : T19
+    public final val _2 : T2
+    public final val _20 : T20
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
 }
-public final fun </*0*/ T : jet.Any?>arrayOfNulls(/*0*/ size: jet.Int): jet.Array<T?>
-public final fun jet.Any?.equals(/*0*/ other: jet.Any?): jet.Boolean
-public final fun jet.Any?.identityEquals(/*0*/ other: jet.Any?): jet.Boolean
-public final fun jet.BooleanIterator.iterator(): jet.BooleanIterator
-public final fun jet.ByteIterator.iterator(): jet.ByteIterator
-public final fun jet.CharIterator.iterator(): jet.CharIterator
-public final fun jet.DoubleIterator.iterator(): jet.DoubleIterator
-public final fun jet.FloatIterator.iterator(): jet.FloatIterator
-public final fun jet.IntIterator.iterator(): jet.IntIterator
-public final fun </*0*/ T : jet.Any?>jet.Iterator<T>.iterator(): jet.Iterator<T>
-public final fun jet.LongIterator.iterator(): jet.LongIterator
-public final fun jet.ShortIterator.iterator(): jet.ShortIterator
-public final fun jet.String?.plus(/*0*/ other: jet.Any?): jet.String
-public final fun </*0*/ R : jet.Any?>synchronized(/*0*/ lock: jet.Any, /*1*/ block: jet.Function0<R>): R
-public final fun jet.Any?.toString(): jet.String
+
+public final class Tuple21</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21> {
+    public constructor Tuple21</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19, /*19*/ _20 : T20, /*20*/ _21 : T21)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _17 : T17
+    public final val _18 : T18
+    public final val _19 : T19
+    public final val _2 : T2
+    public final val _20 : T20
+    public final val _21 : T21
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
+}
+
+public final class Tuple22</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21, /*21*/ out T22> {
+    public constructor Tuple22</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21, /*21*/ out T22>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19, /*19*/ _20 : T20, /*20*/ _21 : T21, /*21*/ _22 : T22)
+    public final val _1 : T1
+    public final val _10 : T10
+    public final val _11 : T11
+    public final val _12 : T12
+    public final val _13 : T13
+    public final val _14 : T14
+    public final val _15 : T15
+    public final val _16 : T16
+    public final val _17 : T17
+    public final val _18 : T18
+    public final val _19 : T19
+    public final val _2 : T2
+    public final val _20 : T20
+    public final val _21 : T21
+    public final val _22 : T22
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
+}
+
+public final class Tuple3</*0*/ out T1, /*1*/ out T2, /*2*/ out T3> {
+    public constructor Tuple3</*0*/ out T1, /*1*/ out T2, /*2*/ out T3>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+}
+
+public final class Tuple4</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4> {
+    public constructor Tuple4</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+}
+
+public final class Tuple5</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5> {
+    public constructor Tuple5</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+}
+
+public final class Tuple6</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6> {
+    public constructor Tuple6</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+}
+
+public final class Tuple7</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7> {
+    public constructor Tuple7</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+}
+
+public final class Tuple8</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8> {
+    public constructor Tuple8</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+}
+
+public final class Tuple9</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9> {
+    public constructor Tuple9</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9)
+    public final val _1 : T1
+    public final val _2 : T2
+    public final val _3 : T3
+    public final val _4 : T4
+    public final val _5 : T5
+    public final val _6 : T6
+    public final val _7 : T7
+    public final val _8 : T8
+    public final val _9 : T9
+}
+
+public final annotation class atomic : jet.Annotation {
+    public constructor atomic()
+}
+
+public final annotation class data : jet.Annotation {
+    public constructor data()
+}
+
+public final annotation class deprecated : jet.Annotation {
+    public constructor deprecated(/*0*/ value : jet.String)
+}
+
+public final annotation class volatile : jet.Annotation {
+    public constructor volatile()
+}
+public final fun </*0*/ T> arrayOfNulls(/*0*/ size : jet.Int) : jet.Array<T?>
+public final fun jet.Any?.equals(/*0*/ other : jet.Any?) : jet.Boolean
+public final fun jet.Any?.identityEquals(/*0*/ other : jet.Any?) : jet.Boolean
+public final fun jet.BooleanIterator.iterator() : jet.BooleanIterator
+public final fun jet.ByteIterator.iterator() : jet.ByteIterator
+public final fun jet.CharIterator.iterator() : jet.CharIterator
+public final fun jet.DoubleIterator.iterator() : jet.DoubleIterator
+public final fun jet.FloatIterator.iterator() : jet.FloatIterator
+public final fun jet.IntIterator.iterator() : jet.IntIterator
+public final fun </*0*/ T> jet.Iterator<T>.iterator() : jet.Iterator<T>
+public final fun jet.LongIterator.iterator() : jet.LongIterator
+public final fun jet.ShortIterator.iterator() : jet.ShortIterator
+public final fun jet.String?.plus(/*0*/ other : jet.Any?) : jet.String
+public final fun </*0*/ R> synchronized(/*0*/ lock : jet.Any, /*1*/ block : () -> R) : R
+public final fun jet.Any?.toString() : jet.String
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_non_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_non_static.txt
index 8c0d66ac890..a90d5a45c24 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_non_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_non_static.txt
@@ -1,16 +1,19 @@
 namespace test
 
-public open class test.DeeplyInnerClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.DeeplyInnerClass
-    package open class test.DeeplyInnerClass.A : java.lang.Object {
-        package final /*constructor*/ fun <init>(): test.DeeplyInnerClass.A
-        package open fun a(): jet.Tuple0
-        package open class test.DeeplyInnerClass.A.B : java.lang.Object {
-            package final /*constructor*/ fun <init>(): test.DeeplyInnerClass.A.B
-            package open fun b(): jet.Tuple0
-            package open class test.DeeplyInnerClass.A.B.C : java.lang.Object {
-                package final /*constructor*/ fun <init>(): test.DeeplyInnerClass.A.B.C
-                package open fun c(): jet.Tuple0
+public open class DeeplyInnerClass : java.lang.Object {
+    public constructor DeeplyInnerClass()
+    
+    public/*package*/ open class A : java.lang.Object {
+        public/*package*/ constructor A()
+        public/*package*/ open fun a() : Unit
+        
+        public/*package*/ open class B : java.lang.Object {
+            public/*package*/ constructor B()
+            public/*package*/ open fun b() : Unit
+            
+            public/*package*/ open class C : java.lang.Object {
+                public/*package*/ constructor C()
+                public/*package*/ open fun c() : Unit
             }
         }
     }
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_static.txt
index 773e59b1f3c..80282a86e58 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/DeeplyInnerClass_static.txt
@@ -1,2 +1 @@
 namespace DeeplyInnerClass
-
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/Enum_non_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/Enum_non_static.txt
index ac5783016bf..be6ceaf5be5 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/Enum_non_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/Enum_non_static.txt
@@ -1,23 +1,26 @@
 namespace test
 
-public final enum class test.Enum : jet.Enum<test.Enum> {
-    private final /*constructor*/ fun <init>(): test.Enum
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    public open class test.Enum.Inner : java.lang.Object {
-        public final /*constructor*/ fun <init>(): test.Enum.Inner
-        package open fun bar(): jet.Tuple0
-    }
-    public final class object test.Enum.<class-object-for-Enum> {
-        private final /*constructor*/ fun <init>(): test.Enum.<class-object-for-Enum>
-        public final val A: test.Enum
-        public final val B: test.Enum
-        public final val C: test.Enum
-        public open class test.Enum.Nested : java.lang.Object {
-            public final /*constructor*/ fun <init>(): test.Enum.Nested
-            package open fun foo(): jet.Tuple0
+public final enum class Enum : jet.Enum<test.Enum> {
+    private constructor Enum()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    public class object <class-object-for-Enum> {
+        private constructor <class-object-for-Enum>()
+        public final val A : test.Enum
+        public final val B : test.Enum
+        public final val C : test.Enum
+        public final fun valueOf(/*0*/ value : jet.String) : test.Enum
+        public final fun values() : jet.Array<test.Enum>
+        
+        public open class Nested : java.lang.Object {
+            public constructor Nested()
+            public/*package*/ open fun foo() : Unit
         }
-        public final fun valueOf(/*0*/ value: jet.String): test.Enum
-        public final fun values(): jet.Array<test.Enum>
+    }
+    
+    public open class Inner : java.lang.Object {
+        public constructor Inner()
+        public/*package*/ open fun bar() : Unit
     }
 }
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_non_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_non_static.txt
index 593ed9c9c1d..8f4da88a22b 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_non_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_non_static.txt
@@ -1,9 +1,10 @@
 namespace test
 
-public open class test.InnerClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.InnerClass
-    public open class test.InnerClass.Inner : java.lang.Object {
-        public final /*constructor*/ fun <init>(): test.InnerClass.Inner
-        public open fun foo(): jet.Tuple0
+public open class InnerClass : java.lang.Object {
+    public constructor InnerClass()
+    
+    public open class Inner : java.lang.Object {
+        public constructor Inner()
+        public open fun foo() : Unit
     }
 }
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_static.txt
index e06bffebef5..db7cf3e9fcd 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/InnerClass_static.txt
@@ -1,6 +1,6 @@
 namespace InnerClass
 
-public open class test.InnerClass.Nested : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.InnerClass.Nested
-    public open fun bar(): jet.Tuple0
+public open class Nested : java.lang.Object {
+    public constructor Nested()
+    public open fun bar() : Unit
 }
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/Simple_non_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/Simple_non_static.txt
index d3aefed9fc2..9967c13d11c 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/Simple_non_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/Simple_non_static.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.Simple : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.Simple
-    public open fun foo(): jet.Tuple0
+public open class Simple : java.lang.Object {
+    public constructor Simple()
+    public open fun foo() : Unit
 }
diff --git a/compiler/testData/javaDescriptorResolver/staticMembers/Simple_static.txt b/compiler/testData/javaDescriptorResolver/staticMembers/Simple_static.txt
index e31cb6e95d5..0d459691e2b 100644
--- a/compiler/testData/javaDescriptorResolver/staticMembers/Simple_static.txt
+++ b/compiler/testData/javaDescriptorResolver/staticMembers/Simple_static.txt
@@ -1,3 +1,2 @@
 namespace Simple
-
-public open fun bar(): jet.Tuple0
+public open fun bar() : Unit
diff --git a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
index 25de02fd4bb..db60842fb7c 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
@@ -1,12 +1,14 @@
 namespace test
 
-internal final class test.B : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.B
-    internal final class test.B.B : jet.Any {
-        public final /*primary constructor*/ fun <init>(): test.B.B
-        internal final fun foo(/*0*/ b: test.B.B.C): jet.Tuple0
-        internal final class test.B.B.C : jet.Any {
-            public final /*primary constructor*/ fun <init>(): test.B.B.C
+internal final class B {
+    /*primary*/ public constructor B()
+    
+    internal final class B {
+        /*primary*/ public constructor B()
+        internal final fun foo(/*0*/ b : test.B.B.C) : Unit
+        
+        internal final class C {
+            /*primary*/ public constructor C()
         }
     }
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
index 8659f9896a3..b6262c8e385 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
@@ -1,10 +1,11 @@
 namespace test
 
-internal open class test.A : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.A
-    internal open fun foo(/*0*/ a: [ERROR : E]): jet.Tuple0
+internal open class A {
+    /*primary*/ public constructor A()
+    internal open fun foo(/*0*/ a : [ERROR : E]) : Unit
 }
-internal final class test.B : test.A {
-    public final /*primary constructor*/ fun <init>(): test.B
-    internal open override /*1*/ fun foo(/*0*/ a: [ERROR : E]): jet.Tuple0
+
+internal final class B : test.A {
+    /*primary*/ public constructor B()
+    internal open override /*1*/ fun foo(/*0*/ a : [ERROR : E]) : Unit
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.txt b/compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.txt
index 0840c9b0300..b61682852b4 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.txt
@@ -1,11 +1,13 @@
 namespace test
 
-internal final class test.Some : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Some
-    [ERROR : Unresolved annotation type]() internal final class object test.Some.<class-object-for-Some> : jet.Any {
-        private final /*constructor*/ fun <init>(): test.Some.<class-object-for-Some>
-        internal final annotation class test.Some.<class-object-for-Some>.TestAnnotation : jet.Annotation {
-            public final /*constructor*/ fun <init>(): test.Some.<class-object-for-Some>.TestAnnotation
+internal final class Some {
+    /*primary*/ public constructor Some()
+    
+    [ERROR : Unresolved annotation type]() internal class object <class-object-for-Some> {
+        /*primary*/ private constructor <class-object-for-Some>()
+        
+        internal final annotation class TestAnnotation : jet.Annotation {
+            /*primary*/ public constructor TestAnnotation()
         }
     }
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt b/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt
index 58aec3ebc63..3b02c734572 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt
@@ -1,12 +1,14 @@
 namespace test
 
-internal final class test.TestSome</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.TestSome<P>
-    internal final class object test.TestSome.<class-object-for-TestSome> : test.ToResolve<[ERROR : P]> {
-        private final /*constructor*/ fun <init>(): test.TestSome.<class-object-for-TestSome>
+internal final class TestSome</*0*/ P> {
+    /*primary*/ public constructor TestSome</*0*/ P>()
+    
+    internal class object <class-object-for-TestSome> : test.ToResolve<[ERROR : P]> {
+        /*primary*/ private constructor <class-object-for-TestSome>()
     }
 }
-internal open class test.ToResolve</*0*/ SomeClass : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ SomeClass : jet.Any?><init>(/*0*/ f: jet.Function1<jet.Int, jet.Int>): test.ToResolve<SomeClass>
+
+internal open class ToResolve</*0*/ SomeClass> {
+    /*primary*/ public constructor ToResolve</*0*/ SomeClass>(/*0*/ f : (jet.Int) -> jet.Int)
 }
-internal final fun testFun(/*0*/ a: jet.Int): jet.Int
+internal final fun testFun(/*0*/ a : jet.Int) : jet.Int
diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.txt b/compiler/testData/lazyResolve/namespaceComparator/enum.txt
index b10b07ac073..b832f632def 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/enum.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/enum.txt
@@ -1,24 +1,27 @@
 namespace test
 
-internal final enum class test.Test : jet.Enum<test.Test> {
-    private final /*primary constructor*/ fun <init>(/*0*/ a: jet.Int): test.Test
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.Test.<class-object-for-Test> {
-        private final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>
-        public final val A: test.Test
-        public final val B: test.Test
-        private final enum entry test.Test.<class-object-for-Test>.A : test.Test {
-            private final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.A
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+internal final enum class Test : jet.Enum<test.Test> {
+    /*primary*/ private constructor Test(/*0*/ a : jet.Int)
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-Test> {
+        /*primary*/ private constructor <class-object-for-Test>()
+        public final val A : test.Test
+        public final val B : test.Test
+        public final fun valueOf(/*0*/ value : jet.String) : test.Test
+        public final fun values() : jet.Array<test.Test>
+        
+        private enum entry A : test.Test {
+            /*primary*/ private constructor A()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
         }
-        private final enum entry test.Test.<class-object-for-Test>.B : test.Test {
-            private final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.B
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+        
+        private enum entry B : test.Test {
+            /*primary*/ private constructor B()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
         }
-        public final fun valueOf(/*0*/ value: jet.String): test.Test
-        public final fun values(): jet.Array<test.Test>
     }
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt
index 2d6be9bf0af..899f1c0c129 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt
@@ -1,4 +1,3 @@
 namespace test
-
-internal final val fromImported: jet.Int
-internal final val normal: jet.Int
+internal final val fromImported : jet.Int
+internal final val normal : jet.Int
diff --git a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
index 01145831f9f..fbf78143a94 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ T : jet.Any?>foo(/*0*/ t: T): T
+internal final fun </*0*/ T> foo(/*0*/ t : T) : T
diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt b/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt
index ce06cfded75..71e6d1fba7c 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt
@@ -1,10 +1,11 @@
 namespace test
 
-internal final class test.A : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.A
-    internal final val B: test.A.B
-    internal final object test.A.B : jet.Any {
-        private final /*primary constructor*/ fun <init>(): test.A.B
-        internal final fun foo(/*0*/ a: jet.Int): jet.String
+internal final class A {
+    /*primary*/ public constructor A()
+    internal final val B : test.A.B
+    
+    internal object B {
+        /*primary*/ private constructor B()
+        internal final fun foo(/*0*/ a : jet.Int) : jet.String
     }
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt b/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt
index d15598edcf8..135e2b10358 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt
@@ -1,7 +1,7 @@
 namespace test
 
-internal final object test.SomeObject : jet.Any {
-    private final /*primary constructor*/ fun <init>(): test.SomeObject
-    internal final fun test(/*0*/ a: jet.Int): jet.Int
+internal object SomeObject {
+    /*primary*/ private constructor SomeObject()
+    internal final fun test(/*0*/ a : jet.Int) : jet.Int
 }
-internal final val SomeObject: test.SomeObject
+internal final val SomeObject : test.SomeObject
diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
index 82c3e0fbdd7..c276eb91dc6 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final object test.Bar : jet.Any {
-    private final /*primary constructor*/ fun <init>(): test.Bar
+internal object Bar {
+    /*primary*/ private constructor Bar()
 }
-internal final val Bar: test.Bar
+internal final val Bar : test.Bar
diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
index d8734201c25..ac9a84cd333 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
@@ -1,26 +1,28 @@
 namespace test
-
 // <namespace name="p">
 namespace p
 
-internal final class test.p.C : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.p.C
-    internal final fun f(): jet.Tuple0
+internal final class C {
+    /*primary*/ public constructor C()
+    internal final fun f() : Unit
 }
-internal open class test.p.G</*0*/ T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(): test.p.G<T>
-    internal final fun a(): jet.Tuple0
-    internal open fun f(): T
+
+internal open class G</*0*/ T> {
+    /*primary*/ public constructor G</*0*/ T>()
+    internal final fun a() : Unit
+    internal open fun f() : T
 }
-internal final class test.p.G2</*0*/ E : jet.Any?> : test.p.G<E> {
-    public final /*primary constructor*/ fun </*0*/ E : jet.Any?><init>(): test.p.G2<E>
-    internal final override /*1*/ /*fake_override*/ fun a(): jet.Tuple0
-    internal open override /*1*/ fun f(): E
-    internal final fun g(): E
+
+internal final class G2</*0*/ E> : test.p.G<E> {
+    /*primary*/ public constructor G2</*0*/ E>()
+    internal final override /*1*/ /*fake_override*/ fun a() : Unit
+    internal open override /*1*/ fun f() : E
+    internal final fun g() : E
 }
-internal final fun foo(): jet.Tuple0
-internal final fun foo(/*0*/ a: test.p.C): jet.Tuple0
+internal final fun foo() : Unit
+internal final fun foo(/*0*/ a : test.p.C) : Unit
 // </namespace name="p">
-internal final class test.A : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.A
+
+internal final class A {
+    /*primary*/ public constructor A()
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt b/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt
index 1ddb01f2631..b693aa1f399 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.CompositeIterator</*0*/ T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ vararg iterators: java.util.Iterator<T> /*jet.Array<java.util.Iterator<T>>*/): test.CompositeIterator<T>
-    internal final val iteratorsIter: jet.Iterator<java.util.Iterator<T>>
+internal final class CompositeIterator</*0*/ T> {
+    /*primary*/ public constructor CompositeIterator</*0*/ T>(/*0*/ vararg iterators : java.util.Iterator<T> /*jet.Array<java.util.Iterator<T>>*/)
+    internal final val iteratorsIter : jet.Iterator<java.util.Iterator<T>>
 }
diff --git a/compiler/testData/loadJava/ArrayTypeVariance.txt b/compiler/testData/loadJava/ArrayTypeVariance.txt
index 71f3a033fa4..b894a920a92 100644
--- a/compiler/testData/loadJava/ArrayTypeVariance.txt
+++ b/compiler/testData/loadJava/ArrayTypeVariance.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public final class test.ArrayTypeVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ArrayTypeVariance
-    public final fun toArray(/*0*/ p0: jet.Array<out jet.Any>?): jet.Array<jet.Any>?
+public final class ArrayTypeVariance : java.lang.Object {
+    public constructor ArrayTypeVariance()
+    public final fun toArray(/*0*/ p0 : jet.Array<out jet.Any>?) : jet.Array<jet.Any>?
 }
diff --git a/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
index c949b097ff0..4487f02c0f0 100644
--- a/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
@@ -1,26 +1,26 @@
 namespace test
 
-public abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
-    public final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
-    public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getDate(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getDay(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getHours(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getMinutes(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getMonth(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getSeconds(): jet.Int
-    public open override /*1*/ /*fake_override*/ fun getTime(): jet.Long
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getTimezoneOffset(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getYear(): jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
-    public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toGMTString(): jet.String
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toLocaleString(): jet.String
+public abstract class ClassDoesNotOverrideMethod : java.util.Date {
+    public constructor ClassDoesNotOverrideMethod()
+    public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0 : java.util.Date) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0 : java.util.Date) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0 : java.util.Date) : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds() : jet.Int
+    public open override /*1*/ /*fake_override*/ fun getTime() : jet.Long
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear() : jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0 : jet.Int) : Unit
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0 : jet.Int) : Unit
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0 : jet.Int) : Unit
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0 : jet.Int) : Unit
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0 : jet.Int) : Unit
+    public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0 : jet.Long) : Unit
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0 : jet.Int) : Unit
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString() : jet.String
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString() : jet.String
 }
diff --git a/compiler/testData/loadJava/ClassWithTypeP.txt b/compiler/testData/loadJava/ClassWithTypeP.txt
index aa310c17113..cfa907ac5f9 100644
--- a/compiler/testData/loadJava/ClassWithTypeP.txt
+++ b/compiler/testData/loadJava/ClassWithTypeP.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public final class test.ClassWithTypeP</*0*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeP<P>
+public final class ClassWithTypeP</*0*/ P> : java.lang.Object {
+    public constructor ClassWithTypeP</*0*/ P>()
 }
diff --git a/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
index e9277966e1e..6d1489bf8ec 100644
--- a/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.MutableIterable<P> {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator<P>
+public abstract class ClassWithTypePExtendsIterableP</*0*/ P> : jet.MutableIterable<P> {
+    public constructor ClassWithTypePExtendsIterableP</*0*/ P>()
+    public abstract override /*1*/ /*fake_override*/ fun iterator() : jet.MutableIterator<P>
 }
diff --git a/compiler/testData/loadJava/ClassWithTypePP.txt b/compiler/testData/loadJava/ClassWithTypePP.txt
index f9cfcc96df5..f60300f6382 100644
--- a/compiler/testData/loadJava/ClassWithTypePP.txt
+++ b/compiler/testData/loadJava/ClassWithTypePP.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public final class test.ClassWithTypePP</*0*/ P : jet.Any?, /*1*/ Q : P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypePP<P, Q>
+public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P> : java.lang.Object {
+    public constructor ClassWithTypePP</*0*/ P, /*1*/ Q : P>()
 }
diff --git a/compiler/testData/loadJava/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/ClassWithTypePRefNext.txt
index 257c0b4832f..246ecadeb82 100644
--- a/compiler/testData/loadJava/ClassWithTypePRefNext.txt
+++ b/compiler/testData/loadJava/ClassWithTypePRefNext.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
+public open class ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P> : java.lang.Object {
+    public constructor ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P>()
 }
diff --git a/compiler/testData/loadJava/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/ClassWithTypePRefSelf.txt
index 41c3158a356..04ed85e62ab 100644
--- a/compiler/testData/loadJava/ClassWithTypePRefSelf.txt
+++ b/compiler/testData/loadJava/ClassWithTypePRefSelf.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public final class test.ClassWithTypePRefSelf</*0*/ P : jet.Enum<P>?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Enum<P>?><init>(): test.ClassWithTypePRefSelf<P>
+public final class ClassWithTypePRefSelf</*0*/ P : jet.Enum<P>?> : java.lang.Object {
+    public constructor ClassWithTypePRefSelf</*0*/ P : jet.Enum<P>?>()
 }
diff --git a/compiler/testData/loadJava/FieldAsVar.txt b/compiler/testData/loadJava/FieldAsVar.txt
index 16dc92beaa1..41243677f78 100644
--- a/compiler/testData/loadJava/FieldAsVar.txt
+++ b/compiler/testData/loadJava/FieldAsVar.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public final class test.FieldAsVar : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.FieldAsVar
-    public final var f: jet.Int
+public final class FieldAsVar : java.lang.Object {
+    public constructor FieldAsVar()
+    public final var f : jet.Int
 }
diff --git a/compiler/testData/loadJava/FieldOfArrayType.txt b/compiler/testData/loadJava/FieldOfArrayType.txt
index e354aa5d6da..85221bf497e 100644
--- a/compiler/testData/loadJava/FieldOfArrayType.txt
+++ b/compiler/testData/loadJava/FieldOfArrayType.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.FieldOfArrayType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.FieldOfArrayType
-    public final var files: jet.Array<java.io.File>?
+public open class FieldOfArrayType : java.lang.Object {
+    public constructor FieldOfArrayType()
+    public final var files : jet.Array<java.io.File>?
 }
diff --git a/compiler/testData/loadJava/FinalFieldAsVal.txt b/compiler/testData/loadJava/FinalFieldAsVal.txt
index eb77d5ad74d..c8d8a150ff8 100644
--- a/compiler/testData/loadJava/FinalFieldAsVal.txt
+++ b/compiler/testData/loadJava/FinalFieldAsVal.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public final class test.FinalFieldAsVal : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.FinalFieldAsVal
-    public final val f: jet.Int
+public final class FinalFieldAsVal : java.lang.Object {
+    public constructor FinalFieldAsVal()
+    public final val f : jet.Int
 }
diff --git a/compiler/testData/loadJava/InnerClass.txt b/compiler/testData/loadJava/InnerClass.txt
index d58b0e44d39..7a5cb0b2f27 100644
--- a/compiler/testData/loadJava/InnerClass.txt
+++ b/compiler/testData/loadJava/InnerClass.txt
@@ -1,8 +1,9 @@
 namespace test
 
-public open class test.InnerClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.InnerClass
-    public open class test.InnerClass.Inner : java.lang.Object {
-        public final /*constructor*/ fun <init>(): test.InnerClass.Inner
+public open class InnerClass : java.lang.Object {
+    public constructor InnerClass()
+    
+    public open class Inner : java.lang.Object {
+        public constructor Inner()
     }
 }
diff --git a/compiler/testData/loadJava/InnerClassReferencesOuterTP.txt b/compiler/testData/loadJava/InnerClassReferencesOuterTP.txt
index 7a237894e8d..80e317fe520 100644
--- a/compiler/testData/loadJava/InnerClassReferencesOuterTP.txt
+++ b/compiler/testData/loadJava/InnerClassReferencesOuterTP.txt
@@ -1,8 +1,9 @@
 namespace test
 
-public open class test.InnerClassReferencesOuterTP</*0*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.InnerClassReferencesOuterTP<P>
-    public open class test.InnerClassReferencesOuterTP.Inner</*0*/ Q : P> : java.lang.Object {
-        public final /*constructor*/ fun </*0*/ Q : P><init>(): test.InnerClassReferencesOuterTP.Inner<Q>
+public open class InnerClassReferencesOuterTP</*0*/ P> : java.lang.Object {
+    public constructor InnerClassReferencesOuterTP</*0*/ P>()
+    
+    public open class Inner</*0*/ Q : P> : java.lang.Object {
+        public constructor Inner</*0*/ Q : P>()
     }
 }
diff --git a/compiler/testData/loadJava/InnerClassesInGeneric.txt b/compiler/testData/loadJava/InnerClassesInGeneric.txt
index e67437fc583..1e45fe01d2e 100644
--- a/compiler/testData/loadJava/InnerClassesInGeneric.txt
+++ b/compiler/testData/loadJava/InnerClassesInGeneric.txt
@@ -1,12 +1,14 @@
 namespace test
 
-public open class test.InnerClassesInGeneric</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.InnerClassesInGeneric<P, Q>
-    public open class test.InnerClassesInGeneric.Inner : java.lang.Object {
-        public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner
+public open class InnerClassesInGeneric</*0*/ P, /*1*/ Q> : java.lang.Object {
+    public constructor InnerClassesInGeneric</*0*/ P, /*1*/ Q>()
+    
+    public open class Inner : java.lang.Object {
+        public constructor Inner()
     }
-    public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner {
-        public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner2
-        public open fun iterator(): jet.MutableIterator<P>?
+    
+    public open class Inner2 : test.InnerClassesInGeneric.Inner {
+        public constructor Inner2()
+        public open fun iterator() : jet.MutableIterator<P>?
     }
 }
diff --git a/compiler/testData/loadJava/MethodReferencesOuterClassTP.txt b/compiler/testData/loadJava/MethodReferencesOuterClassTP.txt
index 71b7d70a5da..ec0406636f0 100644
--- a/compiler/testData/loadJava/MethodReferencesOuterClassTP.txt
+++ b/compiler/testData/loadJava/MethodReferencesOuterClassTP.txt
@@ -1,9 +1,10 @@
 namespace test
 
-public final class test.MethodReferencesOuterClassTP</*0*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodReferencesOuterClassTP<P>
-    public final class test.MethodReferencesOuterClassTP.Inner : java.lang.Object {
-        public final /*constructor*/ fun <init>(): test.MethodReferencesOuterClassTP.Inner
-        public final fun </*0*/ Q : P>f(): jet.Tuple0
+public final class MethodReferencesOuterClassTP</*0*/ P> : java.lang.Object {
+    public constructor MethodReferencesOuterClassTP</*0*/ P>()
+    
+    public final class Inner : java.lang.Object {
+        public constructor Inner()
+        public final fun </*0*/ Q : P> f() : Unit
     }
 }
diff --git a/compiler/testData/loadJava/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/MethodTypePOneUpperBound.txt
index fcbca59b948..cb770a4d8af 100644
--- a/compiler/testData/loadJava/MethodTypePOneUpperBound.txt
+++ b/compiler/testData/loadJava/MethodTypePOneUpperBound.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodTypePOneUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodTypePOneUpperBound
-    public open fun </*0*/ T : java.lang.Cloneable?>bar(): jet.Tuple0
+public open class MethodTypePOneUpperBound : java.lang.Object {
+    public constructor MethodTypePOneUpperBound()
+    public open fun </*0*/ T : java.lang.Cloneable?> bar() : Unit
 }
diff --git a/compiler/testData/loadJava/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/MethodTypePTwoUpperBounds.txt
index fd4f17472f4..48bd4c9866c 100644
--- a/compiler/testData/loadJava/MethodTypePTwoUpperBounds.txt
+++ b/compiler/testData/loadJava/MethodTypePTwoUpperBounds.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodTypePTwoUpperBounds : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodTypePTwoUpperBounds
-    public open fun </*0*/ T : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.Tuple0
+public open class MethodTypePTwoUpperBounds : java.lang.Object {
+    public constructor MethodTypePTwoUpperBounds()
+    public open fun </*0*/ T> foo() : Unit where T : java.lang.Cloneable?, T : java.lang.Runnable?
 }
diff --git a/compiler/testData/loadJava/MethodWithTypeP.txt b/compiler/testData/loadJava/MethodWithTypeP.txt
index dab635cc5d8..0f6c45241a3 100644
--- a/compiler/testData/loadJava/MethodWithTypeP.txt
+++ b/compiler/testData/loadJava/MethodWithTypeP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public final class test.MethodWithTypeP : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypeP
-    public final fun </*0*/ P : jet.Any?>f(): jet.Tuple0
+public final class MethodWithTypeP : java.lang.Object {
+    public constructor MethodWithTypeP()
+    public final fun </*0*/ P> f() : Unit
 }
diff --git a/compiler/testData/loadJava/MethodWithTypePP.txt b/compiler/testData/loadJava/MethodWithTypePP.txt
index a90e8166c56..a0589b57f07 100644
--- a/compiler/testData/loadJava/MethodWithTypePP.txt
+++ b/compiler/testData/loadJava/MethodWithTypePP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public final class test.MethodWithTypePP : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypePP
-    public final fun </*0*/ P : jet.Any?, /*1*/ Q : P>f(): jet.Tuple0
+public final class MethodWithTypePP : java.lang.Object {
+    public constructor MethodWithTypePP()
+    public final fun </*0*/ P, /*1*/ Q : P> f() : Unit
 }
diff --git a/compiler/testData/loadJava/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/MethodWithTypePRefClassP.txt
index 01f34dc8a98..b9ef1289b25 100644
--- a/compiler/testData/loadJava/MethodWithTypePRefClassP.txt
+++ b/compiler/testData/loadJava/MethodWithTypePRefClassP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP<P>
-    public final fun </*0*/ Q : P>f(): jet.Tuple0
+public open class MethodWithTypePRefClassP</*0*/ P> : java.lang.Object {
+    public constructor MethodWithTypePRefClassP</*0*/ P>()
+    public final fun </*0*/ Q : P> f() : Unit
 }
diff --git a/compiler/testData/loadJava/MethosWithPRefTP.txt b/compiler/testData/loadJava/MethosWithPRefTP.txt
index c356cd01a95..6c0648b4725 100644
--- a/compiler/testData/loadJava/MethosWithPRefTP.txt
+++ b/compiler/testData/loadJava/MethosWithPRefTP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public final class test.MethosWithPRefTP : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethosWithPRefTP
-    public final fun </*0*/ P : jet.Any?>f(/*0*/ p0: P?): jet.Tuple0
+public final class MethosWithPRefTP : java.lang.Object {
+    public constructor MethosWithPRefTP()
+    public final fun </*0*/ P> f(/*0*/ p0 : P?) : Unit
 }
diff --git a/compiler/testData/loadJava/MyException.txt b/compiler/testData/loadJava/MyException.txt
index f7d6a6a6c5d..d445725cd54 100644
--- a/compiler/testData/loadJava/MyException.txt
+++ b/compiler/testData/loadJava/MyException.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.MyException : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?): test.MyException
+public open class MyException : java.lang.Object {
+    public constructor MyException(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.Throwable?)
 }
diff --git a/compiler/testData/loadJava/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/RemoveRedundantProjectionKind.txt
index a876698366f..6e24356ed0e 100644
--- a/compiler/testData/loadJava/RemoveRedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract trait test.RemoveRedundantProjectionKind : java.lang.Object {
-    public abstract fun f(/*0*/ p0: jet.Collection<jet.CharSequence?>?): jet.Tuple0
-    public abstract fun f(/*0*/ p0: jet.Comparable<jet.CharSequence?>?): jet.Tuple0
+public trait RemoveRedundantProjectionKind : java.lang.Object {
+    public abstract fun f(/*0*/ p0 : jet.Collection<jet.CharSequence?>?) : Unit
+    public abstract fun f(/*0*/ p0 : jet.Comparable<jet.CharSequence?>?) : Unit
 }
diff --git a/compiler/testData/loadJava/Simple.txt b/compiler/testData/loadJava/Simple.txt
index eb3968ca248..82b978cf65c 100644
--- a/compiler/testData/loadJava/Simple.txt
+++ b/compiler/testData/loadJava/Simple.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public final class test.Simple : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.Simple
+public final class Simple : java.lang.Object {
+    public constructor Simple()
 }
diff --git a/compiler/testData/loadJava/TwoFields.txt b/compiler/testData/loadJava/TwoFields.txt
index 68c6f20e16d..38af2f1a0e9 100644
--- a/compiler/testData/loadJava/TwoFields.txt
+++ b/compiler/testData/loadJava/TwoFields.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public final class test.TwoFields : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.TwoFields
-    public final var a: jet.Int
-    public final var b: jet.Short
+public final class TwoFields : java.lang.Object {
+    public constructor TwoFields()
+    public final var a : jet.Int
+    public final var b : jet.Short
 }
diff --git a/compiler/testData/loadJava/UnboundWildcard.txt b/compiler/testData/loadJava/UnboundWildcard.txt
index ede768f6e6d..18f59416b9d 100644
--- a/compiler/testData/loadJava/UnboundWildcard.txt
+++ b/compiler/testData/loadJava/UnboundWildcard.txt
@@ -1,8 +1,9 @@
 namespace test
 
-public final class test.UnboundWildcard : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.UnboundWildcard
-    public final fun foo(): test.UnboundWildcard.MyClass<out jet.CharSequence?>?
-    public abstract trait test.UnboundWildcard.MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
+public final class UnboundWildcard : java.lang.Object {
+    public constructor UnboundWildcard()
+    public final fun foo() : test.UnboundWildcard.MyClass<out jet.CharSequence?>?
+    
+    public trait MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
     }
 }
diff --git a/compiler/testData/loadJava/annotation/AnnotatedAnnotation.txt b/compiler/testData/loadJava/annotation/AnnotatedAnnotation.txt
index 075226dcfac..adf85f53d06 100644
--- a/compiler/testData/loadJava/annotation/AnnotatedAnnotation.txt
+++ b/compiler/testData/loadJava/annotation/AnnotatedAnnotation.txt
@@ -1,5 +1,5 @@
 namespace test
 
-test.AnnotatedAnnotation() public final annotation class test.AnnotatedAnnotation : jet.Annotation {
-    public final /*constructor*/ fun <init>(): test.AnnotatedAnnotation
+test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : jet.Annotation {
+    public constructor AnnotatedAnnotation()
 }
diff --git a/compiler/testData/loadJava/annotation/AnnotatedMethod.txt b/compiler/testData/loadJava/annotation/AnnotatedMethod.txt
index 1b366a43fbb..9dfd0b2c2cf 100644
--- a/compiler/testData/loadJava/annotation/AnnotatedMethod.txt
+++ b/compiler/testData/loadJava/annotation/AnnotatedMethod.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.AnnotatedMethod : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.AnnotatedMethod
-    public open jet.deprecated(value = "Deprecated in Java") fun f(): jet.Tuple0
+public open class AnnotatedMethod : java.lang.Object {
+    public constructor AnnotatedMethod()
+    jet.deprecated(value = "Deprecated in Java") public open fun f() : Unit
 }
diff --git a/compiler/testData/loadJava/annotation/SimpleAnnotation.txt b/compiler/testData/loadJava/annotation/SimpleAnnotation.txt
index e68ebbb09b9..c500c3be523 100644
--- a/compiler/testData/loadJava/annotation/SimpleAnnotation.txt
+++ b/compiler/testData/loadJava/annotation/SimpleAnnotation.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public final annotation class test.SimpleAnnotation : jet.Annotation {
-    public final /*constructor*/ fun <init>(): test.SimpleAnnotation
+public final annotation class SimpleAnnotation : jet.Annotation {
+    public constructor SimpleAnnotation()
 }
diff --git a/compiler/testData/loadJava/constructor/ConstructorGenericDeep.txt b/compiler/testData/loadJava/constructor/ConstructorGenericDeep.txt
index 926ee2a6345..16b30f73a0e 100644
--- a/compiler/testData/loadJava/constructor/ConstructorGenericDeep.txt
+++ b/compiler/testData/loadJava/constructor/ConstructorGenericDeep.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorGenericDeep : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: java.lang.Class<jet.Any?>?): test.ConstructorGenericDeep
+public open class ConstructorGenericDeep : java.lang.Object {
+    public constructor ConstructorGenericDeep(/*0*/ p0 : java.lang.Class<jet.Any?>?)
 }
diff --git a/compiler/testData/loadJava/constructor/ConstructorGenericSimple.txt b/compiler/testData/loadJava/constructor/ConstructorGenericSimple.txt
index 98808de5f83..79fdd47b48f 100644
--- a/compiler/testData/loadJava/constructor/ConstructorGenericSimple.txt
+++ b/compiler/testData/loadJava/constructor/ConstructorGenericSimple.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorGenericSimple : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.Any?): test.ConstructorGenericSimple
+public open class ConstructorGenericSimple : java.lang.Object {
+    public constructor ConstructorGenericSimple(/*0*/ p0 : jet.Any?)
 }
diff --git a/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.txt b/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.txt
index 3f9d824e170..ca00038ca97 100644
--- a/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorGenericUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: java.util.RandomAccess?): test.ConstructorGenericUpperBound
+public open class ConstructorGenericUpperBound : java.lang.Object {
+    public constructor ConstructorGenericUpperBound(/*0*/ p0 : java.util.RandomAccess?)
 }
diff --git a/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.txt
index 5334268899f..96c97e5da01 100644
--- a/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.DifferentGetterAndSetter : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.DifferentGetterAndSetter
-    public open fun getSomething(): jet.Int
-    public open fun setSomething(/*0*/ p0: jet.String?): jet.Tuple0
+public open class DifferentGetterAndSetter : java.lang.Object {
+    public constructor DifferentGetterAndSetter()
+    public open fun getSomething() : jet.Int
+    public open fun setSomething(/*0*/ p0 : jet.String?) : Unit
 }
diff --git a/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.txt
index 5617dfd6b66..619bdf5d81a 100644
--- a/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.txt
+++ b/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public abstract trait test.JavaBeanAbstractGetter : java.lang.Object {
-    public abstract fun getRed(): jet.Int
+public trait JavaBeanAbstractGetter : java.lang.Object {
+    public abstract fun getRed() : jet.Int
 }
diff --git a/compiler/testData/loadJava/javaBean/JavaBeanVal.txt b/compiler/testData/loadJava/javaBean/JavaBeanVal.txt
index 40482144161..6da0e438211 100644
--- a/compiler/testData/loadJava/javaBean/JavaBeanVal.txt
+++ b/compiler/testData/loadJava/javaBean/JavaBeanVal.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.JavaBeanVal : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.JavaBeanVal
-    public open fun getColor(): jet.String?
+public open class JavaBeanVal : java.lang.Object {
+    public constructor JavaBeanVal()
+    public open fun getColor() : jet.String?
 }
diff --git a/compiler/testData/loadJava/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/javaBean/JavaBeanVar.txt
index 89e8e0837df..b421adac423 100644
--- a/compiler/testData/loadJava/javaBean/JavaBeanVar.txt
+++ b/compiler/testData/loadJava/javaBean/JavaBeanVar.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.JavaBeanVar : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.JavaBeanVar
-    public open fun getColor(): jet.String?
-    public open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0
+public open class JavaBeanVar : java.lang.Object {
+    public constructor JavaBeanVar()
+    public open fun getColor() : jet.String?
+    public open fun setColor(/*0*/ p0 : jet.String?) : Unit
 }
diff --git a/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.txt
index 2db1fd8edab..f35731bf2c0 100644
--- a/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType<P>
-    public open fun getCharacters(): java.util.ArrayList<P>?
-    public open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
+public open class JavaBeanVarOfGenericType</*0*/ P> : java.lang.Object {
+    public constructor JavaBeanVarOfGenericType</*0*/ P>()
+    public open fun getCharacters() : java.util.ArrayList<P>?
+    public open fun setCharacters(/*0*/ p0 : java.util.ArrayList<P>?) : Unit
 }
diff --git a/compiler/testData/loadJava/javaBean/TwoSetters.txt b/compiler/testData/loadJava/javaBean/TwoSetters.txt
index 760c3f2fb6c..dc10e17e60e 100644
--- a/compiler/testData/loadJava/javaBean/TwoSetters.txt
+++ b/compiler/testData/loadJava/javaBean/TwoSetters.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.TwoSetters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.TwoSetters
-    public open fun setSize(/*0*/ p0: jet.Int): jet.Tuple0
-    public open fun setSize(/*0*/ p0: jet.String?): jet.Tuple0
+public open class TwoSetters : java.lang.Object {
+    public constructor TwoSetters()
+    public open fun setSize(/*0*/ p0 : jet.Int) : Unit
+    public open fun setSize(/*0*/ p0 : jet.String?) : Unit
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/kotlinSignature/ArrayType.txt
index f7b24f9e46d..04db1570b27 100644
--- a/compiler/testData/loadJava/kotlinSignature/ArrayType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/ArrayType.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ArrayType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ArrayType
-    public open fun foo(): jet.Array<jet.String>
+public open class ArrayType : java.lang.Object {
+    public constructor ArrayType()
+    public open fun foo() : jet.Array<jet.String>
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
index 848f288beaf..cbfa0abe10d 100644
--- a/compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
+++ b/compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithNewTypeParams</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: jet.Any): test.ConstructorWithNewTypeParams<T>
+public open class ConstructorWithNewTypeParams</*0*/ T> : java.lang.Object {
+    public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ p0 : jet.Any)
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
index 73fa8298641..b4ed7acb3d9 100644
--- a/compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
+++ b/compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithParentTypeParams</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.ConstructorWithParentTypeParams<T>
+public open class ConstructorWithParentTypeParams</*0*/ T> : java.lang.Object {
+    public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ p0 : T)
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.txt
index aa4a451fad4..dc7ffa12fe4 100644
--- a/compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.txt
+++ b/compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithSeveralParams : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int, /*2*/ p2: java.util.ArrayList<jet.String>): test.ConstructorWithSeveralParams
+public open class ConstructorWithSeveralParams : java.lang.Object {
+    public constructor ConstructorWithSeveralParams(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int, /*2*/ p2 : java.util.ArrayList<jet.String>)
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.txt b/compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.txt
index 41b9367681c..4da868c400c 100644
--- a/compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.txt
+++ b/compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithoutParams : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ConstructorWithoutParams
+public open class ConstructorWithoutParams : java.lang.Object {
+    public constructor ConstructorWithoutParams()
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt b/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt
index cf20c023d60..a594feef21d 100644
--- a/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt
+++ b/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.CustomVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.CustomVariance
-    public open fun foo(): jet.MutableList<out jet.Number>
+public open class CustomVariance : java.lang.Object {
+    public constructor CustomVariance()
+    public open fun foo() : jet.MutableList<out jet.Number>
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt
index 3d207f175a3..483274fee57 100644
--- a/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithFunctionTypes : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithFunctionTypes
-    public open fun foo(/*0*/ p0: jet.Function1<jet.String?, jet.String>): jet.ExtensionFunction0<jet.String, jet.String?>?
+public open class MethodWithFunctionTypes : java.lang.Object {
+    public constructor MethodWithFunctionTypes()
+    public open fun foo(/*0*/ p0 : (jet.String?) -> jet.String) : (jet.String.() -> jet.String?)?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt
index a7e5adbdac1..25cd14f3ae9 100644
--- a/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithGenerics : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithGenerics
-    public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String>?>): jet.String
+public open class MethodWithGenerics : java.lang.Object {
+    public constructor MethodWithGenerics()
+    public open fun foo(/*0*/ p0 : jet.String, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String?, jet.String>?>) : jet.String
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.txt
index 2d362e74797..b2ad24e26e3 100644
--- a/compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithMappedClasses : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithMappedClasses
-    public open fun </*0*/ T : jet.Any?>copy(/*0*/ p0: jet.MutableList<in T>, /*1*/ p1: jet.List<out T>): jet.Tuple0
+public open class MethodWithMappedClasses : java.lang.Object {
+    public constructor MethodWithMappedClasses()
+    public open fun </*0*/ T> copy(/*0*/ p0 : jet.MutableList<in T>, /*1*/ p1 : jet.List<out T>) : Unit
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt
index cdcbfbf66b1..291b3739b2d 100644
--- a/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithTypeParameters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypeParameters
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & jet.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: jet.List<out B>, /*2*/ p2: jet.MutableList<in jet.String?>): jet.Tuple0
+public open class MethodWithTypeParameters : java.lang.Object {
+    public constructor MethodWithTypeParameters()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A, /*1*/ p1 : jet.List<out B>, /*2*/ p2 : jet.MutableList<in jet.String?>) : Unit where B : java.lang.Runnable, B : jet.List<java.lang.Cloneable>
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt
index 7fb649e10f2..8c06a11e9ea 100644
--- a/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithVararg
-    public open fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+public open class MethodWithVararg : java.lang.Object {
+    public constructor MethodWithVararg()
+    public open fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
index 916091ed0b5..e38820f4c4d 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,8 +1,8 @@
 namespace test
 
-public open class test.PropertyArrayTypes</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyArrayTypes<T>
-    public final var array: jet.Array<jet.String>
-    public final var arrayOfArrays: jet.Array<jet.Array<jet.String>>
-    public final var genericArray: jet.Array<T>
+public open class PropertyArrayTypes</*0*/ T> : java.lang.Object {
+    public constructor PropertyArrayTypes</*0*/ T>()
+    public final var array : jet.Array<jet.String>
+    public final var arrayOfArrays : jet.Array<jet.Array<jet.String>>
+    public final var genericArray : jet.Array<T>
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
index 695e1100f3a..26128a2853e 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,9 +1,9 @@
 namespace test
 
-public open class test.PropertyComplexTypes</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyComplexTypes<T>
-    public final var genericType: T
-    public final var listDefinedGeneric: java.util.ArrayList<jet.String>
-    public final var listGeneric: java.util.ArrayList<T>
-    public final var listOfGenericList: java.util.ArrayList<java.util.ArrayList<T>>
+public open class PropertyComplexTypes</*0*/ T> : java.lang.Object {
+    public constructor PropertyComplexTypes</*0*/ T>()
+    public final var genericType : T
+    public final var listDefinedGeneric : java.util.ArrayList<jet.String>
+    public final var listGeneric : java.util.ArrayList<T>
+    public final var listOfGenericList : java.util.ArrayList<java.util.ArrayList<T>>
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
index cfdcddc949b..e72b999ba6f 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.PropertySimpleType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.PropertySimpleType
-    public final var fieldOne: jet.String
-    public final var fieldTwo: jet.String?
+public open class PropertySimpleType : java.lang.Object {
+    public constructor PropertySimpleType()
+    public final var fieldOne : jet.String
+    public final var fieldTwo : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/StarProjection.txt b/compiler/testData/loadJava/kotlinSignature/StarProjection.txt
index d36f20f3073..511f267d6e8 100644
--- a/compiler/testData/loadJava/kotlinSignature/StarProjection.txt
+++ b/compiler/testData/loadJava/kotlinSignature/StarProjection.txt
@@ -1,8 +1,9 @@
 namespace test
 
-public final class test.StarProjection : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.StarProjection
-    public final fun foo(): test.StarProjection.MyClass<out jet.CharSequence?>
-    public abstract trait test.StarProjection.MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
+public final class StarProjection : java.lang.Object {
+    public constructor StarProjection()
+    public final fun foo() : test.StarProjection.MyClass<out jet.CharSequence?>
+    
+    public trait MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt
index 223d50ebc1a..200d1d4748f 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.AddingNullability : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.AddingNullability
-    public open fun foo(): jet.Int
+public open class AddingNullability : java.lang.Object {
+    public constructor AddingNullability()
+    public open fun foo() : jet.Int
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index 5b12c27e109..72043e9b20c 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ExplicitFieldGettersAndSetters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ExplicitFieldGettersAndSetters
-    public final var foo: jet.String?
+public open class ExplicitFieldGettersAndSetters : java.lang.Object {
+    public constructor ExplicitFieldGettersAndSetters()
+    public final var foo : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt
index 9ab08656259..2b3d752b784 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ExtraUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ExtraUpperBound
-    public open fun </*0*/ A : java.lang.Runnable?>foo(): jet.String?
+public open class ExtraUpperBound : java.lang.Object {
+    public constructor ExtraUpperBound()
+    public open fun </*0*/ A : java.lang.Runnable?> foo() : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt
index 9fab2b1afde..57e79b4d557 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MissingUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MissingUpperBound
-    public open fun </*0*/ A : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.String?
+public open class MissingUpperBound : java.lang.Object {
+    public constructor MissingUpperBound()
+    public open fun </*0*/ A> foo() : jet.String? where A : java.lang.Cloneable?, A : java.lang.Runnable?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.txt
index 811c5088edb..bfb26e85dbd 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NoFieldTypeRef : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NoFieldTypeRef
-    public final var foo: jet.String?
+public open class NoFieldTypeRef : java.lang.Object {
+    public constructor NoFieldTypeRef()
+    public final var foo : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index 5e2409cbc72..75199d9201d 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NotVarargReplacedWithVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NotVarargReplacedWithVararg
-    public open fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+public open class NotVarargReplacedWithVararg : java.lang.Object {
+    public constructor NotVarargReplacedWithVararg()
+    public open fun foo(/*0*/ p0 : jet.String?) : Unit
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt
index 3d240c9a4cf..5a2209fa770 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ReturnTypeMissing : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ReturnTypeMissing
-    public open fun foo(/*0*/ p0: jet.String?): jet.Int
+public open class ReturnTypeMissing : java.lang.Object {
+    public constructor ReturnTypeMissing()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.Int
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt
index 87e04f849e0..c1b183a8b58 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.SyntaxError : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.SyntaxError
-    public open fun foo(): jet.Int?
+public open class SyntaxError : java.lang.Object {
+    public constructor SyntaxError()
+    public open fun foo() : jet.Int?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index d266a09c866..2bab676da31 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.SyntaxErrorInFieldAnnotation : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.SyntaxErrorInFieldAnnotation
-    public final var foo: jet.String?
+public open class SyntaxErrorInFieldAnnotation : java.lang.Object {
+    public constructor SyntaxErrorInFieldAnnotation()
+    public final var foo : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index 84d1f9f9740..896a7760810 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.VarargReplacedWithNotVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.VarargReplacedWithNotVararg
-    public open fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public open class VarargReplacedWithNotVararg : java.lang.Object {
+    public constructor VarargReplacedWithNotVararg()
+    public open fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.txt
index caf3310f92e..d269aa45693 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongFieldInitializer : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldInitializer
-    public final var foo: jet.String?
+public open class WrongFieldInitializer : java.lang.Object {
+    public constructor WrongFieldInitializer()
+    public final var foo : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.txt
index 8b41d9f2e56..baee3b8b7e8 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.WrongFieldMutability : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldMutability
-    public final val fooFinal: jet.String?
-    public final var fooNotFinal: jet.String?
+public open class WrongFieldMutability : java.lang.Object {
+    public constructor WrongFieldMutability()
+    public final val fooFinal : jet.String?
+    public final var fooNotFinal : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.txt
index 18dae02ce7a..1419ca8c1ba 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongFieldName : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldName
-    public final var foo: jet.String?
+public open class WrongFieldName : java.lang.Object {
+    public constructor WrongFieldName()
+    public final var foo : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt
index 6e53d498a7f..23bb04e1ea7 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongMethodName : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongMethodName
-    public open fun foo(): jet.String?
+public open class WrongMethodName : java.lang.Object {
+    public constructor WrongMethodName()
+    public open fun foo() : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index 4007600c3b9..17336de06d8 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongReturnTypeStructure : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongReturnTypeStructure
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+public open class WrongReturnTypeStructure : java.lang.Object {
+    public constructor WrongReturnTypeStructure()
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt
index 1a4e3bb1cbe..1909d942eeb 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeName1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName1
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+public open class WrongTypeName1 : java.lang.Object {
+    public constructor WrongTypeName1()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt
index 2793baea4b7..0799defd70b 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeName2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName2
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+public open class WrongTypeName2 : java.lang.Object {
+    public constructor WrongTypeName2()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt
index ff087c69b83..c61a40a6b11 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeName3 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName3
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+public open class WrongTypeName3 : java.lang.Object {
+    public constructor WrongTypeName3()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index ed56414d418..8c09bc08d6e 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeParameterBoundStructure1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure1
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+public open class WrongTypeParameterBoundStructure1 : java.lang.Object {
+    public constructor WrongTypeParameterBoundStructure1()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index ffb26374e5d..2f49cb46856 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeParameterBoundStructure2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure2
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+public open class WrongTypeParameterBoundStructure2 : java.lang.Object {
+    public constructor WrongTypeParameterBoundStructure2()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt
index 87ae2d5880d..b3e98307add 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeParametersCount : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParametersCount
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+public open class WrongTypeParametersCount : java.lang.Object {
+    public constructor WrongTypeParametersCount()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
index 17c582864f3..adf2410cb39 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeVariance
-    public open fun copy(/*0*/ p0: jet.Array<out jet.Number>?, /*1*/ p1: jet.Array<out jet.Number>?): jet.MutableList<jet.Number>?
+public open class WrongTypeVariance : java.lang.Object {
+    public constructor WrongTypeVariance()
+    public open fun copy(/*0*/ p0 : jet.Array<out jet.Number>?, /*1*/ p1 : jet.Array<out jet.Number>?) : jet.MutableList<jet.Number>?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 8a21da86b00..3a186783a09 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongValueParameterStructure1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure1
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+public open class WrongValueParameterStructure1 : java.lang.Object {
+    public constructor WrongValueParameterStructure1()
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
index 69d852d499f..b2b83bd1818 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongValueParameterStructure2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure2
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+public open class WrongValueParameterStructure2 : java.lang.Object {
+    public constructor WrongValueParameterStructure2()
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt
index c615f64ec1c..8561ebe3301 100644
--- a/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt
+++ b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongValueParametersCount : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParametersCount
-    public open fun foo(): jet.Int?
+public open class WrongValueParametersCount : java.lang.Object {
+    public constructor WrongValueParametersCount()
+    public open fun foo() : jet.Int?
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index 959b8462f4d..db4ba0269ba 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -1,20 +1,22 @@
 namespace test
 
-public abstract trait test.PropagateTypeArgumentNullable : java.lang.Object {
-    public abstract trait test.PropagateTypeArgumentNullable.Sub : test.PropagateTypeArgumentNullable.Super {
-        public abstract override /*1*/ fun invOutR(): jet.MutableList<jet.List<jet.String?>>
-        public abstract override /*1*/ fun invOutS(/*0*/ p0: jet.MutableList<jet.List<jet.String?>>): jet.Tuple0
-        public abstract override /*1*/ fun invR(): jet.MutableList<jet.String?>
-        public abstract override /*1*/ fun outOutS(/*0*/ p0: jet.List<jet.List<jet.String?>>): jet.Tuple0
-        public abstract override /*1*/ fun outR(): jet.List<jet.String?>
-        public abstract override /*1*/ fun outS(/*0*/ p0: jet.List<jet.String?>): jet.Tuple0
+public trait PropagateTypeArgumentNullable : java.lang.Object {
+    
+    public trait Sub : test.PropagateTypeArgumentNullable.Super {
+        public abstract override /*1*/ fun invOutR() : jet.MutableList<jet.List<jet.String?>>
+        public abstract override /*1*/ fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
+        public abstract override /*1*/ fun invR() : jet.MutableList<jet.String?>
+        public abstract override /*1*/ fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
+        public abstract override /*1*/ fun outR() : jet.List<jet.String?>
+        public abstract override /*1*/ fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
     }
-    public abstract trait test.PropagateTypeArgumentNullable.Super : java.lang.Object {
-        public abstract fun invOutR(): jet.MutableList<jet.List<jet.String?>>
-        public abstract fun invOutS(/*0*/ p0: jet.MutableList<jet.List<jet.String?>>): jet.Tuple0
-        public abstract fun invR(): jet.MutableList<jet.String?>
-        public abstract fun outOutS(/*0*/ p0: jet.List<jet.List<jet.String?>>): jet.Tuple0
-        public abstract fun outR(): jet.List<jet.String?>
-        public abstract fun outS(/*0*/ p0: jet.List<jet.String?>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun invOutR() : jet.MutableList<jet.List<jet.String?>>
+        public abstract fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
+        public abstract fun invR() : jet.MutableList<jet.String?>
+        public abstract fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
+        public abstract fun outR() : jet.List<jet.String?>
+        public abstract fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
index 0e993396097..334f36ed665 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.ChangeProjectionKind1 : java.lang.Object {
-    public abstract trait test.ChangeProjectionKind1.Sub : test.ChangeProjectionKind1.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+public trait ChangeProjectionKind1 : java.lang.Object {
+    
+    public trait Sub : test.ChangeProjectionKind1.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
-    public abstract trait test.ChangeProjectionKind1.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
index 52b52533126..ea03c29d8c8 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.ChangeProjectionKind2 : java.lang.Object {
-    public abstract trait test.ChangeProjectionKind2.Sub : test.ChangeProjectionKind2.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+public trait ChangeProjectionKind2 : java.lang.Object {
+    
+    public trait Sub : test.ChangeProjectionKind2.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
-    public abstract trait test.ChangeProjectionKind2.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
index 18779e6e8a3..a09c4841537 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritMutability : java.lang.Object {
-    public abstract trait test.InheritMutability.Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+public trait InheritMutability : java.lang.Object {
+    
+    public trait Sub : test.InheritMutability.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
-    public abstract trait test.InheritMutability.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
index 60ae207c163..97697152e68 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVararg : java.lang.Object {
-    public abstract trait test.InheritNotVararg.Sub : test.InheritNotVararg.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String>?): jet.Tuple0
+public trait InheritNotVararg : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVararg.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : Unit
     }
-    public abstract trait test.InheritNotVararg.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.String>?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
index 111a40931a9..fcaa48daeaf 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVarargInteger : java.lang.Object {
-    public abstract trait test.InheritNotVarargInteger.Sub : test.InheritNotVarargInteger.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.Int>?): jet.Tuple0
+public trait InheritNotVarargInteger : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVarargInteger.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : Unit
     }
-    public abstract trait test.InheritNotVarargInteger.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.Int>?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
index 1db60a73dc9..da6f0089961 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVarargNotNull : java.lang.Object {
-    public abstract trait test.InheritNotVarargNotNull.Sub : test.InheritNotVarargNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String>): jet.Tuple0
+public trait InheritNotVarargNotNull : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVarargNotNull.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>) : Unit
     }
-    public abstract trait test.InheritNotVarargNotNull.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
index 2a98737e8de..e3e3b78db41 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVarargPrimitive : java.lang.Object {
-    public abstract trait test.InheritNotVarargPrimitive.Sub : test.InheritNotVarargPrimitive.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.IntArray?): jet.Tuple0
+public trait InheritNotVarargPrimitive : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVarargPrimitive.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.IntArray?) : Unit
     }
-    public abstract trait test.InheritNotVarargPrimitive.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.IntArray?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.IntArray?) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.txt
index 7eb781db180..548f97e5285 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullability : java.lang.Object {
-    public abstract trait test.InheritNullability.Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Tuple0
+public trait InheritNullability : java.lang.Object {
+    
+    public trait Sub : test.InheritNullability.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
     }
-    public abstract trait test.InheritNullability.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
index 0bf4639ee78..176d089eec3 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritProjectionKind : java.lang.Object {
-    public abstract trait test.InheritProjectionKind.Sub : test.InheritProjectionKind.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+public trait InheritProjectionKind : java.lang.Object {
+    
+    public trait Sub : test.InheritProjectionKind.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
-    public abstract trait test.InheritProjectionKind.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
index c1719d861cc..8aa63f1d997 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnliness : java.lang.Object {
-    public abstract trait test.InheritReadOnliness.Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+public trait InheritReadOnliness : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnliness.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
-    public abstract trait test.InheritReadOnliness.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
index 7bad1fdbfbb..76ac1e29969 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVararg : java.lang.Object {
-    public abstract trait test.InheritVararg.Sub : test.InheritVararg.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public trait InheritVararg : java.lang.Object {
+    
+    public trait Sub : test.InheritVararg.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
     }
-    public abstract trait test.InheritVararg.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
index dd40ff56124..bd12b7345c7 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVarargInteger : java.lang.Object {
-    public abstract trait test.InheritVarargInteger.Sub : test.InheritVarargInteger.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.Int? /*jet.Array<jet.Int?>*/): jet.Tuple0
+public trait InheritVarargInteger : java.lang.Object {
+    
+    public trait Sub : test.InheritVarargInteger.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : Unit
     }
-    public abstract trait test.InheritVarargInteger.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.Int? /*jet.Array<jet.Int?>*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
index b5f9e5e85fa..9a7c13852d6 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVarargNotNull : java.lang.Object {
-    public abstract trait test.InheritVarargNotNull.Sub : test.InheritVarargNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+public trait InheritVarargNotNull : java.lang.Object {
+    
+    public trait Sub : test.InheritVarargNotNull.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
     }
-    public abstract trait test.InheritVarargNotNull.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
index 6c27ef86199..3cf3f66c721 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVarargPrimitive : java.lang.Object {
-    public abstract trait test.InheritVarargPrimitive.Sub : test.InheritVarargPrimitive.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
+public trait InheritVarargPrimitive : java.lang.Object {
+    
+    public trait Sub : test.InheritVarargPrimitive.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
     }
-    public abstract trait test.InheritVarargPrimitive.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
index 43b3e8e13a2..4804b2a7bde 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.MutableToReadOnly : java.lang.Object {
-    public abstract trait test.MutableToReadOnly.Sub : test.MutableToReadOnly.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+public trait MutableToReadOnly : java.lang.Object {
+    
+    public trait Sub : test.MutableToReadOnly.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
-    public abstract trait test.MutableToReadOnly.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
index 5a98f5b659a..548245deb3a 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.NotNullToNullable : java.lang.Object {
-    public abstract trait test.NotNullToNullable.Sub : test.NotNullToNullable.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Tuple0
+public trait NotNullToNullable : java.lang.Object {
+    
+    public trait Sub : test.NotNullToNullable.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
     }
-    public abstract trait test.NotNullToNullable.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index 8a1f8b8a61e..ee027dd08f4 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.NullableToNotNull : java.lang.Object {
-    public abstract trait test.NullableToNotNull.Sub : test.NullableToNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+public trait NullableToNotNull : java.lang.Object {
+    
+    public trait Sub : test.NullableToNotNull.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : Unit
     }
-    public abstract trait test.NullableToNotNull.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String?) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
index bb1a8c87100..333b814ee88 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.NullableToNotNullKotlinSignature : java.lang.Object {
-    public abstract trait test.NullableToNotNullKotlinSignature.Sub : test.NullableToNotNullKotlinSignature.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+public trait NullableToNotNullKotlinSignature : java.lang.Object {
+    
+    public trait Sub : test.NullableToNotNullKotlinSignature.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : Unit
     }
-    public abstract trait test.NullableToNotNullKotlinSignature.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String?) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
index eb8548b1e53..4be5fe141c5 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.ReadOnlyToMutable : java.lang.Object {
-    public abstract trait test.ReadOnlyToMutable.Sub : test.ReadOnlyToMutable.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+public trait ReadOnlyToMutable : java.lang.Object {
+    
+    public trait Sub : test.ReadOnlyToMutable.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
-    public abstract trait test.ReadOnlyToMutable.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
index 015c3fbbbf7..737cc8a979f 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNotNullJavaSubtype : java.lang.Object {
-    public abstract trait test.AddNotNullJavaSubtype.Sub : test.AddNotNullJavaSubtype.Super {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait AddNotNullJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.AddNotNullJavaSubtype.Super {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.AddNotNullJavaSubtype.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
index 3c55c46f801..7864d85e471 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNotNullSameJavaType : java.lang.Object {
-    public abstract trait test.AddNotNullSameJavaType.Sub : test.AddNotNullSameJavaType.Super {
-        public abstract override /*1*/ fun foo(): jet.CharSequence
+public trait AddNotNullSameJavaType : java.lang.Object {
+    
+    public trait Sub : test.AddNotNullSameJavaType.Super {
+        public abstract override /*1*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.AddNotNullSameJavaType.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
index 05e91e8cb94..e0e1b1eb26c 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilityJavaSubtype : java.lang.Object {
-    public abstract trait test.AddNullabilityJavaSubtype.Sub : test.AddNullabilityJavaSubtype.Super {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait AddNullabilityJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilityJavaSubtype.Super {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.AddNullabilityJavaSubtype.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
index ce1b27555aa..7a52a9fe654 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilitySameGenericType1 : java.lang.Object {
-    public abstract trait test.AddNullabilitySameGenericType1.Sub : test.AddNullabilitySameGenericType1.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait AddNullabilitySameGenericType1 : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilitySameGenericType1.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.AddNullabilitySameGenericType1.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
index 8ff496d5503..5d568cf1fb8 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilitySameGenericType2 : java.lang.Object {
-    public abstract trait test.AddNullabilitySameGenericType2.Sub : test.AddNullabilitySameGenericType2.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait AddNullabilitySameGenericType2 : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilitySameGenericType2.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.AddNullabilitySameGenericType2.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
index 8758207a181..34d978a095d 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilitySameJavaType : java.lang.Object {
-    public abstract trait test.AddNullabilitySameJavaType.Sub : test.AddNullabilitySameJavaType.Super {
-        public abstract override /*1*/ fun foo(): jet.CharSequence
+public trait AddNullabilitySameJavaType : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilitySameJavaType.Super {
+        public abstract override /*1*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.AddNullabilitySameJavaType.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
index 2fe543bb85b..2d42b3958d6 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.CantMakeImmutableInSubclass : java.lang.Object {
-    public abstract trait test.CantMakeImmutableInSubclass.Sub : test.CantMakeImmutableInSubclass.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait CantMakeImmutableInSubclass : java.lang.Object {
+    
+    public trait Sub : test.CantMakeImmutableInSubclass.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.CantMakeImmutableInSubclass.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index 873560d9138..0ce12f82df2 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -1,35 +1,38 @@
 namespace test
 
-public abstract trait test.HalfSubstitutedTypeParameters : java.lang.Object {
-    public abstract trait test.HalfSubstitutedTypeParameters.Sub : test.HalfSubstitutedTypeParameters.Super {
-        public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<jet.Int, jet.String?>
+public trait HalfSubstitutedTypeParameters : java.lang.Object {
+    
+    public trait Sub : test.HalfSubstitutedTypeParameters.Super {
+        public abstract override /*1*/ fun foo() : test.HalfSubstitutedTypeParameters.TrickyList<jet.Int, jet.String?>
     }
-    public abstract trait test.HalfSubstitutedTypeParameters.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String?>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String?>
     }
-    public abstract trait test.HalfSubstitutedTypeParameters.TrickyList</*0*/ X : jet.Any?, /*1*/ E : jet.Any?> : jet.MutableList<E> {
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Tuple0
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection<E>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
-        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: jet.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: jet.Any?): jet.Int
-        public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.Iterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: jet.Any?): jet.Int
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(): jet.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: jet.Int): jet.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: jet.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: jet.Int, /*1*/ element: E): E
-        public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
-        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList<E>
-        public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-        public abstract override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+    
+    public trait TrickyList</*0*/ X, /*1*/ E> : jet.MutableList<E> {
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e : E) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index : jet.Int, /*1*/ element : E) : Unit
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index : jet.Int, /*1*/ c : jet.Collection<E>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun clear() : Unit
+        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index : jet.Int) : E
+        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o : jet.Any?) : jet.Int
+        public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun iterator() : jet.Iterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o : jet.Any?) : jet.Int
+        public abstract override /*1*/ /*fake_override*/ fun listIterator() : jet.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index : jet.Int) : jet.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index : jet.Int) : E
+        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index : jet.Int, /*1*/ element : E) : E
+        public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
+        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex : jet.Int, /*1*/ toIndex : jet.Int) : jet.MutableList<E>
+        public abstract override /*1*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+        public abstract override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
index 79847be7d16..b09e290ebbd 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilityGenericSubclassSimple : java.lang.Object {
-    public abstract trait test.InheritNullabilityGenericSubclassSimple.Sub : test.InheritNullabilityGenericSubclassSimple.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait InheritNullabilityGenericSubclassSimple : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.InheritNullabilityGenericSubclassSimple.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
index 66c9a21c41a..d1333b0f90e 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilityJavaSubtype : java.lang.Object {
-    public abstract trait test.InheritNullabilityJavaSubtype.Sub : test.InheritNullabilityJavaSubtype.Super {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait InheritNullabilityJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilityJavaSubtype.Super {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.InheritNullabilityJavaSubtype.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
index 2494afba14e..488f3fc7def 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilitySameGenericType : java.lang.Object {
-    public abstract trait test.InheritNullabilitySameGenericType.Sub : test.InheritNullabilitySameGenericType.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait InheritNullabilitySameGenericType : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilitySameGenericType.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.InheritNullabilitySameGenericType.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
index 88b0e09a614..46891b20757 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilitySameJavaType : java.lang.Object {
-    public abstract trait test.InheritNullabilitySameJavaType.Sub : test.InheritNullabilitySameJavaType.Super {
-        public abstract override /*1*/ fun foo(): jet.CharSequence
+public trait InheritNullabilitySameJavaType : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilitySameJavaType.Super {
+        public abstract override /*1*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.InheritNullabilitySameJavaType.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
index a1e0786f329..b6a8152c2f3 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnlinessOfArgument : java.lang.Object {
-    public abstract trait test.InheritReadOnlinessOfArgument.Sub : test.InheritReadOnlinessOfArgument.Super {
-        public abstract override /*1*/ fun foo(): jet.List<jet.List<jet.String>>
+public trait InheritReadOnlinessOfArgument : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnlinessOfArgument.Super {
+        public abstract override /*1*/ fun foo() : jet.List<jet.List<jet.String>>
     }
-    public abstract trait test.InheritReadOnlinessOfArgument.Super : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.List<jet.String>>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.List<jet.String>>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
index c93a24d3eb0..08e054b4b84 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnlinessSameClass : java.lang.Object {
-    public abstract trait test.InheritReadOnlinessSameClass.Sub : test.InheritReadOnlinessSameClass.Super {
-        public abstract override /*1*/ fun foo(): jet.List<jet.String>
+public trait InheritReadOnlinessSameClass : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnlinessSameClass.Super {
+        public abstract override /*1*/ fun foo() : jet.List<jet.String>
     }
-    public abstract trait test.InheritReadOnlinessSameClass.Super : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
index 77c970cd9c1..3c4dfa1c55d 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnlinessSubclass : java.lang.Object {
-    public abstract trait test.InheritReadOnlinessSubclass.Sub : test.InheritReadOnlinessSubclass.Super {
-        public abstract override /*1*/ fun foo(): jet.List<jet.String>
+public trait InheritReadOnlinessSubclass : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnlinessSubclass.Super {
+        public abstract override /*1*/ fun foo() : jet.List<jet.String>
     }
-    public abstract trait test.InheritReadOnlinessSubclass.Super : java.lang.Object {
-        public abstract fun foo(): jet.Collection<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.Collection<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt
index fd8b84433b9..0344ca68c36 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVariance : java.lang.Object {
-    public abstract trait test.InheritVariance.Sub : test.InheritVariance.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<out jet.Number>
+public trait InheritVariance : java.lang.Object {
+    
+    public trait Sub : test.InheritVariance.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<out jet.Number>
     }
-    public abstract trait test.InheritVariance.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<out jet.Number>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<out jet.Number>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
index 8b798bc2373..a9149c5968b 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.SameProjectionKind : java.lang.Object {
-    public abstract trait test.SameProjectionKind.Sub : test.SameProjectionKind.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableCollection<out jet.Number?>?
+public trait SameProjectionKind : java.lang.Object {
+    
+    public trait Sub : test.SameProjectionKind.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableCollection<out jet.Number?>?
     }
-    public abstract trait test.SameProjectionKind.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<out jet.Number?>?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<out jet.Number?>?
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index c5005631e02..081a6231532 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -1,17 +1,17 @@
 namespace test
 
-public abstract trait test.SubclassOfCollection</*0*/ E : jet.Any?> : jet.MutableCollection<E> {
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public abstract override /*1*/ fun iterator(): jet.MutableIterator<E>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
-    public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+public trait SubclassOfCollection</*0*/ E> : jet.MutableCollection<E> {
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e : E) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun clear() : Unit
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public abstract override /*1*/ fun iterator() : jet.MutableIterator<E>
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index 0c728cfaf3d..5fe4aa71ab0 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -1,7 +1,7 @@
 namespace test
 
-public abstract trait test.SubclassOfMapEntry</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.MutableMap.MutableEntry<K, V> {
-    public abstract override /*1*/ /*fake_override*/ fun getKey(): K
-    public abstract override /*1*/ /*fake_override*/ fun getValue(): V
-    public abstract override /*1*/ fun setValue(/*0*/ p0: V): V
+public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : jet.MutableMap.MutableEntry<K, V> {
+    public abstract override /*1*/ /*fake_override*/ fun getKey() : K
+    public abstract override /*1*/ /*fake_override*/ fun getValue() : V
+    public abstract override /*1*/ fun setValue(/*0*/ p0 : V) : V
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
index e3057b3c40f..ac648540b3f 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesConflictingProjectionKinds : java.lang.Object {
-    public abstract trait test.TwoSuperclassesConflictingProjectionKinds.Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableCollection<jet.CharSequence>
+public trait TwoSuperclassesConflictingProjectionKinds : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableCollection<jet.CharSequence>
     }
-    public abstract trait test.TwoSuperclassesConflictingProjectionKinds.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.CharSequence>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.CharSequence>
     }
-    public abstract trait test.TwoSuperclassesConflictingProjectionKinds.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<out jet.CharSequence>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<out jet.CharSequence>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
index 126636b1400..b6e042b51c8 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability : java.lang.Object {
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability.Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableList<jet.MutableList<jet.String>>
+public trait TwoSuperclassesInvariantAndCovariantInferMutability : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableList<jet.MutableList<jet.String>>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.List<jet.String>>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.List<jet.String>>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.MutableList<jet.String>>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.MutableList<jet.String>>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
index bdea1c7622e..3123817f4a3 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability : java.lang.Object {
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability.Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableList<jet.String>
+public trait TwoSuperclassesInvariantAndCovariantInferNullability : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String?>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String?>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
index 49b9d282e91..f02c5404b37 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesMutableAndNot : java.lang.Object {
-    public abstract trait test.TwoSuperclassesMutableAndNot.Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableList<jet.String>
+public trait TwoSuperclassesMutableAndNot : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.TwoSuperclassesMutableAndNot.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.String>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.String>
     }
-    public abstract trait test.TwoSuperclassesMutableAndNot.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String>
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
index 5cbef29a8eb..d937f82aa50 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesReturnJavaSubtype : java.lang.Object {
-    public abstract trait test.TwoSuperclassesReturnJavaSubtype.Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
-        public abstract override /*2*/ fun foo(): jet.String
+public trait TwoSuperclassesReturnJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
+        public abstract override /*2*/ fun foo() : jet.String
     }
-    public abstract trait test.TwoSuperclassesReturnJavaSubtype.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
-    public abstract trait test.TwoSuperclassesReturnJavaSubtype.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
index fa313306bb2..6e55f272494 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesReturnSameJavaType : java.lang.Object {
-    public abstract trait test.TwoSuperclassesReturnSameJavaType.Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
-        public abstract override /*2*/ fun foo(): jet.CharSequence
+public trait TwoSuperclassesReturnSameJavaType : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
+        public abstract override /*2*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.TwoSuperclassesReturnSameJavaType.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
-    public abstract trait test.TwoSuperclassesReturnSameJavaType.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index 959b623b055..b3b861bf0df 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesSupplementNotNull : java.lang.Object {
-    public abstract trait test.TwoSuperclassesSupplementNotNull.Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
-        public abstract override /*2*/ fun foo(): jet.List<jet.String>
+public trait TwoSuperclassesSupplementNotNull : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
+        public abstract override /*2*/ fun foo() : jet.List<jet.String>
     }
-    public abstract trait test.TwoSuperclassesSupplementNotNull.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String?>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String?>
     }
-    public abstract trait test.TwoSuperclassesSupplementNotNull.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String>?
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String>?
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
index dc59f4bc3da..87260b367a8 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TypeParamOfClass : java.lang.Object {
-    public abstract trait test.TypeParamOfClass.Sub</*0*/ T : jet.Any?> : test.TypeParamOfClass.Super<T> {
-        public abstract override /*1*/ fun foo(): T
+public trait TypeParamOfClass : java.lang.Object {
+    
+    public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T> {
+        public abstract override /*1*/ fun foo() : T
     }
-    public abstract trait test.TypeParamOfClass.Super</*0*/ T : jet.Any?> : java.lang.Object {
-        public abstract fun foo(): T
+    
+    public trait Super</*0*/ T> : java.lang.Object {
+        public abstract fun foo() : T
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
index 7e9ad34b02f..045af155756 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TypeParamOfClassSubstituted : java.lang.Object {
-    public abstract trait test.TypeParamOfClassSubstituted.Sub : test.TypeParamOfClassSubstituted.Super<jet.String> {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait TypeParamOfClassSubstituted : java.lang.Object {
+    
+    public trait Sub : test.TypeParamOfClassSubstituted.Super<jet.String> {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.TypeParamOfClassSubstituted.Super</*0*/ T : jet.Any?> : java.lang.Object {
-        public abstract fun foo(): T
+    
+    public trait Super</*0*/ T> : java.lang.Object {
+        public abstract fun foo() : T
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
index ac8a22fc045..59cfbd5374f 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TypeParamOfFun : java.lang.Object {
-    public abstract trait test.TypeParamOfFun.Sub : test.TypeParamOfFun.Super {
-        public abstract override /*1*/ fun </*0*/ E : jet.Any?>foo(): E
+public trait TypeParamOfFun : java.lang.Object {
+    
+    public trait Sub : test.TypeParamOfFun.Super {
+        public abstract override /*1*/ fun </*0*/ E> foo() : E
     }
-    public abstract trait test.TypeParamOfFun.Super : java.lang.Object {
-        public abstract fun </*0*/ T : jet.Any?>foo(): T
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ T> foo() : T
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
index 84b16dbfe3e..f14847b7a0c 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritMutability : java.lang.Object {
-    public abstract trait test.InheritMutability.Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.MutableList<jet.String>>foo(/*0*/ p0: B): jet.Tuple0
+public trait InheritMutability : java.lang.Object {
+    
+    public trait Sub : test.InheritMutability.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.MutableList<jet.String>> foo(/*0*/ p0 : B) : Unit
     }
-    public abstract trait test.InheritMutability.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.MutableList<jet.String>>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.MutableList<jet.String>> foo(/*0*/ p0 : A) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
index a0956aec824..fcbaf41e4f2 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullability : java.lang.Object {
-    public abstract trait test.InheritNullability.Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence>foo(/*0*/ p0: B): jet.Tuple0
+public trait InheritNullability : java.lang.Object {
+    
+    public trait Sub : test.InheritNullability.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : Unit
     }
-    public abstract trait test.InheritNullability.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
index e0448bdea91..b840e428bee 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnliness : java.lang.Object {
-    public abstract trait test.InheritReadOnliness.Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.List<jet.String>>foo(/*0*/ p0: B): jet.Tuple0
+public trait InheritReadOnliness : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnliness.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.List<jet.String>> foo(/*0*/ p0 : B) : Unit
     }
-    public abstract trait test.InheritReadOnliness.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.List<jet.String>>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.List<jet.String>> foo(/*0*/ p0 : A) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
index e2af3cc6938..6c101fd8865 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TwoBounds : java.lang.Object {
-    public abstract trait test.TwoBounds.Sub : test.TwoBounds.Super {
-        public abstract override /*1*/ fun </*0*/ B : java.lang.Cloneable & jet.CharSequence>foo(/*0*/ p0: B): jet.Tuple0
+public trait TwoBounds : java.lang.Object {
+    
+    public trait Sub : test.TwoBounds.Super {
+        public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : Unit where B : java.lang.Cloneable, B : jet.CharSequence
     }
-    public abstract trait test.TwoBounds.Super : java.lang.Object {
-        public abstract fun </*0*/ A : java.lang.Cloneable & jet.CharSequence>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : Unit where A : java.lang.Cloneable, A : jet.CharSequence
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
index 9a78cf92a78..00c4574b7db 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclasses : java.lang.Object {
-    public abstract trait test.TwoSuperclasses.Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
-        public abstract override /*2*/ fun </*0*/ C : jet.CharSequence>foo(/*0*/ p0: C): jet.Tuple0
+public trait TwoSuperclasses : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
+        public abstract override /*2*/ fun </*0*/ C : jet.CharSequence> foo(/*0*/ p0 : C) : Unit
     }
-    public abstract trait test.TwoSuperclasses.Super1 : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : Unit
     }
-    public abstract trait test.TwoSuperclasses.Super2 : java.lang.Object {
-        public abstract fun </*0*/ B : jet.CharSequence>foo(/*0*/ p0: B): jet.Tuple0
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
index 79b3c757bd7..cc9199157c4 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TwoTypeParameters : java.lang.Object {
-    public abstract trait test.TwoTypeParameters.Sub : test.TwoTypeParameters.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence, /*1*/ A : java.lang.Cloneable>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait TwoTypeParameters : java.lang.Object {
+    
+    public trait Sub : test.TwoTypeParameters.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.TwoTypeParameters.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence, /*1*/ B : java.lang.Cloneable>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
index 56b143eea01..d339308dea4 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.UseParameterAsUpperBound : java.lang.Object {
-    public abstract trait test.UseParameterAsUpperBound.Sub : test.UseParameterAsUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.Any?, /*1*/ A : B>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait UseParameterAsUpperBound : java.lang.Object {
+    
+    public trait Sub : test.UseParameterAsUpperBound.Super {
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.UseParameterAsUpperBound.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.Any?, /*1*/ B : A>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index 16c0d253153..01c0aa79ffc 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.UseParameterInUpperBound : java.lang.Object {
-    public abstract trait test.UseParameterInUpperBound.Sub : test.UseParameterInUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.Any?, /*1*/ A : jet.List<B>>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait UseParameterInUpperBound : java.lang.Object {
+    
+    public trait Sub : test.UseParameterInUpperBound.Super {
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.UseParameterInUpperBound.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.Any?, /*1*/ B : jet.List<A>>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index 22e397de7d7..2d3f63ee2a5 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
-    public abstract trait test.UseParameterInUpperBoundWithKotlinSignature.Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.Any?, /*1*/ A : jet.List<B>>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
+    
+    public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.UseParameterInUpperBoundWithKotlinSignature.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.Any?, /*1*/ B : jet.List<A>>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }
diff --git a/compiler/testData/loadJava/library/LoadIterable.txt b/compiler/testData/loadJava/library/LoadIterable.txt
index 8dd05db16d8..b51ed0b3212 100644
--- a/compiler/testData/loadJava/library/LoadIterable.txt
+++ b/compiler/testData/loadJava/library/LoadIterable.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract trait test.LoadIterable</*0*/ T : jet.Any?> : java.lang.Object {
-    public abstract fun getIterable(): jet.MutableIterable<T>?
-    public abstract fun setIterable(/*0*/ p0: jet.Iterable<T>?): jet.Tuple0
+public trait LoadIterable</*0*/ T> : java.lang.Object {
+    public abstract fun getIterable() : jet.MutableIterable<T>?
+    public abstract fun setIterable(/*0*/ p0 : jet.Iterable<T>?) : Unit
 }
diff --git a/compiler/testData/loadJava/library/LoadIterator.txt b/compiler/testData/loadJava/library/LoadIterator.txt
index c75bdc8da61..4dea1668ec3 100644
--- a/compiler/testData/loadJava/library/LoadIterator.txt
+++ b/compiler/testData/loadJava/library/LoadIterator.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract trait test.LoadIterator</*0*/ T : jet.Any?> : java.lang.Object {
-    public abstract fun getIterator(): jet.MutableIterator<T>?
-    public abstract fun setIterator(/*0*/ p0: jet.Iterator<T>?): jet.Tuple0
+public trait LoadIterator</*0*/ T> : java.lang.Object {
+    public abstract fun getIterator() : jet.MutableIterator<T>?
+    public abstract fun setIterator(/*0*/ p0 : jet.Iterator<T>?) : Unit
 }
diff --git a/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
index aaf74fc13a5..4862d25a3cb 100644
--- a/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
@@ -1,30 +1,30 @@
 namespace test
 
-public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.String> {
-    public final /*constructor*/ fun <init>(): test.ModalityOfFakeOverrides
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.Tuple0
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.String): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Collection<jet.String>): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection<jet.String>): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ p0: jet.Collection<jet.Any?>): jet.Boolean
-    public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator<jet.String>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): jet.MutableListIterator<jet.String>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0: jet.Int): jet.MutableListIterator<jet.String>
-    protected final override /*1*/ /*fake_override*/ var modCount: jet.Int
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Int): jet.String
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ p0: jet.Collection<jet.Any?>): jet.Boolean
-    protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0: jet.Collection<jet.Any?>): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String
-    public open override /*1*/ fun size(): jet.Int
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList<jet.String>
-    public open override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T>): jet.Array<T>
+public open class ModalityOfFakeOverrides : java.util.AbstractList<jet.String> {
+    public constructor ModalityOfFakeOverrides()
+    protected final override /*1*/ /*fake_override*/ var modCount : jet.Int
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.String) : Unit
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0 : jet.String) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0 : jet.Collection<jet.String>) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Collection<jet.String>) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun clear() : Unit
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0 : jet.Any?) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ p0 : jet.Collection<jet.Any?>) : jet.Boolean
+    public open override /*1*/ fun get(/*0*/ p0 : jet.Int) : jet.String
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0 : jet.Any?) : jet.Int
+    public open override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun iterator() : jet.MutableIterator<jet.String>
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ p0 : jet.Any?) : jet.Int
+    public open override /*1*/ /*fake_override*/ fun listIterator() : jet.MutableListIterator<jet.String>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0 : jet.Int) : jet.MutableListIterator<jet.String>
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0 : jet.Any?) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0 : jet.Int) : jet.String
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ p0 : jet.Collection<jet.Any?>) : jet.Boolean
+    protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int) : Unit
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0 : jet.Collection<jet.Any?>) : jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.String) : jet.String
+    public open override /*1*/ fun size() : jet.Int
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int) : jet.MutableList<jet.String>
+    public open override /*1*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0 : jet.Array<out T>) : jet.Array<T>
 }
diff --git a/compiler/testData/loadJava/notNull/NotNullField.txt b/compiler/testData/loadJava/notNull/NotNullField.txt
index 12e94178356..fe701bf8a45 100644
--- a/compiler/testData/loadJava/notNull/NotNullField.txt
+++ b/compiler/testData/loadJava/notNull/NotNullField.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NotNullField : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NotNullField
-    public final var hi: jet.String
+public open class NotNullField : java.lang.Object {
+    public constructor NotNullField()
+    public final var hi : jet.String
 }
diff --git a/compiler/testData/loadJava/notNull/NotNullMethod.txt b/compiler/testData/loadJava/notNull/NotNullMethod.txt
index 555f39ece36..898e4fcc0ba 100644
--- a/compiler/testData/loadJava/notNull/NotNullMethod.txt
+++ b/compiler/testData/loadJava/notNull/NotNullMethod.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NotNullMethod : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NotNullMethod
-    public open fun hi(): jet.String
+public open class NotNullMethod : java.lang.Object {
+    public constructor NotNullMethod()
+    public open fun hi() : jet.String
 }
diff --git a/compiler/testData/loadJava/notNull/NotNullParameter.txt b/compiler/testData/loadJava/notNull/NotNullParameter.txt
index bf6a486b2f5..5de6607c66f 100644
--- a/compiler/testData/loadJava/notNull/NotNullParameter.txt
+++ b/compiler/testData/loadJava/notNull/NotNullParameter.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NotNullParameter : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NotNullParameter
-    public open fun hi(/*0*/ p0: jet.String): jet.Tuple0
+public open class NotNullParameter : java.lang.Object {
+    public constructor NotNullParameter()
+    public open fun hi(/*0*/ p0 : jet.String) : Unit
 }
diff --git a/compiler/testData/loadJava/vararg/VarargInt.txt b/compiler/testData/loadJava/vararg/VarargInt.txt
index d5018a9da38..3f9ca24275e 100644
--- a/compiler/testData/loadJava/vararg/VarargInt.txt
+++ b/compiler/testData/loadJava/vararg/VarargInt.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.VarargInt : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.VarargInt
-    public open fun vararg(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
+public open class VarargInt : java.lang.Object {
+    public constructor VarargInt()
+    public open fun vararg(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
 }
diff --git a/compiler/testData/loadJava/vararg/VarargString.txt b/compiler/testData/loadJava/vararg/VarargString.txt
index c0a6cd568c7..829197c565f 100644
--- a/compiler/testData/loadJava/vararg/VarargString.txt
+++ b/compiler/testData/loadJava/vararg/VarargString.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.VarargString : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.VarargString
-    public open fun vararg(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public open class VarargString : java.lang.Object {
+    public constructor VarargString()
+    public open fun vararg(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
 }
diff --git a/compiler/testData/loadJavaCustom/enum/expected.txt b/compiler/testData/loadJavaCustom/enum/expected.txt
index da1aaa405cc..69f2d47c2fc 100644
--- a/compiler/testData/loadJavaCustom/enum/expected.txt
+++ b/compiler/testData/loadJavaCustom/enum/expected.txt
@@ -1,14 +1,15 @@
 namespace test
 
-public final enum class test.MyEnum : jet.Enum<test.MyEnum> {
-    private final /*constructor*/ fun <init>(): test.MyEnum
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    public final class object test.MyEnum.<class-object-for-MyEnum> {
-        private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>
-        public final val ANOTHER: test.MyEnum
-        public final val ENTRY: test.MyEnum
-        public final fun valueOf(/*0*/ value: jet.String): test.MyEnum
-        public final fun values(): jet.Array<test.MyEnum>
+public final enum class MyEnum : jet.Enum<test.MyEnum> {
+    private constructor MyEnum()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    public class object <class-object-for-MyEnum> {
+        private constructor <class-object-for-MyEnum>()
+        public final val ANOTHER : test.MyEnum
+        public final val ENTRY : test.MyEnum
+        public final fun valueOf(/*0*/ value : jet.String) : test.MyEnum
+        public final fun values() : jet.Array<test.MyEnum>
     }
 }
diff --git a/compiler/testData/loadJavaCustom/inner.txt b/compiler/testData/loadJavaCustom/inner.txt
index fa3875432b6..b55670dca9b 100644
--- a/compiler/testData/loadJavaCustom/inner.txt
+++ b/compiler/testData/loadJavaCustom/inner.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.inner : test.B.C {
-    public final /*constructor*/ fun <init>(): test.inner
+public open class inner : test.B.C {
+    public constructor inner()
 }
diff --git a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt
index 604e401f226..451d63b5cbf 100644
--- a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt
+++ b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt
@@ -1,12 +1,14 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
-    public abstract fun foo(): jet.MutableList<jet.String?>
-    public abstract trait test.TwoSuperclassesInconsistentGenericTypes.Other : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>?
+public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
+    public abstract fun foo() : jet.MutableList<jet.String?>
+    
+    public trait Other : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>?
     }
-    public open class test.TwoSuperclassesInconsistentGenericTypes.Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
-        public final /*constructor*/ fun <init>(): test.TwoSuperclassesInconsistentGenericTypes.Sub
-        public open override /*2*/ fun foo(): jet.MutableList<jet.String>
+    
+    public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
+        public constructor Sub()
+        public open override /*2*/ fun foo() : jet.MutableList<jet.String>
     }
 }
diff --git a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.txt
index a31e0f772ea..0e102b627a8 100644
--- a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.txt
+++ b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.txt
@@ -1,14 +1,17 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesVarargAndNot : java.lang.Object {
-    public abstract trait test.TwoSuperclassesVarargAndNot.Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String?>?): jet.Tuple0
-        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public trait TwoSuperclassesVarargAndNot : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
+        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : Unit
     }
-    public abstract trait test.TwoSuperclassesVarargAndNot.Super1 : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
     }
-    public abstract trait test.TwoSuperclassesVarargAndNot.Super2 : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.String?>?): jet.Tuple0
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : Unit
     }
 }
diff --git a/compiler/testData/loadJavaCustom/packageLocalVisibility/expected.txt b/compiler/testData/loadJavaCustom/packageLocalVisibility/expected.txt
index 9c1006d08c8..f803bd465f5 100644
--- a/compiler/testData/loadJavaCustom/packageLocalVisibility/expected.txt
+++ b/compiler/testData/loadJavaCustom/packageLocalVisibility/expected.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.JFrame : awt.Frame {
-    public final /*constructor*/ fun <init>(): test.JFrame
-    protected final var accessibleContext: jet.String?
+public open class JFrame : awt.Frame {
+    public constructor JFrame()
+    protected final var accessibleContext : jet.String?
 }
diff --git a/compiler/testData/loadJavaCustom/rawSuperType/RawSuperType.txt b/compiler/testData/loadJavaCustom/rawSuperType/RawSuperType.txt
index 9d828172edc..37291a60fdc 100644
--- a/compiler/testData/loadJavaCustom/rawSuperType/RawSuperType.txt
+++ b/compiler/testData/loadJavaCustom/rawSuperType/RawSuperType.txt
@@ -1,12 +1,14 @@
 namespace test
 
-public open class test.RawSuperType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.RawSuperType
-    public open class test.RawSuperType.Derived : test.RawSuperType.Super<jet.Any?> {
-        public final /*constructor*/ fun <init>(): test.RawSuperType.Derived
-        public open override /*1*/ fun foo(/*0*/ p0: jet.Any?): jet.Tuple0
+public open class RawSuperType : java.lang.Object {
+    public constructor RawSuperType()
+    
+    public open class Derived : test.RawSuperType.Super<jet.Any?> {
+        public constructor Derived()
+        public open override /*1*/ fun foo(/*0*/ p0 : jet.Any?) : Unit
     }
-    public abstract trait test.RawSuperType.Super</*0*/ T : jet.Any?> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: T?): jet.Tuple0
+    
+    public trait Super</*0*/ T> : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : T?) : Unit
     }
 }
diff --git a/compiler/testData/loadJavaCustom/staticFinal/expected.txt b/compiler/testData/loadJavaCustom/staticFinal/expected.txt
index 7ffb256f64f..d6ea43ce041 100644
--- a/compiler/testData/loadJavaCustom/staticFinal/expected.txt
+++ b/compiler/testData/loadJavaCustom/staticFinal/expected.txt
@@ -1,3 +1,2 @@
 namespace test
-
-public final val foo: jet.String
+public final val foo : jet.String
diff --git a/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt b/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt
index 0d6b9378baf..fb74883cddb 100644
--- a/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt
+++ b/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt
@@ -1,24 +1,26 @@
 namespace test
 
-public abstract trait test.SubclassWithRawType : java.lang.Object {
-    public abstract trait test.SubclassWithRawType.Sub : test.SubclassWithRawType.Super {
-        public abstract override /*1*/ fun array1(): jet.Array<jet.List<jet.String?>>?
-        public abstract override /*1*/ fun array2(): jet.Array<jet.List<jet.Any>>?
-        public abstract override /*1*/ fun boundWildcard1(): jet.MutableList<out jet.List<jet.String?>?>?
-        public abstract override /*1*/ fun boundWildcard2(): jet.MutableList<in jet.List<jet.Any>?>?
-        public abstract override /*1*/ fun simple1(): jet.MutableList<out jet.String?>?
-        public abstract override /*1*/ fun simple2(): jet.MutableList<out jet.List<jet.String>?>?
-        public abstract override /*1*/ fun simple3(): jet.MutableList<out jet.Any>?
-        public abstract override /*1*/ fun wildcard(): jet.MutableList<out jet.Any?>?
+public trait SubclassWithRawType : java.lang.Object {
+    
+    public trait Sub : test.SubclassWithRawType.Super {
+        public abstract override /*1*/ fun array1() : jet.Array<jet.List<jet.String?>>?
+        public abstract override /*1*/ fun array2() : jet.Array<jet.List<jet.Any>>?
+        public abstract override /*1*/ fun boundWildcard1() : jet.MutableList<out jet.List<jet.String?>?>?
+        public abstract override /*1*/ fun boundWildcard2() : jet.MutableList<in jet.List<jet.Any>?>?
+        public abstract override /*1*/ fun simple1() : jet.MutableList<out jet.String?>?
+        public abstract override /*1*/ fun simple2() : jet.MutableList<out jet.List<jet.String>?>?
+        public abstract override /*1*/ fun simple3() : jet.MutableList<out jet.Any>?
+        public abstract override /*1*/ fun wildcard() : jet.MutableList<out jet.Any?>?
     }
-    public abstract trait test.SubclassWithRawType.Super : java.lang.Object {
-        public abstract fun array1(): jet.Array<jet.List<jet.Any?>>?
-        public abstract fun array2(): jet.Array<jet.List<jet.String>>?
-        public abstract fun boundWildcard1(): jet.MutableList<out jet.List<jet.Any?>?>?
-        public abstract fun boundWildcard2(): jet.MutableList<in jet.List<jet.String>?>?
-        public abstract fun simple1(): jet.MutableList<out jet.Any?>?
-        public abstract fun simple2(): jet.MutableList<out jet.Any?>?
-        public abstract fun simple3(): jet.MutableList<jet.String>?
-        public abstract fun wildcard(): jet.MutableList<out jet.Any?>?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun array1() : jet.Array<jet.List<jet.Any?>>?
+        public abstract fun array2() : jet.Array<jet.List<jet.String>>?
+        public abstract fun boundWildcard1() : jet.MutableList<out jet.List<jet.Any?>?>?
+        public abstract fun boundWildcard2() : jet.MutableList<in jet.List<jet.String>?>?
+        public abstract fun simple1() : jet.MutableList<out jet.Any?>?
+        public abstract fun simple2() : jet.MutableList<out jet.Any?>?
+        public abstract fun simple3() : jet.MutableList<jet.String>?
+        public abstract fun wildcard() : jet.MutableList<out jet.Any?>?
     }
 }
diff --git a/compiler/testData/loadJavaCustom/subclassingKotlinInJava/expected.txt b/compiler/testData/loadJavaCustom/subclassingKotlinInJava/expected.txt
index 01a53201180..c8685e45eaa 100644
--- a/compiler/testData/loadJavaCustom/subclassingKotlinInJava/expected.txt
+++ b/compiler/testData/loadJavaCustom/subclassingKotlinInJava/expected.txt
@@ -1,10 +1,11 @@
 namespace test
 
-public open class test.JavaSubclass : test.KotlinClass {
-    public final /*constructor*/ fun <init>(): test.JavaSubclass
-    public open override /*1*/ fun foo(): jet.String
+public open class JavaSubclass : test.KotlinClass {
+    public constructor JavaSubclass()
+    public open override /*1*/ fun foo() : jet.String
 }
-public open class test.KotlinClass : jet.Any {
-    public final /*constructor*/ fun <init>(): test.KotlinClass
-    public open fun foo(): jet.String
+
+public open class KotlinClass {
+    public constructor KotlinClass()
+    public open fun foo() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/class/Class.txt b/compiler/testData/loadKotlin/class/Class.txt
index bac2d93a01e..18d8451aab0 100644
--- a/compiler/testData/loadKotlin/class/Class.txt
+++ b/compiler/testData/loadKotlin/class/Class.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Ramification : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Ramification
+internal final class Ramification {
+    /*primary*/ public constructor Ramification()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassInParam.txt b/compiler/testData/loadKotlin/class/ClassInParam.txt
index 49a7c5c2e94..bae82155553 100644
--- a/compiler/testData/loadKotlin/class/ClassInParam.txt
+++ b/compiler/testData/loadKotlin/class/ClassInParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Wine</*0*/ in T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Wine<T>
+internal final class Wine</*0*/ in T> {
+    /*primary*/ public constructor Wine</*0*/ in T>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassInnerClass.txt b/compiler/testData/loadKotlin/class/ClassInnerClass.txt
index 50cc9d071f5..15190a155ed 100644
--- a/compiler/testData/loadKotlin/class/ClassInnerClass.txt
+++ b/compiler/testData/loadKotlin/class/ClassInnerClass.txt
@@ -1,8 +1,9 @@
 namespace test
 
-internal final class test.Outer : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Outer
-    internal final class test.Outer.Inner : jet.Any {
-        public final /*primary constructor*/ fun <init>(): test.Outer.Inner
+internal final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    internal final class Inner {
+        /*primary*/ public constructor Inner()
     }
 }
diff --git a/compiler/testData/loadKotlin/class/ClassOutParam.txt b/compiler/testData/loadKotlin/class/ClassOutParam.txt
index df1353f9f2e..843f5282101 100644
--- a/compiler/testData/loadKotlin/class/ClassOutParam.txt
+++ b/compiler/testData/loadKotlin/class/ClassOutParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Juice</*0*/ in T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Juice<T>
+internal final class Juice</*0*/ in T> {
+    /*primary*/ public constructor Juice</*0*/ in T>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParam.txt b/compiler/testData/loadKotlin/class/ClassParam.txt
index 36a616df6cd..55e7b9580ac 100644
--- a/compiler/testData/loadKotlin/class/ClassParam.txt
+++ b/compiler/testData/loadKotlin/class/ClassParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Beer</*0*/ T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Beer<T>
+internal final class Beer</*0*/ T> {
+    /*primary*/ public constructor Beer</*0*/ T>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt b/compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt
index acd4272a6a7..cdc546d74a1 100644
--- a/compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
+internal final class ClassParamReferencesParam</*0*/ A, /*1*/ B : A> {
+    /*primary*/ public constructor ClassParamReferencesParam</*0*/ A, /*1*/ B : A>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt b/compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt
index aadfcb7e30e..70f17dd5191 100644
--- a/compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ in B : A> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : jet.Any?, /*1*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
+internal final class ClassParamReferencesParam</*0*/ A, /*1*/ in B : A> {
+    /*primary*/ public constructor ClassParamReferencesParam</*0*/ A, /*1*/ in B : A>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamReferencesSelf.txt b/compiler/testData/loadKotlin/class/ClassParamReferencesSelf.txt
index 375f1d51e9f..ac4ccb5ea18 100644
--- a/compiler/testData/loadKotlin/class/ClassParamReferencesSelf.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamReferencesSelf.txt
@@ -1,7 +1,8 @@
 namespace test
 
-internal final class test.ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
+internal final class ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> {
+    /*primary*/ public constructor ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>>()
 }
-internal abstract trait test.TraitWithP</*0*/ P : jet.Any?> : jet.Any {
+
+internal trait TraitWithP</*0*/ P> {
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperClassBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperClassBound.txt
index 90ad94ae893..ae420dfd00d 100644
--- a/compiler/testData/loadKotlin/class/ClassParamUpperClassBound.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamUpperClassBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Clock</*0*/ A : java.lang.Number> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : java.lang.Number><init>(): test.Clock<A>
+internal final class Clock</*0*/ A : java.lang.Number> {
+    /*primary*/ public constructor Clock</*0*/ A : java.lang.Number>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt
index d09c1705020..d612b11e5a8 100644
--- a/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+internal final class Clock</*0*/ A> where A : java.io.Serializable, A : java.lang.Number {
+    /*primary*/ public constructor Clock</*0*/ A>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.txt
index 80ee2c9bba6..bbd7d9cc479 100644
--- a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Clock</*0*/ A : java.io.Serializable> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : java.io.Serializable><init>(): test.Clock<A>
+internal final class Clock</*0*/ A : java.io.Serializable> {
+    /*primary*/ public constructor Clock</*0*/ A : java.io.Serializable>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt
index d09c1705020..d612b11e5a8 100644
--- a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+internal final class Clock</*0*/ A> where A : java.io.Serializable, A : java.lang.Number {
+    /*primary*/ public constructor Clock</*0*/ A>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassTwoParams.txt b/compiler/testData/loadKotlin/class/ClassTwoParams.txt
index 26849590924..29ee5355f18 100644
--- a/compiler/testData/loadKotlin/class/ClassTwoParams.txt
+++ b/compiler/testData/loadKotlin/class/ClassTwoParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassTwoParams</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+internal final class ClassTwoParams</*0*/ P, /*1*/ Q> {
+    /*primary*/ public constructor ClassTwoParams</*0*/ P, /*1*/ Q>()
 }
diff --git a/compiler/testData/loadKotlin/class/ClassTwoParams2.txt b/compiler/testData/loadKotlin/class/ClassTwoParams2.txt
index f0c0d4dfa7b..60b8615b1c2 100644
--- a/compiler/testData/loadKotlin/class/ClassTwoParams2.txt
+++ b/compiler/testData/loadKotlin/class/ClassTwoParams2.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassTwoParams</*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+internal final class ClassTwoParams</*0*/ out P, /*1*/ Q> {
+    /*primary*/ public constructor ClassTwoParams</*0*/ out P, /*1*/ Q>()
 }
diff --git a/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt
index 67d8557387c..5225d39ce67 100644
--- a/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -1,12 +1,13 @@
 namespace test
 
-internal final enum class test.EnumWithGenericConstructorParameter : jet.Enum<test.EnumWithGenericConstructorParameter> {
-    private final /*primary constructor*/ fun <init>(/*0*/ list: jet.List<jet.String>?): test.EnumWithGenericConstructorParameter
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.EnumWithGenericConstructorParameter.<class-object-for-EnumWithGenericConstructorParameter> {
-        private final /*constructor*/ fun <init>(): test.EnumWithGenericConstructorParameter.<class-object-for-EnumWithGenericConstructorParameter>
-        public final fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter
-        public final fun values(): jet.Array<test.EnumWithGenericConstructorParameter>
+internal final enum class EnumWithGenericConstructorParameter : jet.Enum<test.EnumWithGenericConstructorParameter> {
+    /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list : jet.List<jet.String>?)
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-EnumWithGenericConstructorParameter> {
+        /*primary*/ private constructor <class-object-for-EnumWithGenericConstructorParameter>()
+        public final fun valueOf(/*0*/ value : jet.String) : test.EnumWithGenericConstructorParameter
+        public final fun values() : jet.Array<test.EnumWithGenericConstructorParameter>
     }
 }
diff --git a/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt
index 56ec7aa836f..c1504d79cc2 100644
--- a/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt
@@ -1,12 +1,13 @@
 namespace test
 
-internal final enum class test.EnumWithPrimitiveConstructorParameter : jet.Enum<test.EnumWithPrimitiveConstructorParameter> {
-    private final /*primary constructor*/ fun <init>(/*0*/ b: jet.Boolean): test.EnumWithPrimitiveConstructorParameter
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.EnumWithPrimitiveConstructorParameter.<class-object-for-EnumWithPrimitiveConstructorParameter> {
-        private final /*constructor*/ fun <init>(): test.EnumWithPrimitiveConstructorParameter.<class-object-for-EnumWithPrimitiveConstructorParameter>
-        public final fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter
-        public final fun values(): jet.Array<test.EnumWithPrimitiveConstructorParameter>
+internal final enum class EnumWithPrimitiveConstructorParameter : jet.Enum<test.EnumWithPrimitiveConstructorParameter> {
+    /*primary*/ private constructor EnumWithPrimitiveConstructorParameter(/*0*/ b : jet.Boolean)
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-EnumWithPrimitiveConstructorParameter> {
+        /*primary*/ private constructor <class-object-for-EnumWithPrimitiveConstructorParameter>()
+        public final fun valueOf(/*0*/ value : jet.String) : test.EnumWithPrimitiveConstructorParameter
+        public final fun values() : jet.Array<test.EnumWithPrimitiveConstructorParameter>
     }
 }
diff --git a/compiler/testData/loadKotlin/class/InheritClassSimple.txt b/compiler/testData/loadKotlin/class/InheritClassSimple.txt
index 45c5c2fb0d3..c2dfb69d9cf 100644
--- a/compiler/testData/loadKotlin/class/InheritClassSimple.txt
+++ b/compiler/testData/loadKotlin/class/InheritClassSimple.txt
@@ -1,8 +1,9 @@
 namespace test
 
-internal abstract class test.Aaa : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Aaa
+internal abstract class Aaa {
+    /*primary*/ public constructor Aaa()
 }
-internal final class test.Bbb : test.Aaa {
-    public final /*primary constructor*/ fun <init>(): test.Bbb
+
+internal final class Bbb : test.Aaa {
+    /*primary*/ public constructor Bbb()
 }
diff --git a/compiler/testData/loadKotlin/class/InheritClassWithParam.txt b/compiler/testData/loadKotlin/class/InheritClassWithParam.txt
index 43ec856b9dc..4f33b95d439 100644
--- a/compiler/testData/loadKotlin/class/InheritClassWithParam.txt
+++ b/compiler/testData/loadKotlin/class/InheritClassWithParam.txt
@@ -1,8 +1,9 @@
 namespace test
 
-internal abstract class test.Aaa</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Aaa<P>
+internal abstract class Aaa</*0*/ P> {
+    /*primary*/ public constructor Aaa</*0*/ P>()
 }
-internal final class test.Bbb : test.Aaa<java.util.Random> {
-    public final /*primary constructor*/ fun <init>(): test.Bbb
+
+internal final class Bbb : test.Aaa<java.util.Random> {
+    /*primary*/ public constructor Bbb()
 }
diff --git a/compiler/testData/loadKotlin/class/InheritTraitWithParam.txt b/compiler/testData/loadKotlin/class/InheritTraitWithParam.txt
index 7e677682b41..e589b0cda77 100644
--- a/compiler/testData/loadKotlin/class/InheritTraitWithParam.txt
+++ b/compiler/testData/loadKotlin/class/InheritTraitWithParam.txt
@@ -1,7 +1,8 @@
 namespace test
 
-internal abstract trait test.Aaa</*0*/ P : jet.Any?> : jet.Any {
+internal trait Aaa</*0*/ P> {
 }
-internal final class test.Bbb : test.Aaa<java.util.Random> {
-    public final /*primary constructor*/ fun <init>(): test.Bbb
+
+internal final class Bbb : test.Aaa<java.util.Random> {
+    /*primary*/ public constructor Bbb()
 }
diff --git a/compiler/testData/loadKotlin/class/InnerClass.txt b/compiler/testData/loadKotlin/class/InnerClass.txt
index 50cc9d071f5..15190a155ed 100644
--- a/compiler/testData/loadKotlin/class/InnerClass.txt
+++ b/compiler/testData/loadKotlin/class/InnerClass.txt
@@ -1,8 +1,9 @@
 namespace test
 
-internal final class test.Outer : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Outer
-    internal final class test.Outer.Inner : jet.Any {
-        public final /*primary constructor*/ fun <init>(): test.Outer.Inner
+internal final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    internal final class Inner {
+        /*primary*/ public constructor Inner()
     }
 }
diff --git a/compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.txt b/compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.txt
index ad4806f3cc6..47d10c31660 100644
--- a/compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.txt
+++ b/compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.txt
@@ -1,11 +1,13 @@
 namespace test
 
-internal final class test.Outer : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Outer
-    internal open class test.Outer.Inner1 : jet.Any {
-        public final /*primary constructor*/ fun <init>(): test.Outer.Inner1
+internal final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    internal open class Inner1 {
+        /*primary*/ public constructor Inner1()
     }
-    internal final class test.Outer.Inner2 : test.Outer.Inner1 {
-        public final /*primary constructor*/ fun <init>(): test.Outer.Inner2
+    
+    internal final class Inner2 : test.Outer.Inner1 {
+        /*primary*/ public constructor Inner2()
     }
 }
diff --git a/compiler/testData/loadKotlin/class/NamedObject.txt b/compiler/testData/loadKotlin/class/NamedObject.txt
index 76e0699095c..b9e0e74c0d2 100644
--- a/compiler/testData/loadKotlin/class/NamedObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObject.txt
@@ -1,8 +1,8 @@
 namespace test
 
-public final object test.Obj : jet.Any {
-    private final /*primary constructor*/ fun <init>(): test.Obj
-    public final fun f(): jet.String
-    public final val v: jet.String
+public object Obj {
+    /*primary*/ private constructor Obj()
+    public final val v : jet.String
+    public final fun f() : jet.String
 }
-public final val Obj: test.Obj
+public final val Obj : test.Obj
diff --git a/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt b/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
index 4a4a796740d..758461d9d6a 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
@@ -1,14 +1,16 @@
 namespace test
 
-public final class test.Outer : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.Outer
-    public final class object test.Outer.<class-object-for-Outer> : jet.Any {
-        private final /*constructor*/ fun <init>(): test.Outer.<class-object-for-Outer>
-        public final val Obj: test.Outer.<class-object-for-Outer>.Obj
-        public final object test.Outer.<class-object-for-Outer>.Obj : jet.Any {
-            private final /*constructor*/ fun <init>(): test.Outer.<class-object-for-Outer>.Obj
-            public final fun f(): jet.String
-            public final val v: jet.String
+public final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    public class object <class-object-for-Outer> {
+        /*primary*/ private constructor <class-object-for-Outer>()
+        public final val Obj : test.Outer.<class-object-for-Outer>.Obj
+        
+        public object Obj {
+            /*primary*/ private constructor Obj()
+            public final val v : jet.String
+            public final fun f() : jet.String
         }
     }
 }
diff --git a/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt b/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
index 3e91513b226..efd89e6eb2c 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
@@ -1,12 +1,13 @@
 namespace test
 
-public final object test.Outer : jet.Any {
-    private final /*primary constructor*/ fun <init>(): test.Outer
-    public final val Obj: test.Outer.Obj
-    public final object test.Outer.Obj : jet.Any {
-        private final /*primary constructor*/ fun <init>(): test.Outer.Obj
-        public final fun f(): jet.String
-        public final val v: jet.String
+public object Outer {
+    /*primary*/ private constructor Outer()
+    public final val Obj : test.Outer.Obj
+    
+    public object Obj {
+        /*primary*/ private constructor Obj()
+        public final val v : jet.String
+        public final fun f() : jet.String
     }
 }
-public final val Outer: test.Outer
+public final val Outer : test.Outer
diff --git a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
index 66ab26ba4bf..d15af788bc0 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -1,9 +1,9 @@
 namespace test
 
-public final object test.Obj : jet.Any {
-    private final /*primary constructor*/ fun <init>(): test.Obj
-    public final fun f(): jet.String
-    public final val v: jet.String
+public object Obj {
+    /*primary*/ private constructor Obj()
+    public final val v : jet.String
+    public final fun f() : jet.String
 }
-public final val Obj: test.Obj
-internal final val x: jet.Int
+public final val Obj : test.Obj
+internal final val x : jet.Int
diff --git a/compiler/testData/loadKotlin/class/Trait.txt b/compiler/testData/loadKotlin/class/Trait.txt
index ebf51fb8b60..0bcb34770af 100644
--- a/compiler/testData/loadKotlin/class/Trait.txt
+++ b/compiler/testData/loadKotlin/class/Trait.txt
@@ -1,4 +1,4 @@
 namespace test
 
-internal abstract trait test.Trtrtr : jet.Any {
+internal trait Trtrtr {
 }
diff --git a/compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.txt b/compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.txt
index 8a7ae4d87c6..1fc944bcd39 100644
--- a/compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
-    internal final fun f(/*0*/ t: T): jet.Int
+internal final class ClassParamUsedInFun</*0*/ in T> {
+    /*primary*/ public constructor ClassParamUsedInFun</*0*/ in T>()
+    internal final fun f(/*0*/ t : T) : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.txt b/compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.txt
index b752bfe2b86..3426b3690c2 100644
--- a/compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.txt
+++ b/compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
-    internal final fun f(/*0*/ t: T): jet.Int
+internal final class ClassParamUsedInFun</*0*/ T> {
+    /*primary*/ public constructor ClassParamUsedInFun</*0*/ T>()
+    internal final fun f(/*0*/ t : T) : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt b/compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt
index 0368590ba0b..e6ab5eb7b0d 100644
--- a/compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt
+++ b/compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt
@@ -1,9 +1,10 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal open fun f(): jet.String
+internal trait A {
+    internal open fun f() : jet.String
 }
-internal final class test.B : test.A {
-    public final /*primary constructor*/ fun <init>(): test.B
-    internal open override /*1*/ /*fake_override*/ fun f(): jet.String
+
+internal final class B : test.A {
+    /*primary*/ public constructor B()
+    internal open override /*1*/ /*fake_override*/ fun f() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/classFun/FunInParamSuper.txt b/compiler/testData/loadKotlin/classFun/FunInParamSuper.txt
index 976a87a1094..6de973a8550 100644
--- a/compiler/testData/loadKotlin/classFun/FunInParamSuper.txt
+++ b/compiler/testData/loadKotlin/classFun/FunInParamSuper.txt
@@ -1,10 +1,11 @@
 namespace test
 
-internal open class test.Base</*0*/ T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
-    internal final fun foo(): T
+internal open class Base</*0*/ T> {
+    /*primary*/ public constructor Base</*0*/ T>()
+    internal final fun foo() : T
 }
-internal final class test.Inh : test.Base<jet.String> {
-    public final /*primary constructor*/ fun <init>(): test.Inh
-    internal final override /*1*/ /*fake_override*/ fun foo(): jet.String
+
+internal final class Inh : test.Base<jet.String> {
+    /*primary*/ public constructor Inh()
+    internal final override /*1*/ /*fake_override*/ fun foo() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/classFun/TraitFinalFun.txt b/compiler/testData/loadKotlin/classFun/TraitFinalFun.txt
index 4800008c60b..5fdd0ca819e 100644
--- a/compiler/testData/loadKotlin/classFun/TraitFinalFun.txt
+++ b/compiler/testData/loadKotlin/classFun/TraitFinalFun.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal final fun f(): jet.String
+internal trait A {
+    internal final fun f() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/classFun/TraitOpenFun.txt b/compiler/testData/loadKotlin/classFun/TraitOpenFun.txt
index 14b2643c055..19a8b2c1193 100644
--- a/compiler/testData/loadKotlin/classFun/TraitOpenFun.txt
+++ b/compiler/testData/loadKotlin/classFun/TraitOpenFun.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal open fun f(): jet.String
+internal trait A {
+    internal open fun f() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
index 72164da8be1..4b04c8bc57a 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
@@ -1,9 +1,10 @@
 namespace test
 
-internal final class test.ClassObjectDeclaresProperty : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
-    internal final class object test.ClassObjectDeclaresProperty.<class-object-for-ClassObjectDeclaresProperty> : jet.Any {
-        private final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<class-object-for-ClassObjectDeclaresProperty>
-        internal final val i: jet.Int
+internal final class ClassObjectDeclaresProperty {
+    /*primary*/ public constructor ClassObjectDeclaresProperty()
+    
+    internal class object <class-object-for-ClassObjectDeclaresProperty> {
+        /*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
+        internal final val i : jet.Int
     }
 }
diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
index 066fa1945c3..49a739daca4 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -1,9 +1,10 @@
 namespace test
 
-internal final class test.ClassObjectDeclaresProperty : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
-    internal final class object test.ClassObjectDeclaresProperty.<class-object-for-ClassObjectDeclaresProperty> : jet.Any {
-        private final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<class-object-for-ClassObjectDeclaresProperty>
-        internal final var s: jet.String
+internal final class ClassObjectDeclaresProperty {
+    /*primary*/ public constructor ClassObjectDeclaresProperty()
+    
+    internal class object <class-object-for-ClassObjectDeclaresProperty> {
+        /*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
+        internal final var s : jet.String
     }
 }
diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt
index 6f28a32e27c..ded05010e11 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt
@@ -1,10 +1,12 @@
 namespace test
 
-internal abstract trait test.Bbb : jet.Any {
+internal trait Bbb {
 }
-internal final class test.ClassObjectextendsTrait : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassObjectextendsTrait
-    internal final class object test.ClassObjectextendsTrait.<class-object-for-ClassObjectextendsTrait> : test.Bbb {
-        private final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait.<class-object-for-ClassObjectextendsTrait>
+
+internal final class ClassObjectextendsTrait {
+    /*primary*/ public constructor ClassObjectextendsTrait()
+    
+    internal class object <class-object-for-ClassObjectextendsTrait> : test.Bbb {
+        /*primary*/ private constructor <class-object-for-ClassObjectextendsTrait>()
     }
 }
diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
index b96e700538b..70710d8d3d1 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -1,10 +1,12 @@
 namespace test
 
-internal abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
+internal trait Bbb</*0*/ P> {
 }
-internal final class test.ClassObjectExtendsTraitWithTP : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP
-    internal final class object test.ClassObjectExtendsTraitWithTP.<class-object-for-ClassObjectExtendsTraitWithTP> : test.Bbb<jet.String> {
-        private final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP.<class-object-for-ClassObjectExtendsTraitWithTP>
+
+internal final class ClassObjectExtendsTraitWithTP {
+    /*primary*/ public constructor ClassObjectExtendsTraitWithTP()
+    
+    internal class object <class-object-for-ClassObjectExtendsTraitWithTP> : test.Bbb<jet.String> {
+        /*primary*/ private constructor <class-object-for-ClassObjectExtendsTraitWithTP>()
     }
 }
diff --git a/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt b/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt
index 9933a567716..572fa349ac4 100644
--- a/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt
+++ b/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt
@@ -1,8 +1,9 @@
 namespace test
 
-internal final class test.SimpleClassObject : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.SimpleClassObject
-    internal final class object test.SimpleClassObject.<class-object-for-SimpleClassObject> : jet.Any {
-        private final /*constructor*/ fun <init>(): test.SimpleClassObject.<class-object-for-SimpleClassObject>
+internal final class SimpleClassObject {
+    /*primary*/ public constructor SimpleClassObject()
+    
+    internal class object <class-object-for-SimpleClassObject> {
+        /*primary*/ private constructor <class-object-for-SimpleClassObject>()
     }
 }
diff --git a/compiler/testData/loadKotlin/constructor/Constructor0.txt b/compiler/testData/loadKotlin/constructor/Constructor0.txt
index 63af5208ffd..a583e008d8b 100644
--- a/compiler/testData/loadKotlin/constructor/Constructor0.txt
+++ b/compiler/testData/loadKotlin/constructor/Constructor0.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructor0 : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassWithConstructor0
+internal final class ClassWithConstructor0 {
+    /*primary*/ public constructor ClassWithConstructor0()
 }
diff --git a/compiler/testData/loadKotlin/constructor/Constructor1.txt b/compiler/testData/loadKotlin/constructor/Constructor1.txt
index e1a87337b15..1961af39c17 100644
--- a/compiler/testData/loadKotlin/constructor/Constructor1.txt
+++ b/compiler/testData/loadKotlin/constructor/Constructor1.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructor1 : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ p: jet.Int): test.ClassWithConstructor1
+internal final class ClassWithConstructor1 {
+    /*primary*/ public constructor ClassWithConstructor1(/*0*/ p : jet.Int)
 }
diff --git a/compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.txt b/compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.txt
index 310b8d974eb..1829095422a 100644
--- a/compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.txt
+++ b/compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructorWithValueParamWithDefaultValue : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ p: jet.Int = ?): test.ClassWithConstructorWithValueParamWithDefaultValue
+internal final class ClassWithConstructorWithValueParamWithDefaultValue {
+    /*primary*/ public constructor ClassWithConstructorWithValueParamWithDefaultValue(/*0*/ p : jet.Int = ...)
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
index 9ffca7deae6..72f29baabe2 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.TestingKotlinCollections : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ arguments: jet.Collection<jet.String>): test.TestingKotlinCollections
-    internal final val arguments: jet.Collection<jet.String>
+internal final class TestingKotlinCollections {
+    /*primary*/ public constructor TestingKotlinCollections(/*0*/ arguments : jet.Collection<jet.String>)
+    internal final val arguments : jet.Collection<jet.String>
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.txt
index 4a799242031..452539c35d2 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
+internal final class ClassWithConstructorAndTypeParameter</*0*/ P, /*1*/ Q> {
+    /*primary*/ public constructor ClassWithConstructorAndTypeParameter</*0*/ P, /*1*/ Q>()
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index f287c92fac6..5de186110e8 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
+internal final class ClassWithConstructorAndTypeParameter</*0*/ P, /*1*/ Q> {
+    /*primary*/ public constructor ClassWithConstructorAndTypeParameter</*0*/ P, /*1*/ Q>(/*0*/ q : jet.Int)
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index e0e6c7f2dca..29b9157b928 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
+internal final class ClassWithConstructorAndTypeParameter</*0*/ P, /*1*/ Q> {
+    /*primary*/ public constructor ClassWithConstructorAndTypeParameter</*0*/ P, /*1*/ Q>(/*0*/ q : Q)
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.txt
index 8599d10ca3b..e5fd5445d01 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
+internal final class ClassWithConstructorAndTypeParameter</*0*/ P> {
+    /*primary*/ public constructor ClassWithConstructorAndTypeParameter</*0*/ P>()
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index 413f41224aa..55bce76a1f2 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.OneTypeParameterErased</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
+internal final class OneTypeParameterErased</*0*/ P, /*1*/ Q> {
+    /*primary*/ public constructor OneTypeParameterErased</*0*/ P, /*1*/ Q>(/*0*/ q : Q)
 }
diff --git a/compiler/testData/loadKotlin/dataClass/MixedComponents.txt b/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
index e59a9b89abe..5dc1862326e 100644
--- a/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
+++ b/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
@@ -1,10 +1,10 @@
 namespace test
 
-jet.data() internal final class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ x: jet.String, /*1*/ y: jet.Int, /*2*/ z: jet.Double): test.DataClass
-    internal final /*synthesized*/ fun component1(): jet.String
-    internal final /*synthesized*/ fun component2(): jet.Double
-    internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ?, /*1*/ y: jet.Int, /*2*/ z: jet.Double = ?): test.DataClass
-    internal final var x: jet.String
-    internal final val z: jet.Double
+jet.data() internal final class DataClass {
+    /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int, /*2*/ z : jet.Double)
+    internal final var x : jet.String
+    internal final val z : jet.Double
+    internal final /*synthesized*/ fun component1() : jet.String
+    internal final /*synthesized*/ fun component2() : jet.Double
+    internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int, /*2*/ z : jet.Double = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/NoComponents.txt b/compiler/testData/loadKotlin/dataClass/NoComponents.txt
index 6942f96bfd0..6022003db1f 100644
--- a/compiler/testData/loadKotlin/dataClass/NoComponents.txt
+++ b/compiler/testData/loadKotlin/dataClass/NoComponents.txt
@@ -1,5 +1,5 @@
 namespace test
 
-jet.data() internal final class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.DataClass
+jet.data() internal final class DataClass {
+    /*primary*/ public constructor DataClass()
 }
diff --git a/compiler/testData/loadKotlin/dataClass/OneVal.txt b/compiler/testData/loadKotlin/dataClass/OneVal.txt
index bcffba8b8f4..45cf810ed20 100644
--- a/compiler/testData/loadKotlin/dataClass/OneVal.txt
+++ b/compiler/testData/loadKotlin/dataClass/OneVal.txt
@@ -1,8 +1,8 @@
 namespace test
 
-jet.data() internal final class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ x: jet.String): test.DataClass
-    internal final /*synthesized*/ fun component1(): jet.String
-    internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ?): test.DataClass
-    internal final val x: jet.String
+jet.data() internal final class DataClass {
+    /*primary*/ public constructor DataClass(/*0*/ x : jet.String)
+    internal final val x : jet.String
+    internal final /*synthesized*/ fun component1() : jet.String
+    internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt b/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
index 2fbe6b26aef..39a339c76ea 100644
--- a/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
+++ b/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
@@ -1,8 +1,8 @@
 namespace test
 
-jet.data() internal open class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ x: jet.String): test.DataClass
-    internal final /*synthesized*/ fun component1(): jet.String
-    internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ?): test.DataClass
-    internal final val x: jet.String
+jet.data() internal open class DataClass {
+    /*primary*/ public constructor DataClass(/*0*/ x : jet.String)
+    internal final val x : jet.String
+    internal final /*synthesized*/ fun component1() : jet.String
+    internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt b/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
index cc20719329d..ea103e80112 100644
--- a/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
+++ b/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
@@ -1,8 +1,8 @@
 namespace test
 
-jet.data() internal open class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ x: jet.String): test.DataClass
-    internal final /*synthesized*/ fun component1(): jet.String
-    internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ?): test.DataClass
-    internal open val x: jet.String
+jet.data() internal open class DataClass {
+    /*primary*/ public constructor DataClass(/*0*/ x : jet.String)
+    internal open val x : jet.String
+    internal final /*synthesized*/ fun component1() : jet.String
+    internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/TwoVals.txt b/compiler/testData/loadKotlin/dataClass/TwoVals.txt
index 428d06008fd..74b4e7eeb5a 100644
--- a/compiler/testData/loadKotlin/dataClass/TwoVals.txt
+++ b/compiler/testData/loadKotlin/dataClass/TwoVals.txt
@@ -1,10 +1,10 @@
 namespace test
 
-jet.data() internal final class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ x: jet.String, /*1*/ y: jet.Int): test.DataClass
-    internal final /*synthesized*/ fun component1(): jet.String
-    internal final /*synthesized*/ fun component2(): jet.Int
-    internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ?, /*1*/ y: jet.Int = ?): test.DataClass
-    internal final val x: jet.String
-    internal final val y: jet.Int
+jet.data() internal final class DataClass {
+    /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int)
+    internal final val x : jet.String
+    internal final val y : jet.Int
+    internal final /*synthesized*/ fun component1() : jet.String
+    internal final /*synthesized*/ fun component2() : jet.Int
+    internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/TwoVars.txt b/compiler/testData/loadKotlin/dataClass/TwoVars.txt
index 983f64794dc..ab4d5c5e4fb 100644
--- a/compiler/testData/loadKotlin/dataClass/TwoVars.txt
+++ b/compiler/testData/loadKotlin/dataClass/TwoVars.txt
@@ -1,10 +1,10 @@
 namespace test
 
-jet.data() internal final class test.DataClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ x: jet.String, /*1*/ y: jet.Int): test.DataClass
-    internal final /*synthesized*/ fun component1(): jet.String
-    internal final /*synthesized*/ fun component2(): jet.Int
-    internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ?, /*1*/ y: jet.Int = ?): test.DataClass
-    internal final var x: jet.String
-    internal final var y: jet.Int
+jet.data() internal final class DataClass {
+    /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int)
+    internal final var x : jet.String
+    internal final var y : jet.Int
+    internal final /*synthesized*/ fun component1() : jet.String
+    internal final /*synthesized*/ fun component2() : jet.Int
+    internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt b/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt
index dfcac84e6a3..03400a5d5da 100644
--- a/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt
+++ b/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.PropagateSubclassOfComparable : jet.Comparable<test.PropagateSubclassOfComparable> {
-    public final /*primary constructor*/ fun <init>(): test.PropagateSubclassOfComparable
-    public open override /*1*/ fun compareTo(/*0*/ other: test.PropagateSubclassOfComparable): jet.Int
+internal final class PropagateSubclassOfComparable : jet.Comparable<test.PropagateSubclassOfComparable> {
+    /*primary*/ public constructor PropagateSubclassOfComparable()
+    public open override /*1*/ fun compareTo(/*0*/ other : test.PropagateSubclassOfComparable) : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
index dad12e4cb55..e8d9125570a 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ T : jet.Any?>f(): jet.Int
+internal final fun </*0*/ T> f() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
index d44507d21d6..df88bd25b2d 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+internal final fun </*0*/ P> funParamParam(/*0*/ a : jet.Int, /*1*/ b : P) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
index d44507d21d6..df88bd25b2d 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+internal final fun </*0*/ P> funParamParam(/*0*/ a : jet.Int, /*1*/ b : P) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
index 4ccfea750ba..727996bb4ca 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
+internal final fun </*0*/ P, /*1*/ Q : P> funParamReferencesParam() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
index 5a78716c6d8..050ca38e58f 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
@@ -1,7 +1,8 @@
 namespace test
 
-internal abstract trait test.Bar : jet.Any {
+internal trait Bar {
 }
-internal abstract trait test.Foo : jet.Any {
+
+internal trait Foo {
 }
-internal final fun </*0*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
+internal final fun </*0*/ T> foo() : Unit where T : test.Bar, T : test.Foo
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
index 216a79087fc..e3a8c3d221c 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ A : java.lang.Number>uno(): jet.Int
+internal final fun </*0*/ A : java.lang.Number> uno() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
index 8c052da2065..834ca2c99b1 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
+internal final fun </*0*/ A> tres() : jet.Int where A : java.io.Serializable, A : java.lang.Number
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
index b8e98423529..ea2ab0ed3b2 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ A : java.io.Serializable>dos(): jet.Int
+internal final fun </*0*/ A : java.io.Serializable> dos() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
index d37746bce09..41ebc116d68 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
+internal final fun </*0*/ A> cuatro() : jet.Int where A : java.io.Serializable, A : java.lang.Number
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
index 9aeac632a13..857d3e732a4 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
+internal final fun </*0*/ P> funParamVarargParam(/*0*/ a : jet.Int, /*1*/ vararg b : P /*jet.Array<P>*/) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
index f097ec54ac1..4413c54379a 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
+internal final fun </*0*/ P, /*1*/ Q> funTwoTypeParams() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
index f217cdc7f91..752835418c8 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun ff(/*0*/ p: jet.List<jet.CharSequence>): jet.Int
+internal final fun ff(/*0*/ p : jet.List<jet.CharSequence>) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
index 96ab39af741..22ccf26327f 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun ff(/*0*/ p: jet.List<java.lang.CharSequence?>): jet.Int
+internal final fun ff(/*0*/ p : jet.List<java.lang.CharSequence?>) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
index 78a36cc0c20..dc92ab32ee2 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(/*0*/ a: java.lang.Integer?): jet.Int
+internal final fun fff(/*0*/ a : java.lang.Integer?) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
index 82ddf22c9d9..7478ab8a248 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun ffgg(): jet.List<jet.CharSequence>
+internal final fun ffgg() : jet.List<jet.CharSequence>
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
index e207069fab1..7b2a21ac411 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun ffgg(): jet.List<jet.CharSequence?>
+internal final fun ffgg() : jet.List<jet.CharSequence?>
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.txt
index 7478e61b713..1deb92beb07 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.River : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.River
-    internal final fun song(): jet.Int
+internal final class River {
+    /*primary*/ public constructor River()
+    internal final fun song() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.txt
index 7614a02236b..adaab876e77 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ClassFunGetFoo : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassFunGetFoo
-    internal final fun getFoo(): jet.Int
+internal final class ClassFunGetFoo {
+    /*primary*/ public constructor ClassFunGetFoo()
+    internal final fun getFoo() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
index 20e6c2c43f5..ad139bf8bb9 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
@@ -1,7 +1,7 @@
 namespace test
 
-internal final class test.ClassFunGetFoo : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassFunGetFoo
-    internal final fun getFoo(): jet.Int
-    internal final fun setFoo(/*0*/ p: jet.Int): jet.Tuple0
+internal final class ClassFunGetFoo {
+    /*primary*/ public constructor ClassFunGetFoo()
+    internal final fun getFoo() : jet.Int
+    internal final fun setFoo(/*0*/ p : jet.Int) : Unit
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
index dd6e042830a..73ac9273171 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ClassFunGetFoo : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassFunGetFoo
-    internal final fun set(/*0*/ p: jet.Int): jet.Tuple0
+internal final class ClassFunGetFoo {
+    /*primary*/ public constructor ClassFunGetFoo()
+    internal final fun set(/*0*/ p : jet.Int) : Unit
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
index a956472f80a..b04b27115e5 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun jet.Int.shuffle(): jet.Int
+internal final fun jet.Int.shuffle() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.txt
index 12c27640ea3..1e505c0f79b 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtFunInClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ExtFunInClass
-    internal final fun jet.Int.shuffle(): jet.Int
+internal final class ExtFunInClass {
+    /*primary*/ public constructor ExtFunInClass()
+    internal final fun jet.Int.shuffle() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
index ba60631fd30..50f7b29c122 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun funDefaultArg(/*0*/ p: jet.Int, /*1*/ q: jet.Int = ?, /*2*/ r: jet.Int = ?): jet.Int
+internal final fun funDefaultArg(/*0*/ p : jet.Int, /*1*/ q : jet.Int = ..., /*2*/ r : jet.Int = ...) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
index b77de56ace4..97061655943 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(/*0*/ a: java.lang.Integer): jet.Int
+internal final fun fff(/*0*/ a : java.lang.Integer) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
index 1279803fae8..a863e2f401f 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int /*jet.IntArray*/): jet.Int
+internal final fun varargInt(/*0*/ a : jet.Int, /*1*/ vararg b : jet.Int /*jet.IntArray*/) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
index a31d6d26b76..fd911dbb689 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer /*jet.Array<java.lang.Integer>*/): jet.Int
+internal final fun varargCharSequence(/*0*/ a : jet.Int, /*1*/ vararg b : java.lang.Integer /*jet.Array<java.lang.Integer>*/) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.txt
index 5c708d1fc76..4612934e237 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal abstract class test.ModifierAbstract : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ModifierAbstract
-    internal abstract fun abs(): jet.Int
+internal abstract class ModifierAbstract {
+    /*primary*/ public constructor ModifierAbstract()
+    internal abstract fun abs() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.txt
index ee338ffee79..e1e5a84693c 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal open class test.ModifierOpen : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ModifierOpen
-    internal open fun abs(): jet.Int
+internal open class ModifierOpen {
+    /*primary*/ public constructor ModifierOpen()
+    internal open fun abs() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
index 07634e288be..c0dcc2a5252 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun f(): jet.Int
+internal final fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
index 6c240b5397c..47a9011353a 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun getFoo(): jet.Int
+internal final fun getFoo() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
index 9eaa7a59198..519ded1f21f 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun ff(): java.lang.Integer
+internal final fun ff() : java.lang.Integer
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
index e0a7bea7a15..82784c9c189 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun ff(): java.lang.Integer?
+internal final fun ff() : java.lang.Integer?
diff --git a/compiler/testData/loadKotlin/prop/ClassVal.txt b/compiler/testData/loadKotlin/prop/ClassVal.txt
index 9242271047c..796f6df2d63 100644
--- a/compiler/testData/loadKotlin/prop/ClassVal.txt
+++ b/compiler/testData/loadKotlin/prop/ClassVal.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ClassVal : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassVal
-    internal final val aa: jet.Int
+internal final class ClassVal {
+    /*primary*/ public constructor ClassVal()
+    internal final val aa : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ClassValAbstract.txt b/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
index 508be175fe6..752fd9c102f 100644
--- a/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
+++ b/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal abstract class test.ClassValAbstract : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassValAbstract
-    internal abstract val a: jet.Int
+internal abstract class ClassValAbstract {
+    /*primary*/ public constructor ClassValAbstract()
+    internal abstract val a : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ClassVar.txt b/compiler/testData/loadKotlin/prop/ClassVar.txt
index 24793246597..88da3fd2374 100644
--- a/compiler/testData/loadKotlin/prop/ClassVar.txt
+++ b/compiler/testData/loadKotlin/prop/ClassVar.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ClassVar : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ClassVar
-    internal final var aa: jet.Int
+internal final class ClassVar {
+    /*primary*/ public constructor ClassVar()
+    internal final var aa : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/CollectionSize.txt b/compiler/testData/loadKotlin/prop/CollectionSize.txt
index ef6dfc6f774..f7ce6ca5682 100644
--- a/compiler/testData/loadKotlin/prop/CollectionSize.txt
+++ b/compiler/testData/loadKotlin/prop/CollectionSize.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final val jet.Collection<jet.Any?>.anotherSize: jet.Int
+internal final val jet.Collection<jet.Any?>.anotherSize : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtValClass.txt b/compiler/testData/loadKotlin/prop/ExtValClass.txt
index a1ff93f1ef5..c9278d62e37 100644
--- a/compiler/testData/loadKotlin/prop/ExtValClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValClass.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final val  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+internal final val </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
diff --git a/compiler/testData/loadKotlin/prop/ExtValInClass.txt b/compiler/testData/loadKotlin/prop/ExtValInClass.txt
index 2a50580468e..f6666138edd 100644
--- a/compiler/testData/loadKotlin/prop/ExtValInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtPropInClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ExtPropInClass
-    internal final val jet.Int.itIs: jet.Int
+internal final class ExtPropInClass {
+    /*primary*/ public constructor ExtPropInClass()
+    internal final val jet.Int.itIs : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValInt.txt b/compiler/testData/loadKotlin/prop/ExtValInt.txt
index 9b9c64ee579..e3b16104668 100644
--- a/compiler/testData/loadKotlin/prop/ExtValInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValInt.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final val jet.Int.itIs: jet.Int
+internal final val jet.Int.itIs : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
index 789a8c644bc..78173de7aab 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final val jet.Int.ggg: java.lang.CharSequence
+internal final val jet.Int.ggg : java.lang.CharSequence
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
index 26aa43df879..b5192394fa5 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final val jet.Int.ggg: java.lang.CharSequence?
+internal final val jet.Int.ggg : java.lang.CharSequence?
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
index 328d3012e6e..0f87df0f32f 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValInClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ExtValInClass
-    internal final val jet.Int.asas: java.util.List<jet.Int>?
+internal final class ExtValInClass {
+    /*primary*/ public constructor ExtValInClass()
+    internal final val jet.Int.asas : java.util.List<jet.Int>?
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
index 2e738c62498..049ecbae660 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
-    internal final val jet.Int.asas: T
+internal final class ExtValInClass</*0*/ T> {
+    /*primary*/ public constructor ExtValInClass</*0*/ T>()
+    internal final val jet.Int.asas : T
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
index 26a00b0dd2f..69002aa2052 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
-    internal final val jet.Int.asas: P?
+internal final class ExtValInClass</*0*/ P> {
+    /*primary*/ public constructor ExtValInClass</*0*/ P>()
+    internal final val jet.Int.asas : P?
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
index 08b51e6b03d..8c1f2f1ef01 100644
--- a/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
-    internal final val P.asas: jet.Int
+internal final class ExtValPIntInClass</*0*/ P> {
+    /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
+    internal final val P.asas : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarClass.txt b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
index d0f147e9a8f..04a1b03c564 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final var  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+internal final var </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
index b991af6218c..049fb214892 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtPropInClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.ExtPropInClass
-    internal final var jet.Int.itIs: jet.Int
+internal final class ExtPropInClass {
+    /*primary*/ public constructor ExtPropInClass()
+    internal final var jet.Int.itIs : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInt.txt b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
index 9c44dc4e6b4..64babd7e1fc 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final var jet.Int.ggg: jet.Int
+internal final var jet.Int.ggg : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
index 309f2d09dd0..68187af8feb 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
-    internal final var jet.Int.asas: P
+internal final class ExtValInClass</*0*/ P> {
+    /*primary*/ public constructor ExtValInClass</*0*/ P>()
+    internal final var jet.Int.asas : P
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
index 0ea18e5c7f6..5f0a2dfab0a 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
-    internal final var jet.Int.asas: P?
+internal final class ExtValInClass</*0*/ P> {
+    /*primary*/ public constructor ExtValInClass</*0*/ P>()
+    internal final var jet.Int.asas : P?
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
index d31b0f3a921..6d2b0e364e4 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final var  </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> jet.Map<P, Q>.asas: jet.Int
+internal final var </*0*/ P, /*1*/ Q> jet.Map<P, Q>.asas : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
index 8f007ec0f25..c95ecc89763 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
-    internal final var P.asas: jet.Int
+internal final class ExtValPIntInClass</*0*/ P> {
+    /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
+    internal final var P.asas : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
index 68cfb805757..ed5b5647402 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
-    internal final var P?.asas: jet.Int
+internal final class ExtValPIntInClass</*0*/ P> {
+    /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
+    internal final var P?.asas : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarl.txt b/compiler/testData/loadKotlin/prop/ExtVarl.txt
index 2507760b5de..a3e6195c2cb 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarl.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarl.txt
@@ -1,4 +1,3 @@
 namespace test
-
-internal final var jet.Int.junk: jet.Short
-internal final val jet.String.junk: jet.Int
+internal final var jet.Int.junk : jet.Short
+internal final val jet.String.junk : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVal.txt b/compiler/testData/loadKotlin/prop/NsVal.txt
index c5a6182c968..40bde31b2ac 100644
--- a/compiler/testData/loadKotlin/prop/NsVal.txt
+++ b/compiler/testData/loadKotlin/prop/NsVal.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final val nsVal: jet.Int
+internal final val nsVal : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVar.txt b/compiler/testData/loadKotlin/prop/NsVar.txt
index cf592e9983c..a8e5574c2d3 100644
--- a/compiler/testData/loadKotlin/prop/NsVar.txt
+++ b/compiler/testData/loadKotlin/prop/NsVar.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final var nsVal: jet.Int
+internal final var nsVal : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/OverrideClassVal.txt b/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
index 5b40a9cbf32..361f982e794 100644
--- a/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
+++ b/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
@@ -1,10 +1,11 @@
 namespace test
 
-internal open class test.BaseClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.BaseClass
-    internal open val shape: jet.String
+internal open class BaseClass {
+    /*primary*/ public constructor BaseClass()
+    internal open val shape : jet.String
 }
-internal open class test.Subclass : test.BaseClass {
-    public final /*primary constructor*/ fun <init>(): test.Subclass
-    internal open override /*1*/ val shape: jet.String
+
+internal open class Subclass : test.BaseClass {
+    /*primary*/ public constructor Subclass()
+    internal open override /*1*/ val shape : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt b/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
index 46189898b6c..f19ad8d25fd 100644
--- a/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
+++ b/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
@@ -1,9 +1,10 @@
 namespace test
 
-internal open class test.Subclass : test.Trait {
-    public final /*primary constructor*/ fun <init>(): test.Subclass
-    internal open override /*1*/ val shape: jet.String
+internal open class Subclass : test.Trait {
+    /*primary*/ public constructor Subclass()
+    internal open override /*1*/ val shape : jet.String
 }
-internal abstract trait test.Trait : jet.Any {
-    internal abstract val shape: jet.String
+
+internal trait Trait {
+    internal abstract val shape : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt b/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
index 1549a2bf7cd..6a2a2d88607 100644
--- a/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
+++ b/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
@@ -1,10 +1,11 @@
 namespace test
 
-internal open class test.BaseClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.BaseClass
-    internal final val exactly: jet.Int
+internal open class BaseClass {
+    /*primary*/ public constructor BaseClass()
+    internal final val exactly : jet.Int
 }
-internal final class test.Subclass : test.BaseClass {
-    public final /*primary constructor*/ fun <init>(): test.Subclass
-    internal final override /*1*/ /*fake_override*/ val exactly: jet.Int
+
+internal final class Subclass : test.BaseClass {
+    /*primary*/ public constructor Subclass()
+    internal final override /*1*/ /*fake_override*/ val exactly : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/TraitFinalVar.txt b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
index 398e93ab14c..8e87d013342 100644
--- a/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
+++ b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal open var v: jet.String
+internal trait A {
+    internal open var v : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/TraitOpenVal.txt b/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
index 35e9fddd9a8..47f64e161fd 100644
--- a/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
+++ b/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal open val v: jet.String
+internal trait A {
+    internal open val v : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
index 38e7a0ad1bc..14ee7812f30 100644
--- a/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
@@ -1,9 +1,10 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal open var v: jet.String
+internal trait A {
+    internal open var v : jet.String
 }
-internal final class test.B : test.A {
-    public final /*primary constructor*/ fun <init>(): test.B
-    internal open override /*1*/ /*fake_override*/ var v: jet.String
+
+internal final class B : test.A {
+    /*primary*/ public constructor B()
+    internal open override /*1*/ /*fake_override*/ var v : jet.String
 }
diff --git a/compiler/testData/loadKotlin/type/Any.txt b/compiler/testData/loadKotlin/type/Any.txt
index a97572afcf5..ed1a02e5d6d 100644
--- a/compiler/testData/loadKotlin/type/Any.txt
+++ b/compiler/testData/loadKotlin/type/Any.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun any(): jet.Any
+internal final fun any() : jet.Any
diff --git a/compiler/testData/loadKotlin/type/AnyQ.txt b/compiler/testData/loadKotlin/type/AnyQ.txt
index 245ead2f2be..06d318e42ce 100644
--- a/compiler/testData/loadKotlin/type/AnyQ.txt
+++ b/compiler/testData/loadKotlin/type/AnyQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun anyq(): jet.Any?
+internal final fun anyq() : jet.Any?
diff --git a/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt b/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt
index e8ae7526d38..9fc6da31c70 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun nothing(): jet.Array<in jet.Number>
+internal final fun nothing() : jet.Array<in jet.Number>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfInt.txt b/compiler/testData/loadKotlin/type/ArrayOfInt.txt
index 9c26f3420ed..deb750d1e7e 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfInt.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfInt.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): jet.Array<jet.Int>
+internal final fun fff() : jet.Array<jet.Int>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfInteger.txt b/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
index 6263475222d..959005bff03 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun nothing(): jet.Array<java.lang.Integer>
+internal final fun nothing() : jet.Array<java.lang.Integer>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt b/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt
index b63a0c6b5fb..b2514fabfb3 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun nothing(): jet.Array<out jet.Number>
+internal final fun nothing() : jet.Array<out jet.Number>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfOutT.txt b/compiler/testData/loadKotlin/type/ArrayOfOutT.txt
index 5b912720b96..a72735e0b49 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfOutT.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfOutT.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun </*0*/ T : jet.Any?>nothing(): jet.Array<out T>
+internal final fun </*0*/ T> nothing() : jet.Array<out T>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfString.txt b/compiler/testData/loadKotlin/type/ArrayOfString.txt
index 74455ff59a5..8aa47e5a2a9 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfString.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfString.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): jet.Array<jet.String>
+internal final fun fff() : jet.Array<jet.String>
diff --git a/compiler/testData/loadKotlin/type/Function1IntString.txt b/compiler/testData/loadKotlin/type/Function1IntString.txt
index 13d5255ecfb..adf85120bcf 100644
--- a/compiler/testData/loadKotlin/type/Function1IntString.txt
+++ b/compiler/testData/loadKotlin/type/Function1IntString.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fun1(): jet.Function1<jet.String, jet.Int>
+internal final fun fun1() : (jet.String) -> jet.Int
diff --git a/compiler/testData/loadKotlin/type/Int.txt b/compiler/testData/loadKotlin/type/Int.txt
index 2a86f9b8fa1..5178686f661 100644
--- a/compiler/testData/loadKotlin/type/Int.txt
+++ b/compiler/testData/loadKotlin/type/Int.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): jet.Int
+internal final fun fff() : jet.Int
diff --git a/compiler/testData/loadKotlin/type/IntArray.txt b/compiler/testData/loadKotlin/type/IntArray.txt
index 9badf046b43..5f57f728b3f 100644
--- a/compiler/testData/loadKotlin/type/IntArray.txt
+++ b/compiler/testData/loadKotlin/type/IntArray.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun nothing(): jet.IntArray
+internal final fun nothing() : jet.IntArray
diff --git a/compiler/testData/loadKotlin/type/IntQ.txt b/compiler/testData/loadKotlin/type/IntQ.txt
index ce046376ee8..4af2de45c0a 100644
--- a/compiler/testData/loadKotlin/type/IntQ.txt
+++ b/compiler/testData/loadKotlin/type/IntQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): jet.Int?
+internal final fun fff() : jet.Int?
diff --git a/compiler/testData/loadKotlin/type/ListOfAny.txt b/compiler/testData/loadKotlin/type/ListOfAny.txt
index a779dc84060..95ff4783fe2 100644
--- a/compiler/testData/loadKotlin/type/ListOfAny.txt
+++ b/compiler/testData/loadKotlin/type/ListOfAny.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun listOfAny(): jet.List<jet.Any>
+internal final fun listOfAny() : jet.List<jet.Any>
diff --git a/compiler/testData/loadKotlin/type/ListOfAnyQ.txt b/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
index f8f4b014144..ae226532b79 100644
--- a/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
+++ b/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun listOfAnyQ(): jet.List<jet.Any?>
+internal final fun listOfAnyQ() : jet.List<jet.Any?>
diff --git a/compiler/testData/loadKotlin/type/ListOfStar.txt b/compiler/testData/loadKotlin/type/ListOfStar.txt
index 5b7317e34c7..242df0858b3 100644
--- a/compiler/testData/loadKotlin/type/ListOfStar.txt
+++ b/compiler/testData/loadKotlin/type/ListOfStar.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun listOfStar(): jet.List<jet.Any?>
+internal final fun listOfStar() : jet.List<jet.Any?>
diff --git a/compiler/testData/loadKotlin/type/ListOfString.txt b/compiler/testData/loadKotlin/type/ListOfString.txt
index 978809777c2..8f38a06ef9f 100644
--- a/compiler/testData/loadKotlin/type/ListOfString.txt
+++ b/compiler/testData/loadKotlin/type/ListOfString.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): java.util.List<jet.String>
+internal final fun fff() : java.util.List<jet.String>
diff --git a/compiler/testData/loadKotlin/type/ListOfjlString.txt b/compiler/testData/loadKotlin/type/ListOfjlString.txt
index ab724d359e1..0b57beeee0f 100644
--- a/compiler/testData/loadKotlin/type/ListOfjlString.txt
+++ b/compiler/testData/loadKotlin/type/ListOfjlString.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun listOfJlString(): java.util.List<java.lang.String>
+internal final fun listOfJlString() : java.util.List<java.lang.String>
diff --git a/compiler/testData/loadKotlin/type/Nothing.txt b/compiler/testData/loadKotlin/type/Nothing.txt
index e437e0e075d..8c6bd39bb44 100644
--- a/compiler/testData/loadKotlin/type/Nothing.txt
+++ b/compiler/testData/loadKotlin/type/Nothing.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun nothing(): jet.Nothing
+internal final fun nothing() : jet.Nothing
diff --git a/compiler/testData/loadKotlin/type/NothingQ.txt b/compiler/testData/loadKotlin/type/NothingQ.txt
index 40cad307dd7..32ae29c653a 100644
--- a/compiler/testData/loadKotlin/type/NothingQ.txt
+++ b/compiler/testData/loadKotlin/type/NothingQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun nothingq(): jet.Nothing?
+internal final fun nothingq() : jet.Nothing?
diff --git a/compiler/testData/loadKotlin/type/String.txt b/compiler/testData/loadKotlin/type/String.txt
index ee03f30909b..401efa71c72 100644
--- a/compiler/testData/loadKotlin/type/String.txt
+++ b/compiler/testData/loadKotlin/type/String.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): jet.String
+internal final fun fff() : jet.String
diff --git a/compiler/testData/loadKotlin/type/StringQ.txt b/compiler/testData/loadKotlin/type/StringQ.txt
index e740f960b26..0951cd8f029 100644
--- a/compiler/testData/loadKotlin/type/StringQ.txt
+++ b/compiler/testData/loadKotlin/type/StringQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): jet.String?
+internal final fun fff() : jet.String?
diff --git a/compiler/testData/loadKotlin/type/Tuple0.txt b/compiler/testData/loadKotlin/type/Tuple0.txt
index 9cc0518dd8c..9c22619a353 100644
--- a/compiler/testData/loadKotlin/type/Tuple0.txt
+++ b/compiler/testData/loadKotlin/type/Tuple0.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun tuple0(): jet.Tuple0
+internal final fun tuple0() : Unit
diff --git a/compiler/testData/loadKotlin/type/jlInteger.txt b/compiler/testData/loadKotlin/type/jlInteger.txt
index b33c15036a3..46e7f3550e1 100644
--- a/compiler/testData/loadKotlin/type/jlInteger.txt
+++ b/compiler/testData/loadKotlin/type/jlInteger.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun integer(): java.lang.Integer
+internal final fun integer() : java.lang.Integer
diff --git a/compiler/testData/loadKotlin/type/jlIntegerQ.txt b/compiler/testData/loadKotlin/type/jlIntegerQ.txt
index e5432e982a4..cf0772b1b18 100644
--- a/compiler/testData/loadKotlin/type/jlIntegerQ.txt
+++ b/compiler/testData/loadKotlin/type/jlIntegerQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun integerq(): java.lang.Integer?
+internal final fun integerq() : java.lang.Integer?
diff --git a/compiler/testData/loadKotlin/type/jlNumber.txt b/compiler/testData/loadKotlin/type/jlNumber.txt
index 4ed101484f1..9e5005f150f 100644
--- a/compiler/testData/loadKotlin/type/jlNumber.txt
+++ b/compiler/testData/loadKotlin/type/jlNumber.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun number(): java.lang.Number
+internal final fun number() : java.lang.Number
diff --git a/compiler/testData/loadKotlin/type/jlObject.txt b/compiler/testData/loadKotlin/type/jlObject.txt
index 5d9424ed1f5..d8e342cdf3e 100644
--- a/compiler/testData/loadKotlin/type/jlObject.txt
+++ b/compiler/testData/loadKotlin/type/jlObject.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun obj(): java.lang.Object
+internal final fun obj() : java.lang.Object
diff --git a/compiler/testData/loadKotlin/type/jlObjectQ.txt b/compiler/testData/loadKotlin/type/jlObjectQ.txt
index 4577fe8a5f2..84a2680d9bf 100644
--- a/compiler/testData/loadKotlin/type/jlObjectQ.txt
+++ b/compiler/testData/loadKotlin/type/jlObjectQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun objq(): java.lang.Object?
+internal final fun objq() : java.lang.Object?
diff --git a/compiler/testData/loadKotlin/type/jlString.txt b/compiler/testData/loadKotlin/type/jlString.txt
index c565dc22b44..41eda7accb5 100644
--- a/compiler/testData/loadKotlin/type/jlString.txt
+++ b/compiler/testData/loadKotlin/type/jlString.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): java.lang.String
+internal final fun fff() : java.lang.String
diff --git a/compiler/testData/loadKotlin/type/jlStringQ.txt b/compiler/testData/loadKotlin/type/jlStringQ.txt
index 8c02f0f7307..795e30cfca2 100644
--- a/compiler/testData/loadKotlin/type/jlStringQ.txt
+++ b/compiler/testData/loadKotlin/type/jlStringQ.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final fun fff(): java.lang.String?
+internal final fun fff() : java.lang.String?
diff --git a/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
index 893fc6c1995..00675d710eb 100644
--- a/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
@@ -1,13 +1,14 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal abstract fun f(): jet.Int
-    public abstract var p: jet.Int
-    internal abstract val v: jet.Int
+internal trait A {
+    public abstract var p : jet.Int
+    internal abstract val v : jet.Int
+    internal abstract fun f() : jet.Int
 }
-internal final class test.B : test.A {
-    public final /*primary constructor*/ fun <init>(): test.B
-    internal open override /*1*/ fun f(): jet.Int
-    public open override /*1*/ var p: jet.Int
-    internal open override /*1*/ val v: jet.Int
+
+internal final class B : test.A {
+    /*primary*/ public constructor B()
+    public open override /*1*/ var p : jet.Int
+    internal open override /*1*/ val v : jet.Int
+    internal open override /*1*/ fun f() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalClass.txt b/compiler/testData/loadKotlin/visibility/InternalClass.txt
index 4abddfd0d0b..347caf41f24 100644
--- a/compiler/testData/loadKotlin/visibility/InternalClass.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalClass.txt
@@ -1,5 +1,5 @@
 namespace test
 
-internal final class test.InternalClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.InternalClass
+internal final class InternalClass {
+    /*primary*/ public constructor InternalClass()
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalConstructor.txt b/compiler/testData/loadKotlin/visibility/InternalConstructor.txt
index ac2e0530dee..dc8e51e95fb 100644
--- a/compiler/testData/loadKotlin/visibility/InternalConstructor.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalConstructor.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public final class test.InternalConstructor : jet.Any {
-    internal final /*primary constructor*/ fun <init>(): test.InternalConstructor
+public final class InternalConstructor {
+    /*primary*/ internal constructor InternalConstructor()
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
index 6869bbf0629..e44bc0895e2 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
@@ -1,4 +1,3 @@
 namespace test
-
-internal final val x: jet.Int
-internal final fun f(): jet.Int
+internal final val x : jet.Int
+internal final fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
index 59e7e7662ad..cfc201a695b 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
@@ -1,7 +1,7 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal abstract fun f(): jet.Int
-    public abstract var p: jet.Int internal set
-    internal abstract val v: jet.Int
+internal trait A {
+    public abstract var p : jet.Int
+    internal abstract val v : jet.Int
+    internal abstract fun f() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
index b14c2985e26..e6d8e7a2b85 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
@@ -1,13 +1,14 @@
 namespace test
 
-internal abstract trait test.A : jet.Any {
-    internal open fun f(): jet.Int
-    public open var p: jet.Int internal set
-    internal open val v: jet.Int
+internal trait A {
+    public open var p : jet.Int
+    internal open val v : jet.Int
+    internal open fun f() : jet.Int
 }
-internal final class test.B : test.A {
-    public final /*primary constructor*/ fun <init>(): test.B
-    internal open override /*1*/ /*fake_override*/ fun f(): jet.Int
-    public open override /*1*/ /*fake_override*/ var p: jet.Int internal set
-    internal open override /*1*/ /*fake_override*/ val v: jet.Int
+
+internal final class B : test.A {
+    /*primary*/ public constructor B()
+    public open override /*1*/ /*fake_override*/ var p : jet.Int
+    internal open override /*1*/ /*fake_override*/ val v : jet.Int
+    internal open override /*1*/ /*fake_override*/ fun f() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/visibility/PrivateClass.txt b/compiler/testData/loadKotlin/visibility/PrivateClass.txt
index da19a0b859e..ad5197ae998 100644
--- a/compiler/testData/loadKotlin/visibility/PrivateClass.txt
+++ b/compiler/testData/loadKotlin/visibility/PrivateClass.txt
@@ -1,5 +1,5 @@
 namespace test
 
-private final class test.PrivateClass : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.PrivateClass
+private final class PrivateClass {
+    /*primary*/ public constructor PrivateClass()
 }
diff --git a/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
index c60df74dda2..4e9791cdbcc 100644
--- a/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
+++ b/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
@@ -1,3 +1,2 @@
 namespace test
-
-private final fun topLevelFun(): jet.Int
+private final fun topLevelFun() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
index 32344db4c52..9a1f0a3585b 100644
--- a/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
+++ b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
@@ -1,3 +1,2 @@
 namespace test
-
-private final val topLevelVal: jet.Int
+private final val topLevelVal : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
index decfe36733d..6f20acbf904 100644
--- a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
+++ b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
@@ -1,3 +1,2 @@
 namespace test
-
-internal final var topLevelVar: jet.Int private set
+internal final var topLevelVar : jet.Int
diff --git a/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt b/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt
index 321d198665e..a7ac7148b27 100644
--- a/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt
+++ b/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt
@@ -1,35 +1,40 @@
 namespace test
 
-internal final enum class test.In : jet.Enum<test.In> {
-    private final /*constructor*/ fun <init>(): test.In
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.In.<class-object-for-In> {
-        private final /*constructor*/ fun <init>(): test.In.<class-object-for-In>
-        public final val A: test.In
-        public final fun valueOf(/*0*/ value: jet.String): test.In
-        public final fun values(): jet.Array<test.In>
+internal final enum class In : jet.Enum<test.In> {
+    private constructor In()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-In> {
+        private constructor <class-object-for-In>()
+        public final val A : test.In
+        public final fun valueOf(/*0*/ value : jet.String) : test.In
+        public final fun values() : jet.Array<test.In>
     }
 }
-private final enum class test.Pr : jet.Enum<test.Pr> {
-    private final /*constructor*/ fun <init>(): test.Pr
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    private final class object test.Pr.<class-object-for-Pr> {
-        private final /*constructor*/ fun <init>(): test.Pr.<class-object-for-Pr>
-        public final val A: test.Pr
-        public final fun valueOf(/*0*/ value: jet.String): test.Pr
-        public final fun values(): jet.Array<test.Pr>
+
+private final enum class Pr : jet.Enum<test.Pr> {
+    private constructor Pr()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    private class object <class-object-for-Pr> {
+        private constructor <class-object-for-Pr>()
+        public final val A : test.Pr
+        public final fun valueOf(/*0*/ value : jet.String) : test.Pr
+        public final fun values() : jet.Array<test.Pr>
     }
 }
-public final enum class test.Pu : jet.Enum<test.Pu> {
-    private final /*constructor*/ fun <init>(): test.Pu
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    public final class object test.Pu.<class-object-for-Pu> {
-        private final /*constructor*/ fun <init>(): test.Pu.<class-object-for-Pu>
-        public final val A: test.Pu
-        public final fun valueOf(/*0*/ value: jet.String): test.Pu
-        public final fun values(): jet.Array<test.Pu>
+
+public final enum class Pu : jet.Enum<test.Pu> {
+    private constructor Pu()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    public class object <class-object-for-Pu> {
+        private constructor <class-object-for-Pu>()
+        public final val A : test.Pu
+        public final fun valueOf(/*0*/ value : jet.String) : test.Pu
+        public final fun values() : jet.Array<test.Pu>
     }
 }
diff --git a/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt b/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt
index a55504f305e..0b9b9b17ffb 100644
--- a/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt
+++ b/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt
@@ -1,50 +1,58 @@
 namespace test
 
-internal final enum class test.In : jet.Enum<test.In> {
-    private final /*primary constructor*/ fun <init>(): test.In
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.In.<class-object-for-In> {
-        private final /*constructor*/ fun <init>(): test.In.<class-object-for-In>
-        public final val A: test.In
-        private final enum entry test.In.<class-object-for-In>.A : test.In {
-            private final /*constructor*/ fun <init>(): test.In.<class-object-for-In>.A
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+internal final enum class In : jet.Enum<test.In> {
+    /*primary*/ private constructor In()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-In> {
+        /*primary*/ private constructor <class-object-for-In>()
+        public final val A : test.In
+        public final fun valueOf(/*0*/ value : jet.String) : test.In
+        public final fun values() : jet.Array<test.In>
+        
+        private enum entry A : test.In {
+            /*primary*/ private constructor A()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
         }
-        public final fun valueOf(/*0*/ value: jet.String): test.In
-        public final fun values(): jet.Array<test.In>
     }
 }
-private final enum class test.Pr : jet.Enum<test.Pr> {
-    private final /*primary constructor*/ fun <init>(): test.Pr
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    private final class object test.Pr.<class-object-for-Pr> {
-        private final /*constructor*/ fun <init>(): test.Pr.<class-object-for-Pr>
-        public final val A: test.Pr
-        private final enum entry test.Pr.<class-object-for-Pr>.A : test.Pr {
-            private final /*constructor*/ fun <init>(): test.Pr.<class-object-for-Pr>.A
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+
+private final enum class Pr : jet.Enum<test.Pr> {
+    /*primary*/ private constructor Pr()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    private class object <class-object-for-Pr> {
+        /*primary*/ private constructor <class-object-for-Pr>()
+        public final val A : test.Pr
+        public final fun valueOf(/*0*/ value : jet.String) : test.Pr
+        public final fun values() : jet.Array<test.Pr>
+        
+        private enum entry A : test.Pr {
+            /*primary*/ private constructor A()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
         }
-        public final fun valueOf(/*0*/ value: jet.String): test.Pr
-        public final fun values(): jet.Array<test.Pr>
     }
 }
-public final enum class test.Pu : jet.Enum<test.Pu> {
-    private final /*primary constructor*/ fun <init>(): test.Pu
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    public final class object test.Pu.<class-object-for-Pu> {
-        private final /*constructor*/ fun <init>(): test.Pu.<class-object-for-Pu>
-        public final val A: test.Pu
-        private final enum entry test.Pu.<class-object-for-Pu>.A : test.Pu {
-            private final /*constructor*/ fun <init>(): test.Pu.<class-object-for-Pu>.A
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+
+public final enum class Pu : jet.Enum<test.Pu> {
+    /*primary*/ private constructor Pu()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    public class object <class-object-for-Pu> {
+        /*primary*/ private constructor <class-object-for-Pu>()
+        public final val A : test.Pu
+        public final fun valueOf(/*0*/ value : jet.String) : test.Pu
+        public final fun values() : jet.Array<test.Pu>
+        
+        private enum entry A : test.Pu {
+            /*primary*/ private constructor A()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
         }
-        public final fun valueOf(/*0*/ value: jet.String): test.Pu
-        public final fun values(): jet.Array<test.Pu>
     }
 }
diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
index 562c82fa64e..cb1282fd08e 100644
--- a/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
+++ b/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
@@ -1,18 +1,21 @@
 namespace test
 
-internal final class test.A : jet.Any {
-    public final /*constructor*/ fun <init>(): test.A
-    internal final class object test.A.<class-object-for-A> {
-        private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>
-        internal final enum class test.A.<class-object-for-A>.E : jet.Enum<test.A.<class-object-for-A>.E> {
-            private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            internal final class object test.A.<class-object-for-A>.E.<class-object-for-E> {
-                private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E.<class-object-for-E>
-                public final val ENTRY: test.A.<class-object-for-A>.E
-                public final fun valueOf(/*0*/ value: jet.String): test.A.<class-object-for-A>.E
-                public final fun values(): jet.Array<test.A.<class-object-for-A>.E>
+internal final class A {
+    public constructor A()
+    
+    internal class object <class-object-for-A> {
+        private constructor <class-object-for-A>()
+        
+        internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> {
+            private constructor E()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+            
+            internal class object <class-object-for-E> {
+                private constructor <class-object-for-E>()
+                public final val ENTRY : test.A.<class-object-for-A>.E
+                public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E
+                public final fun values() : jet.Array<test.A.<class-object-for-A>.E>
             }
         }
     }
diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
index 562c82fa64e..cb1282fd08e 100644
--- a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
+++ b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
@@ -1,18 +1,21 @@
 namespace test
 
-internal final class test.A : jet.Any {
-    public final /*constructor*/ fun <init>(): test.A
-    internal final class object test.A.<class-object-for-A> {
-        private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>
-        internal final enum class test.A.<class-object-for-A>.E : jet.Enum<test.A.<class-object-for-A>.E> {
-            private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            internal final class object test.A.<class-object-for-A>.E.<class-object-for-E> {
-                private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E.<class-object-for-E>
-                public final val ENTRY: test.A.<class-object-for-A>.E
-                public final fun valueOf(/*0*/ value: jet.String): test.A.<class-object-for-A>.E
-                public final fun values(): jet.Array<test.A.<class-object-for-A>.E>
+internal final class A {
+    public constructor A()
+    
+    internal class object <class-object-for-A> {
+        private constructor <class-object-for-A>()
+        
+        internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> {
+            private constructor E()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+            
+            internal class object <class-object-for-E> {
+                private constructor <class-object-for-E>()
+                public final val ENTRY : test.A.<class-object-for-A>.E
+                public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E
+                public final fun values() : jet.Array<test.A.<class-object-for-A>.E>
             }
         }
     }
diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt
index 2fb814585fe..566ea181fd5 100644
--- a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt
+++ b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt
@@ -1,23 +1,27 @@
 namespace test
 
-internal final class test.A : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.A
-    internal final class object test.A.<class-object-for-A> : jet.Any {
-        private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>
-        internal final enum class test.A.<class-object-for-A>.E : jet.Enum<test.A.<class-object-for-A>.E> {
-            private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            internal final class object test.A.<class-object-for-A>.E.<class-object-for-E> {
-                private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E.<class-object-for-E>
-                public final val ENTRY: test.A.<class-object-for-A>.E
-                private final enum entry test.A.<class-object-for-A>.E.<class-object-for-E>.ENTRY : test.A.<class-object-for-A>.E {
-                    private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E.<class-object-for-E>.ENTRY
-                    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-                    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+internal final class A {
+    /*primary*/ public constructor A()
+    
+    internal class object <class-object-for-A> {
+        /*primary*/ private constructor <class-object-for-A>()
+        
+        internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> {
+            /*primary*/ private constructor E()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+            
+            internal class object <class-object-for-E> {
+                /*primary*/ private constructor <class-object-for-E>()
+                public final val ENTRY : test.A.<class-object-for-A>.E
+                public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E
+                public final fun values() : jet.Array<test.A.<class-object-for-A>.E>
+                
+                private enum entry ENTRY : test.A.<class-object-for-A>.E {
+                    /*primary*/ private constructor ENTRY()
+                    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+                    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
                 }
-                public final fun valueOf(/*0*/ value: jet.String): test.A.<class-object-for-A>.E
-                public final fun values(): jet.Array<test.A.<class-object-for-A>.E>
             }
         }
     }
diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt
index 647866583bc..fa016e61a03 100644
--- a/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt
+++ b/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt
@@ -1,23 +1,27 @@
 namespace test
 
-internal final class test.A : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.A
-    public final class object test.A.<class-object-for-A> {
-        private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>
-        internal final enum class test.A.<class-object-for-A>.E : jet.Enum<test.A.<class-object-for-A>.E> {
-            private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            internal final class object test.A.<class-object-for-A>.E.<class-object-for-E> {
-                private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E.<class-object-for-E>
-                public final val ENTRY: test.A.<class-object-for-A>.E
-                private final enum entry test.A.<class-object-for-A>.E.<class-object-for-E>.ENTRY : test.A.<class-object-for-A>.E {
-                    private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E.<class-object-for-E>.ENTRY
-                    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-                    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+internal final class A {
+    /*primary*/ public constructor A()
+    
+    public class object <class-object-for-A> {
+        /*primary*/ private constructor <class-object-for-A>()
+        
+        internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> {
+            /*primary*/ private constructor E()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+            
+            internal class object <class-object-for-E> {
+                /*primary*/ private constructor <class-object-for-E>()
+                public final val ENTRY : test.A.<class-object-for-A>.E
+                public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E
+                public final fun values() : jet.Array<test.A.<class-object-for-A>.E>
+                
+                private enum entry ENTRY : test.A.<class-object-for-A>.E {
+                    /*primary*/ private constructor ENTRY()
+                    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+                    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
                 }
-                public final fun valueOf(/*0*/ value: jet.String): test.A.<class-object-for-A>.E
-                public final fun values(): jet.Array<test.A.<class-object-for-A>.E>
             }
         }
     }
diff --git a/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt b/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt
index 08e3457b5ed..4e69e782267 100644
--- a/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt
+++ b/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt
@@ -1,13 +1,14 @@
 namespace test
 
-internal final enum class test.MyEnum : jet.Enum<test.MyEnum> {
-    private final /*constructor*/ fun <init>(): test.MyEnum
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.MyEnum.<class-object-for-MyEnum> {
-        private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>
-        public final val ENTRY: test.MyEnum
-        public final fun valueOf(/*0*/ value: jet.String): test.MyEnum
-        public final fun values(): jet.Array<test.MyEnum>
+internal final enum class MyEnum : jet.Enum<test.MyEnum> {
+    private constructor MyEnum()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-MyEnum> {
+        private constructor <class-object-for-MyEnum>()
+        public final val ENTRY : test.MyEnum
+        public final fun valueOf(/*0*/ value : jet.String) : test.MyEnum
+        public final fun values() : jet.Array<test.MyEnum>
     }
 }
diff --git a/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt b/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt
index a85a76bb74c..d1b9c4fec5d 100644
--- a/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt
+++ b/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt
@@ -1,18 +1,20 @@
 namespace test
 
-internal final enum class test.MyEnum : jet.Enum<test.MyEnum> {
-    private final /*primary constructor*/ fun <init>(): test.MyEnum
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-    internal final class object test.MyEnum.<class-object-for-MyEnum> {
-        private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>
-        public final val ENTRY: test.MyEnum
-        private final enum entry test.MyEnum.<class-object-for-MyEnum>.ENTRY : test.MyEnum {
-            private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>.ENTRY
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+internal final enum class MyEnum : jet.Enum<test.MyEnum> {
+    /*primary*/ private constructor MyEnum()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    internal class object <class-object-for-MyEnum> {
+        /*primary*/ private constructor <class-object-for-MyEnum>()
+        public final val ENTRY : test.MyEnum
+        public final fun valueOf(/*0*/ value : jet.String) : test.MyEnum
+        public final fun values() : jet.Array<test.MyEnum>
+        
+        private enum entry ENTRY : test.MyEnum {
+            /*primary*/ private constructor ENTRY()
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
+            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
         }
-        public final fun valueOf(/*0*/ value: jet.String): test.MyEnum
-        public final fun values(): jet.Array<test.MyEnum>
     }
 }