diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
index d316052d7dc9..13c1ce63e380 100644
--- a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
@@ -133,7 +133,7 @@ public class BuildArtifactAction extends DumbAwareAction {
     for (ArtifactPopupItem item : items) {
       artifacts.addAll(item.getArtifacts(project));
     }
-    return ContainerUtil.toArray(artifacts, new Artifact[artifacts.size()]);
+    return artifacts.toArray(new Artifact[0]);
   }
 
   private static class BuildArtifactItem extends ArtifactActionItem {
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
index fae631e6dfb6..4bcf1980f8b6 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
@@ -18,7 +18,6 @@ import com.intellij.ui.RowIcon;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.PlatformIcons;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -65,7 +64,7 @@ public abstract class PsiPackageBase extends PsiElementBase implements PsiDirect
   @NotNull
   public PsiDirectory[] getDirectories() {
     final Collection<PsiDirectory> collection = getAllDirectories();
-    return ContainerUtil.toArray(collection, new PsiDirectory[collection.size()]);
+    return collection.toArray(PsiDirectory.EMPTY_ARRAY);
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
index d6d9f3be49f7..2f4fcbfe0180 100644
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
@@ -34,9 +34,9 @@ import com.intellij.ui.stripe.TreeUpdater;
 import com.intellij.ui.tree.AsyncTreeModel;
 import com.intellij.ui.tree.RestoreSelectionListener;
 import com.intellij.ui.tree.TreeVisitor;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.EditSourceOnDoubleClickHandler;
 import com.intellij.util.OpenSourceUtil;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.accessibility.ScreenReader;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NonNls;
@@ -288,7 +288,7 @@ public final class ScopeViewPane extends AbstractProjectViewPane {
   public String[] getSubIds() {
     LinkedHashMap<String, NamedScopeFilter> map = myFilters;
     if (map == null || map.isEmpty()) return EMPTY_STRING_ARRAY;
-    return ContainerUtil.toArray(map.keySet(), EMPTY_STRING_ARRAY);
+    return ArrayUtil.toStringArray(map.keySet());
   }
 
   @NotNull
diff --git a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java
index 4ecbdad57ab6..8a68315e6950 100644
--- a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java
+++ b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java
@@ -27,7 +27,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.refactoring.rename.PsiElementRenameHandler;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -73,7 +72,7 @@ public final class AntRenameHandler extends PsiElementRenameHandler {
         return null;
       }
       final Collection<PsiElement> candidates = TargetElementUtil.getInstance().getTargetCandidates(reference);
-      return ContainerUtil.toArray(candidates, new PsiElement[candidates.size()]);
+      return candidates.toArray(PsiElement.EMPTY_ARRAY);
     }
     catch (IndexNotReadyException e) {
       return null;
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrResolverProcessor.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrResolverProcessor.kt
index 051a0571b5b0..8c9b3ffd8241 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrResolverProcessor.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrResolverProcessor.kt
@@ -2,12 +2,11 @@
 package org.jetbrains.plugins.groovy.lang.resolve
 
 import com.intellij.psi.scope.PsiScopeProcessor
-import com.intellij.util.containers.ContainerUtil.toArray
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult
 
 interface GrResolverProcessor<out T : GroovyResolveResult> : PsiScopeProcessor {
 
   val results: List<T>
 
-  val resultsArray: Array<GroovyResolveResult> get() = toArray(results, GroovyResolveResult.EMPTY_ARRAY)
+  val resultsArray: Array<GroovyResolveResult> get() = if (results.isEmpty()) GroovyResolveResult.EMPTY_ARRAY else results.toTypedArray()
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyClassFinder.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyClassFinder.kt
index 1ea7ae3a8c04..39bb19fc0917 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyClassFinder.kt
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyClassFinder.kt
@@ -8,7 +8,6 @@ import com.intellij.psi.NonClasspathClassFinder
 import com.intellij.psi.PsiPackage
 import com.intellij.psi.impl.file.PsiPackageImpl
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.plugins.groovy.GroovyFileType
 
 class BundledGroovyClassFinder(project: Project) : NonClasspathClassFinder(project, GroovyFileType.DEFAULT_EXTENSION) {
@@ -26,6 +25,6 @@ class BundledGroovyClassFinder(project: Project) : NonClasspathClassFinder(proje
       val subPackageFqn = getQualifiedName(pkgName, name)
       PsiPackageImpl(psiManager, subPackageFqn)
     }
-    return ContainerUtil.toArray(packages, PsiPackage.EMPTY_ARRAY)
+    return if (packages.isEmpty()) PsiPackage.EMPTY_ARRAY else packages.toTypedArray()
   }
 }