diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
index cf88751ff06..ff15215d025 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
@@ -39,8 +39,9 @@ object ConversionsRunner {
             +AssignmentStatementSimplifyValConversion()
             +AssignmentStatementSimplifyAlsoConversion()
             +AssignmentStatementSplitAlsoConversion()
-            +PolyadicExpressionConversion(context)
+            +PolyadicExpressionConversion()
             +OperatorExpressionConversion(context)
+            +AddParenthesisForLineBreaksInBinaryExpression()
             +ThrowStatementConversion()
             +ArrayInitializerConversion(context)
             +TryStatementConversion(context)
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
index 15cae2d2e82..e500ddaf25c 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
@@ -55,7 +55,7 @@ class NewCodeBuilder {
         private fun List<JKNonCodeElement>.createText(): String {
             val text = joinToString("") { token -> token.createText() }
             val needNewLine = text.lastIndexOf('\n') < text.lastIndexOf("//")
-            return text +"\n".takeIf { needNewLine }.orEmpty()
+            return text + "\n".takeIf { needNewLine }.orEmpty()
         }
 
         private fun JKNonCodeElementsListOwner.needPreserveSpacesAfterLastCommit() =