diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java
index be7db2e355b5..fe2a7dac4680 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public class JavacOutputParser extends OutputParser {
         final String filePath = part1.replace(File.separatorChar, '/');
         final Boolean fileExists = ApplicationManager.getApplication().runReadAction(new Computable<Boolean>(){
           public Boolean compute(){
-            return LocalFileSystem.getInstance().findFileByPath(filePath) != null? Boolean.TRUE : Boolean.FALSE;
+            return LocalFileSystem.getInstance().findFileByPath(filePath) != null;
           }
         });
         if (!fileExists.booleanValue()) {
@@ -236,7 +236,7 @@ public class JavacOutputParser extends OutputParser {
         protected void doExecute(final String line, @Nullable final String filePath, final Callback callback) {
           final boolean fileExists = filePath != null && ApplicationManager.getApplication().runReadAction(new Computable<Boolean>(){
             public Boolean compute(){
-              return LocalFileSystem.getInstance().findFileByPath(filePath) != null? Boolean.TRUE : Boolean.FALSE;
+              return LocalFileSystem.getInstance().findFileByPath(filePath) != null;
             }
           });
           if (fileExists) {
diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
index b93057fd060b..d79de6646780 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public class ChangeContextUtil {
         }
       }
       else if (canChangeQualifier) {
-        refExpr.putCopyableUserData(CAN_REMOVE_QUALIFIER_KEY, canRemoveQualifier(refExpr) ? Boolean.TRUE : Boolean.FALSE);
+        refExpr.putCopyableUserData(CAN_REMOVE_QUALIFIER_KEY, canRemoveQualifier(refExpr));
       }
     }
     else if (includeRefClasses) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
index 3e0d504fddd2..ae3945df4133 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,8 +212,7 @@ class UpdateFoldRegionsOperation implements Runnable {
       }
       else if (region.isValid() && info.isLightRegion(region)) {
         boolean isExpanded = region.isExpanded();
-        rangeToExpandStatusMap.put(TextRange.create(region),
-                                   isExpanded ? Boolean.TRUE : Boolean.FALSE);
+        rangeToExpandStatusMap.put(TextRange.create(region), isExpanded);
       }
       else {
         toRemove.add(region);