diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
index 5ce0ff2606d..3ba2e89023f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
@@ -492,7 +492,7 @@ public class PositioningStrategies {
             if (valueParameterList != null) {
                 return markElement(valueParameterList);
             }
-            return markNode(functionLiteral.getOpenBraceNode());
+            return markNode(functionLiteral.getLBrace().getNode());
         }
     };
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java
index b05cde87fb6..48c83dfdea7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteral.java
@@ -53,14 +53,14 @@ public class JetFunctionLiteral extends JetFunctionNotStubbed {
     }
 
     @NotNull
-    public ASTNode getOpenBraceNode() {
-        return getNode().findChildByType(JetTokens.LBRACE);
+    public PsiElement getLBrace() {
+        return findChildByType(JetTokens.LBRACE);
     }
 
     @Nullable
     @IfNotParsed
-    public ASTNode getClosingBraceNode() {
-        return getNode().findChildByType(JetTokens.RBRACE);
+    public PsiElement getRBrace() {
+        return findChildByType(JetTokens.RBRACE);
     }
 
     @Nullable
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java
index a23ef0ffacc..0fa1fd98952 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java
@@ -54,10 +54,10 @@ class SoftKeywordsHighlightingVisitor extends HighlightingVisitor {
     public void visitFunctionLiteralExpression(@NotNull JetFunctionLiteralExpression expression) {
         if (ApplicationManager.getApplication().isUnitTestMode()) return;
         JetFunctionLiteral functionLiteral = expression.getFunctionLiteral();
-        holder.createInfoAnnotation(functionLiteral.getOpenBraceNode(), null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
-        ASTNode closingBraceNode = functionLiteral.getClosingBraceNode();
-        if (closingBraceNode != null) {
-            holder.createInfoAnnotation(closingBraceNode, null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
+        holder.createInfoAnnotation(functionLiteral.getLBrace(), null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
+        PsiElement closingBrace = functionLiteral.getRBrace();
+        if (closingBrace != null) {
+            holder.createInfoAnnotation(closingBrace, null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
         }
         ASTNode arrowNode = functionLiteral.getArrowNode();
         if (arrowNode != null) {
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt
index 228245f0336..9587c921f67 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt
@@ -252,7 +252,7 @@ public class KotlinCompletionContributor : CompletionContributor() {
         }
         if (prev?.getNode()?.getElementType() != JetTokens.LBRACE) return false
         val functionLiteral = prev!!.getParent() as? JetFunctionLiteral ?: return false
-        return functionLiteral.getOpenBraceNode().getPsi() == prev
+        return functionLiteral.getLBrace() == prev
     }
 
     private fun isAtEndOfLine(offset: Int, document: Document): Boolean {
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt
index c567e0c5569..6fc491f8230 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt
@@ -70,7 +70,7 @@ public class MakeTypeExplicitInLambdaIntention : JetSelfTargetingIntention<JetFu
             oldParameterList.replace(newParameterList)
         }
         else {
-            val openBraceElement = functionLiteral.getOpenBraceNode().getPsi()
+            val openBraceElement = functionLiteral.getLBrace()
             val nextSibling = openBraceElement?.getNextSibling()
             val addNewline = nextSibling is PsiWhiteSpace && nextSibling.getText()?.contains("\n") ?: false
             val (whitespace, arrow) = psiFactory.createWhitespaceAndArrow()
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt
index f6878546a65..7fdcd2cbc54 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt
@@ -53,7 +53,7 @@ public class MakeTypeImplicitInLambdaIntention : JetSelfTargetingIntention<JetFu
         }
 
         if (hasExplicitReceiverType(element)) {
-            val childAfterBrace = functionLiteral.getOpenBraceNode().getPsi()?.getNextSibling()
+            val childAfterBrace = functionLiteral.getLBrace()?.getNextSibling()
             val childBeforeParamList = oldParameterList?.getPrevSibling()
             functionLiteral.deleteChildRange(childAfterBrace, childBeforeParamList)
         }
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
index 27879050e42..31dd2e3db73 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
@@ -46,7 +46,7 @@ public class ReplaceItWithExplicitFunctionLiteralParamIntention() : PsiElementBa
         val newExpr = JetPsiFactory(simpleNameExpression).createExpression("{ it -> 42 }") as JetFunctionLiteralExpression
         funcExpr.addRangeAfter(newExpr.getFunctionLiteral().getValueParameterList(),
                                newExpr.getFunctionLiteral().getArrowNode()!!.getPsi(),
-                               funcExpr.getOpenBraceNode().getPsi())
+                               funcExpr.getLBrace())
         PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument())
 
         val paramToRename = funcExpr.getValueParameters().first()
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
index c97d2081114..5c3cc43c9c9 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
@@ -64,7 +64,6 @@ import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 import org.jetbrains.jet.plugin.project.ResolveSessionForBodies;
 import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
-import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import java.util.List;
 import java.util.Map;
@@ -282,7 +281,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
                 currentParameterList.replace(newParameterList);
             }
             else {
-                PsiElement openBraceElement = functionLiteral.getOpenBraceNode().getPsi();
+                PsiElement openBraceElement = functionLiteral.getLBrace();
 
                 PsiElement nextSibling = openBraceElement.getNextSibling();
                 PsiElement whitespaceToAdd = nextSibling instanceof PsiWhiteSpace && nextSibling.getText().contains("\n")