diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
index acfaea999..f36d23e9f 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
@@ -162,7 +162,7 @@ abstract class DartPubActionBase : AnAction(), DumbAware {
     private var myProcessHandler: OSProcessHandler? = null
 
     init {
-      registerCustomShortcutSet(CommonShortcuts.getRerun(), info.console.getComponent())
+      registerCustomShortcutSet(CommonShortcuts.getRerun(), info.console.component)
     }
 
     fun setProcessHandler(processHandler: OSProcessHandler) {
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java
index a4ab21e42..094fc50d9 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java
@@ -4,6 +4,8 @@
 import com.jetbrains.lang.dart.DartComponentType;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
+
 public class DartComponentInfo {
   private final @Nullable DartComponentType myComponentType;
   private final @Nullable String myLibraryName;
@@ -29,7 +31,7 @@ public boolean equals(Object o) {
     DartComponentInfo info = (DartComponentInfo)o;
 
     if (myComponentType != info.myComponentType) return false;
-    if (myLibraryName != null ? !myLibraryName.equals(info.myLibraryName) : info.myLibraryName != null) return false;
+    if (!Objects.equals(myLibraryName, info.myLibraryName)) return false;
 
     return true;
   }
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java
index d73fb4123..14e201360 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java
@@ -4,6 +4,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
 import java.util.Set;
 
 public class DartImportOrExportInfo implements DartShowHideInfo {
@@ -58,7 +59,7 @@ public boolean equals(Object o) {
 
     if (myKind != info.myKind) return false;
     if (!myUri.equals(info.myUri)) return false;
-    if (myImportPrefix != null ? !myImportPrefix.equals(info.myImportPrefix) : info.myImportPrefix != null) return false;
+    if (!Objects.equals(myImportPrefix, info.myImportPrefix)) return false;
     if (!myShowComponents.equals(info.myShowComponents)) return false;
     if (!myHideComponents.equals(info.myHideComponents)) return false;
 
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartClassNameMethodNameMacro.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartClassNameMethodNameMacro.java
index 4b4d876b4..2fabcd3de 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartClassNameMethodNameMacro.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartClassNameMethodNameMacro.java
@@ -18,7 +18,7 @@ public Result calculateResult(Expression @NotNull [] params, final ExpressionCon
     final Result methodNameResult = (new DartMethodNameMacro()).calculateResult(params, context);
 
     if (classNameResult != null && methodNameResult != null) {
-      return new TextResult(classNameResult.toString() + "." + methodNameResult.toString());
+      return new TextResult(classNameResult + "." + methodNameResult);
     }
     else if (classNameResult == null && methodNameResult != null) {
       return new TextResult(methodNameResult.toString());
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPresentableUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPresentableUtil.java
index 9d47efa9a..02020d035 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPresentableUtil.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPresentableUtil.java
@@ -140,7 +140,7 @@ else if (simpleFormalParameter != null) {
         }
         else {
           if (displayFinalKeyword && simpleFormalParameter.isFinal()) {
-            result.append(DartTokenTypes.FINAL.toString());
+            result.append(DartTokenTypes.FINAL);
             result.append(SPACE);
           }
           final DartType type = simpleFormalParameter.getType();
@@ -153,7 +153,7 @@ else if (simpleFormalParameter != null) {
       }
       else {
         if (displayFinalKeyword && simpleFormalParameter.isFinal()) {
-          result.append(DartTokenTypes.FINAL.toString());
+          result.append(DartTokenTypes.FINAL);
           result.append(SPACE);
         }
         final DartType type = simpleFormalParameter.getType();
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java
index e66a4b920..0cf4e6b6e 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java
@@ -106,7 +106,7 @@ else if (quotedDartString.startsWith(R_QUOTE)) {
     }
 
     final DartUriElement uriElement = partOfStatement.getUriElement();
-    assert uriElement != null : "[" + partOfStatement.toString() + "]";
+    assert uriElement != null : "[" + partOfStatement + "]";
 
     final String uri = uriElement.getUriStringAndItsRange().first;
     final VirtualFile file = DartResolveUtil.getRealVirtualFile(partOfStatement.getContainingFile());
@@ -121,7 +121,7 @@ else if (quotedDartString.startsWith(R_QUOTE)) {
     }
 
     final DartUriElement uriElement = partOfStatement.getUriElement();
-    assert uriElement != null : "[" + partOfStatement.toString() + "]";
+    assert uriElement != null : "[" + partOfStatement + "]";
 
     final String uri = uriElement.getUriStringAndItsRange().first;
     final VirtualFile file = DartResolveUtil.getRealVirtualFile(partOfStatement.getContainingFile());