diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
index 2ff98ad1c7f..19e785cbf61 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
@@ -90,7 +90,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
     }
 
     @Override
-    protected void reorderArgumentsIfNeeded(@NotNull List actualArgsWithDeclIndex) {
+    protected void reorderArgumentsIfNeeded(@NotNull List<ArgumentAndDeclIndex> actualArgsWithDeclIndex) {
         callGenerator.reorderArgumentsIfNeeded(actualArgsWithDeclIndex, valueParameterTypes);
     }
 }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 0fcd27360ac..ea663600cb1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -1559,7 +1559,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         }
 
         @Override
-        protected void reorderArgumentsIfNeeded(@NotNull List args) {
+        protected void reorderArgumentsIfNeeded(@NotNull List<ArgumentAndDeclIndex> args) {
 
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
index 23747d17ce8..66afead1e32 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
@@ -778,7 +778,7 @@ public class InlineCodegen extends CallGenerator {
 
     @Override
     public void reorderArgumentsIfNeeded(
-            @NotNull List actualArgsWithDeclIndex, @NotNull List valueParameterTypes
+            @NotNull List<ArgumentAndDeclIndex> actualArgsWithDeclIndex, @NotNull List<? extends Type> valueParameterTypes
     ) {
 
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java
index 09da5a3e1dc..431dee923fa 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java
@@ -157,7 +157,7 @@ public class TabledDescriptorRenderer {
 
     @NotNull
     public Renderer<KotlinType> getTypeRenderer() {
-        return (Renderer<KotlinType>) Renderers.RENDER_TYPE;
+        return Renderers.RENDER_TYPE;
     }
 
     protected void renderText(TextRenderer textRenderer, StringBuilder result) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
index a3c550ffbab..7d5f4ce9a75 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
@@ -160,8 +160,8 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
 
             @NotNull
             @Override
-            public Collection getSubPackagesOf(
-                    @NotNull FqName fqName, @NotNull Function1 nameFilter
+            public Collection<FqName> getSubPackagesOf(
+                    @NotNull FqName fqName, @NotNull Function1<? super Name, Boolean> nameFilter
             ) {
                 LazyPackageDescriptor packageDescriptor = getPackageFragment(fqName);
                 if (packageDescriptor == null) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
index 149355f4532..ee8a6730d06 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
@@ -262,9 +262,9 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
 
         @NotNull
         @Override
-        public Collection getContributedDescriptors(
+        public Collection<DeclarationDescriptor> getContributedDescriptors(
                 @NotNull DescriptorKindFilter kindFilter,
-                @NotNull Function1 nameFilter
+                @NotNull Function1<? super Name, Boolean> nameFilter
         ) {
             return allDescriptors.invoke();
         }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
index 949228f7104..30e822775a5 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
@@ -77,8 +77,8 @@ public class ErrorUtils {
 
             @NotNull
             @Override
-            public Collection getSubPackagesOf(
-                    @NotNull FqName fqName, @NotNull Function1 nameFilter
+            public Collection<FqName> getSubPackagesOf(
+                    @NotNull FqName fqName, @NotNull Function1<? super Name, Boolean> nameFilter
             ) {
                 return emptyList();
             }
@@ -188,8 +188,8 @@ public class ErrorUtils {
 
         @NotNull
         @Override
-        public Collection getContributedDescriptors(
-                @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter
+        public Collection<DeclarationDescriptor> getContributedDescriptors(
+                @NotNull DescriptorKindFilter kindFilter, @NotNull Function1<? super Name, Boolean> nameFilter
         ) {
             return Collections.emptyList();
         }
@@ -233,8 +233,8 @@ public class ErrorUtils {
 
         @NotNull
         @Override
-        public Collection getContributedDescriptors(
-                @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter
+        public Collection<DeclarationDescriptor> getContributedDescriptors(
+                @NotNull DescriptorKindFilter kindFilter, @NotNull Function1<? super Name, Boolean> nameFilter
         ) {
             throw new IllegalStateException();
         }
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
index 69c0769b57f..c7a286947ee 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
+++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
@@ -151,15 +151,15 @@ public class LockBasedStorageManager implements StorageManager {
 
     @NotNull
     @Override
-    public NotNullLazyValue createLazyValueWithPostCompute(
-            @NotNull Function0 computable,
-            final Function1 onRecursiveCall,
-            @NotNull final Function1 postCompute
+    public <T> NotNullLazyValue<T> createLazyValueWithPostCompute(
+            @NotNull Function0<? extends T> computable,
+            final Function1<? super Boolean, ? extends T> onRecursiveCall,
+            @NotNull final Function1<? super T, Unit> postCompute
     ) {
-        return new LockBasedNotNullLazyValue(computable) {
+        return new LockBasedNotNullLazyValue<T>(computable) {
             @NotNull
             @Override
-            protected RecursionDetectedResult recursionDetected(boolean firstTime) {
+            protected RecursionDetectedResult<T> recursionDetected(boolean firstTime) {
                 if (onRecursiveCall == null) {
                     return super.recursionDetected(firstTime);
                 }
@@ -167,7 +167,7 @@ public class LockBasedStorageManager implements StorageManager {
             }
 
             @Override
-            protected void postCompute(@NotNull Object value) {
+            protected void postCompute(@NotNull T value) {
                 postCompute.invoke(value);
             }
         };
@@ -193,12 +193,12 @@ public class LockBasedStorageManager implements StorageManager {
 
     @NotNull
     @Override
-    public NullableLazyValue createNullableLazyValueWithPostCompute(
-            @NotNull Function0 computable, @NotNull final Function1 postCompute
+    public <T> NullableLazyValue<T> createNullableLazyValueWithPostCompute(
+            @NotNull Function0<? extends T> computable, @NotNull final Function1<? super T, Unit> postCompute
     ) {
-        return new LockBasedLazyValue(computable) {
+        return new LockBasedLazyValue<T>(computable) {
             @Override
-            protected void postCompute(@Nullable Object value) {
+            protected void postCompute(@Nullable T value) {
                 postCompute.invoke(value);
             }
         };
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
index adfb54d8e0b..1be6402d8c5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
@@ -44,7 +44,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
     @NotNull
     @Override
     public Renderer<KotlinType> getTypeRenderer() {
-        return (Renderer<KotlinType>) IdeRenderers.HTML_RENDER_TYPE;
+        return IdeRenderers.HTML_RENDER_TYPE;
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
index ec079937626..e0ab57417e6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
@@ -197,12 +197,12 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
 
             BindingContext bindingContextForFile = resolutionFacade.analyzeFullyAndGetResult(Collections.singletonList(jetFile)).getBindingContext();
 
-            kotlin.Pair<BindingContext, List<KtFile>> result = (kotlin.Pair) DebuggerUtils.INSTANCE.analyzeInlinedFunctions(
+            kotlin.Pair<BindingContext, List<KtFile>> result = DebuggerUtils.INSTANCE.analyzeInlinedFunctions(
                     resolutionFacade, bindingContextForFile, jetFile, !enableInline
             );
 
             BindingContext bindingContext = result.getFirst();
-            List<? extends KtFile> toProcess = result.getSecond();
+            List<KtFile> toProcess = result.getSecond();
 
             GenerationState.GenerateClassFilter generateClassFilter = new GenerationState.GenerateClassFilter() {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
index b19b86f7a4a..8f2837e3235 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
@@ -390,7 +390,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
     }
 
     private boolean isFullFileMove() {
-        Map<KtFile, List<KtNamedDeclaration>> fileToElements = (Map) CollectionsKt.groupBy(
+        Map<KtFile, List<KtNamedDeclaration>> fileToElements = CollectionsKt.groupBy(
                 getSelectedElementsToMove(),
                 new Function1<KtNamedDeclaration, KtFile>() {
                     @Override