diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
index d6436ddecc9..573d33af5b6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
@@ -265,8 +265,7 @@ public class TypeResolver(
     }
 
     private fun resolveTypeProjections(c: TypeResolutionContext, constructor: TypeConstructor, argumentElements: List<JetTypeProjection>): List<TypeProjection> {
-        return argumentElements.withIndices().map {
-            val (i, argumentElement) = it
+        return argumentElements.mapIndexed { i, argumentElement ->
 
             val projectionKind = argumentElement.getProjectionKind()
             ModifiersChecker.checkIncompatibleVarianceModifiers(argumentElement.getModifierList(), c.trace)
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index 40e7744fd9f..7a92b70da47 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -172,7 +172,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
     private fun valueParameters(callable: Callable, kind: AnnotatedCallableKind): List<ValueParameterDescriptor> {
         val containerOfCallable = c.containingDeclaration.getContainingDeclaration().asProtoContainer()
 
-        return callable.getValueParameterList().withIndices().map { val (i, proto) = it
+        return callable.getValueParameterList().mapIndexed { i, proto ->
             ValueParameterDescriptorImpl(
                     c.containingDeclaration, null, i,
                     getParameterAnnotations(containerOfCallable, callable, kind, proto),
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
index d307cc69019..cb1170453ae 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
@@ -41,7 +41,7 @@ public class TypeDeserializer(
         }
         else {
             val result = LinkedHashMap<Int, TypeParameterDescriptor>()
-            for ((index, proto) in typeParameterProtos.withIndices()) {
+            for ((index, proto) in typeParameterProtos.withIndex()) {
                 result[proto.getId()] = DeserializedTypeParameterDescriptor(c, proto, index)
             }
             result
diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/eval4j/test/org/jetbrains/eval4j/test/main.kt
index d86c77adecd..6b4b30a414b 100644
--- a/eval4j/test/org/jetbrains/eval4j/test/main.kt
+++ b/eval4j/test/org/jetbrains/eval4j/test/main.kt
@@ -352,7 +352,7 @@ fun Class<Any>.findConstructor(methodDesc: MethodDescription): Constructor<Any?>
 fun MethodDescription.matches(ctor: Constructor<*>): Boolean {
     val methodParams = ctor.getParameterTypes()!!
     if (parameterTypes.size() != methodParams.size()) return false
-    for ((i, p) in parameterTypes.withIndices()) {
+    for ((i, p) in parameterTypes.withIndex()) {
         if (!p.matches(methodParams[i])) return false
     }
 
@@ -364,7 +364,7 @@ fun MethodDescription.matches(method: Method): Boolean {
 
     val methodParams = method.getParameterTypes()!!
     if (parameterTypes.size() != methodParams.size()) return false
-    for ((i, p) in parameterTypes.withIndices()) {
+    for ((i, p) in parameterTypes.withIndex()) {
         if (!p.matches(methodParams[i])) return false
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt
index 178478fe8a7..e3bdcd4a59a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt
@@ -30,7 +30,7 @@ public object JetPsiPrecedences {
     private val precedence: Map<IElementType, Int>
     init {
         val builder = HashMap<IElementType, Int>()
-        for ((i, record) in JetExpressionParsing.Precedence.values().withIndices()) {
+        for ((i, record) in JetExpressionParsing.Precedence.values().withIndex()) {
             for (elementType in record.getOperations().getTypes()) {
                 builder[elementType] = i
             }