diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
index 04b8eb99a64..da985950d5e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
@@ -41,13 +41,13 @@ public data class AllSubtypes(val upperBound: JetType): TypePredicate {
 public data class ForAllTypes(val typeSets: List<TypePredicate>): TypePredicate {
     override fun invoke(typeToCheck: JetType): Boolean = typeSets.all { it(typeToCheck) }
 
-    override fun toString(): String = "AND{${typeSets.makeString(", ")}}"
+    override fun toString(): String = "AND{${typeSets.joinToString(", ")}}"
 }
 
 public data class ForSomeType(val typeSets: List<TypePredicate>): TypePredicate {
     override fun invoke(typeToCheck: JetType): Boolean = typeSets.any { it(typeToCheck) }
 
-    override fun toString(): String = "OR{${typeSets.makeString(", ")}}"
+    override fun toString(): String = "OR{${typeSets.joinToString(", ")}}"
 }
 
 public object AllTypes : TypePredicate {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt
index c55a1a934dc..750faa6131d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt
@@ -68,7 +68,7 @@ public class ReadValueInstruction private (
     }
 
     override fun toString(): String {
-        val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().makeString()}"
+        val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().joinToString()}"
         return "r(${render(element)}$inVal) -> $outputValue"
     }
 
@@ -113,7 +113,7 @@ public class WriteValueInstruction(
 
     override fun toString(): String {
         val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue)
-        return "w($lhs|${inputValues.makeString(", ")})"
+        return "w($lhs|${inputValues.joinToString(", ")})"
     }
 
     override fun createCopy(): InstructionImpl =
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
index a53a8dad35b..b77374e9eb4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
@@ -40,7 +40,7 @@ public abstract class OperationInstruction protected(
 
     protected fun renderInstruction(name: String, desc: String): String =
             "$name($desc" +
-            (if (inputValues.notEmpty) "|${inputValues.makeString(", ")})" else ")") +
+            (if (inputValues.notEmpty) "|${inputValues.joinToString(", ")})" else ")") +
             (if (resultValue != null) " -> $resultValue" else "")
 
     protected fun setResult(value: PseudoValue?): OperationInstruction {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
index 0166c5b463a..6d66d843bd7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
@@ -72,7 +72,7 @@ public class NondeterministicJumpInstruction(
 
     override fun toString(): String {
         val inVal = if (inputValue != null) "|$inputValue" else ""
-        val labels = targetLabels.map { it.getName() }.makeString(", ")
+        val labels = targetLabels.map { it.getName() }.joinToString(", ")
         return "jmp?($labels$inVal)"
     }