diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
index d61f890daa1..741b179173c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
@@ -272,6 +272,16 @@ public class BuilderByPattern<TElement> {
         return this
     }
 
+    public fun appendExpressions(expressions: Iterable<KtExpression?>, separator: String = ","): BuilderByPattern<TElement> {
+        for ((index, expression) in expressions.withIndex()) {
+            if (index > 0) {
+                appendFixedText(separator)
+            }
+            appendExpression(expression)
+        }
+        return this
+    }
+
     public fun appendTypeReference(typeRef: KtTypeReference?): BuilderByPattern<TElement> {
         if (typeRef != null) {
             patternBuilder.append("$" + arguments.size())
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
index 4be59ffd54c..f7c1733a9fd 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
@@ -167,26 +167,30 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpressio
         }
 
         private fun convertArrayAccess(element: KtArrayAccessExpression): KtExpression {
-            val parent = element.getParent()
-            val array = element.getArrayExpression()!!.getText()
-            val indices = element.getIndicesNode()
-            val indicesText = indices.getText()?.removeSurrounding("[","]") ?: throw AssertionError("Indices node of ArrayExpression shouldn't be null: JetArrayAccessExpression = ${element.getText()}")
+            var expressionToReplace: KtExpression = element
+            val transformed = KtPsiFactory(element).buildExpression {
+                appendExpression(element.arrayExpression)
 
-            val transformation : String
-            val replaced : KtElement
-            if (parent is KtBinaryExpression && parent.getOperationReference().getReferencedNameElementType() == KtTokens.EQ && element == parent.left) {
-                // part of an assignment
-                val right = parent.getRight()!!.getText()
-                transformation = "$array.set($indicesText, $right)"
-                replaced = parent
-            }
-            else {
-                transformation = "$array.get($indicesText)"
-                replaced = element
+                appendFixedText(".")
+
+                val parent = element.parent
+                if (parent is KtBinaryExpression && parent.operationReference.getReferencedNameElementType() == KtTokens.EQ && element == parent.left) {
+                    expressionToReplace = parent
+
+                    appendFixedText("set(")
+                    appendExpressions(element.indexExpressions)
+                    appendFixedText(",")
+                    appendExpression(parent.right)
+                }
+                else {
+                    appendFixedText("get(")
+                    appendExpressions(element.indexExpressions)
+                }
+
+                appendFixedText(")")
             }
 
-            val transformed = KtPsiFactory(element).createExpression(transformation)
-            return replaced.replace(transformed) as KtExpression
+            return expressionToReplace.replace(transformed) as KtExpression
         }
 
         private fun convertCall(element: KtCallExpression): KtExpression {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
index 7194f7fff69..d177513e0b8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
@@ -17,10 +17,8 @@
 package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.openapi.editor.Editor
-import com.intellij.psi.impl.source.tree.PsiErrorElementImpl
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.utils.addIfNotNull
 import java.util.*
 
 public class ConvertNegatedExpressionWithDemorgansLawIntention : JetSelfTargetingOffsetIndependentIntention<KtPrefixExpression>(javaClass(), "DeMorgan Law") {
@@ -54,12 +52,7 @@ public class ConvertNegatedExpressionWithDemorgansLawIntention : JetSelfTargetin
         val operands = splitBooleanSequence(baseExpression)!!.asReversed()
 
         val newExpression = KtPsiFactory(element).buildExpression {
-            for ((i, operand) in operands.withIndex()) {
-                if (i > 0) {
-                    appendFixedText(operatorText)
-                }
-                appendExpression(operand.negate())
-            }
+            appendExpressions(operands.map { it.negate() }, separator = operatorText)
         }
 
         element.replace(newExpression)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt
index dbb6b1f2bc1..075fab32c71 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt
@@ -46,10 +46,7 @@ public class EliminateWhenSubjectIntention : JetSelfTargetingIntention<KtWhenExp
                     appendFixedText("else")
                 }
                 else {
-                    for ((i, condition) in entry.getConditions().withIndex()) {
-                        if (i > 0) appendFixedText(",")
-                        appendExpression(condition.toExpression(subject))
-                    }
+                    appendExpressions(entry.conditions.map { it.toExpression(subject) })
                 }
                 appendFixedText("->")
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt
index 5a17098d6f0..63d661a3a97 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.intentions.branchedTransformations.getSubjectTo
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceSubject
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
-import java.util.ArrayList
+import java.util.*
 
 public class IfToWhenIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' with 'when'") {
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
@@ -43,10 +43,8 @@ public class IfToWhenIntention : JetSelfTargetingRangeIntention<KtIfExpression>(
                     orBranches.addOrBranches(condition)
                 }
 
-                for ((i, expr) in orBranches.withIndex()) {
-                    if (i > 0) appendFixedText(",")
-                    appendExpression(expr)
-                }
+                appendExpressions(orBranches)
+
                 appendFixedText("->")
 
                 val thenBranch = ifExpression.getThen()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt
index b6ed8fbede6..6fd84d31c9d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt
@@ -68,10 +68,7 @@ public class WhenToIfIntention : JetSelfTargetingRangeIntention<KtWhenExpression
 
             else -> {
                 return buildExpression {
-                    for ((i, condition) in conditions.withIndex()) {
-                        if (i > 0) appendFixedText("||")
-                        appendExpression(condition.toExpression(subject))
-                    }
+                    appendExpressions(conditions.map { it.toExpression(subject) }, separator = "||")
                 }
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
index 83cd5e44262..9b8fbfceca3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
@@ -102,12 +102,7 @@ class ReplaceGetOrSetIntention : JetSelfTargetingRangeIntention<KtDotQualifiedEx
             appendFixedText("[")
 
             val arguments = if (isSet) allArguments.dropLast(1) else allArguments
-            for ((index, argument) in arguments.withIndex()) {
-                if (index > 0) {
-                    appendFixedText(",")
-                }
-                appendExpression(argument.getArgumentExpression())
-            }
+            appendExpressions(arguments.map { it.getArgumentExpression() })
 
             appendFixedText("]")