diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt
index f6be19b4189..8c1527fd8a0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt
@@ -43,9 +43,9 @@ class InitControlFlowInfo(map: MutableMap<VariableDescriptor, VariableControlFlo
     // merge = input of MergeInstruction
     // returns true if definite initialization in when happens here
     fun checkDefiniteInitializationInWhen(merge: InitControlFlowInfo): Boolean {
-        for (entry in entries) {
-            if (entry.value.initState == InitState.INITIALIZED_EXHAUSTIVELY &&
-                merge[entry.key]?.initState == InitState.INITIALIZED) {
+        for ((key, value) in entries) {
+            if (value.initState == InitState.INITIALIZED_EXHAUSTIVELY &&
+                merge[key]?.initState == InitState.INITIALIZED) {
                 return true
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt
index 73dd58b8f1e..15b8ac72035 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt
@@ -109,10 +109,9 @@ class PseudocodeVariablesData(val pseudocode: Pseudocode, private val bindingCon
         if (instruction is MagicInstruction) {
             if (instruction.kind === MagicKind.EXHAUSTIVE_WHEN_ELSE) {
                 val exitInstructionData = enterInstructionData.copy()
-                for (entry in enterInstructionData.entries) {
-                    if (!entry.value.definitelyInitialized()) {
-                        exitInstructionData.put(entry.key,
-                                                VariableControlFlowState.createInitializedExhaustively(entry.value.isDeclared))
+                for ((key, value) in enterInstructionData) {
+                    if (!value.definitelyInitialized()) {
+                        exitInstructionData.put(key, VariableControlFlowState.createInitializedExhaustively(value.isDeclared))
                     }
                 }
                 return exitInstructionData
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
index 56810f07d88..fecb36fa1ef 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
@@ -361,9 +361,9 @@ class ClassTranslator private constructor(
     }
 
     private fun generateBridgesToTraitImpl(properties: MutableList<JsPropertyInitializer>) {
-        for (entry in CodegenUtil.getNonPrivateTraitMethods(descriptor).entries) {
-            if (!areNamesEqual(entry.key, entry.value)) {
-                properties += generateDelegateCall(entry.value, entry.key, JsLiteral.THIS, context())
+        for ((key, value) in CodegenUtil.getNonPrivateTraitMethods(descriptor)) {
+            if (!areNamesEqual(key, value)) {
+                properties += generateDelegateCall(value, key, JsLiteral.THIS, context())
             }
         }
     }