diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java
index 1ffe06bf744..53ee1b144fc 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
-public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl implements JavaAnnotationArgument {
+public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl<PsiAnnotationMemberValue> implements JavaAnnotationArgument {
     private final Name name;
 
     protected JavaAnnotationArgumentImpl(@NotNull PsiAnnotationMemberValue psiAnnotationMemberValue, @Nullable Name name) {
@@ -30,12 +30,6 @@ public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl impleme
         this.name = name;
     }
 
-    @NotNull
-    @Override
-    public PsiAnnotationMemberValue getPsi() {
-        return (PsiAnnotationMemberValue) super.getPsi();
-    }
-
     @NotNull
     /* package */ static JavaAnnotationArgument create(@NotNull PsiAnnotationMemberValue argument, @Nullable Name name) {
         if (argument instanceof PsiLiteralExpression) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java
index e0a714837c2..f0d6150ba26 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java
@@ -29,17 +29,11 @@ import java.util.Collection;
 
 import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments;
 
-public class JavaAnnotationImpl extends JavaElementImpl implements JavaAnnotation {
+public class JavaAnnotationImpl extends JavaElementImpl<PsiAnnotation> implements JavaAnnotation {
     public JavaAnnotationImpl(@NotNull PsiAnnotation psiAnnotation) {
         super(psiAnnotation);
     }
 
-    @NotNull
-    @Override
-    public PsiAnnotation getPsi() {
-        return (PsiAnnotation) super.getPsi();
-    }
-
     @Override
     @Nullable
     public JavaAnnotationArgument findArgument(@NotNull Name name) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java
index 35b065e0571..a3aace71175 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java
@@ -21,17 +21,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
 
-public class JavaArrayTypeImpl extends JavaTypeImpl implements JavaArrayType {
+public class JavaArrayTypeImpl extends JavaTypeImpl<PsiArrayType> implements JavaArrayType {
     public JavaArrayTypeImpl(@NotNull PsiArrayType psiArrayType) {
         super(psiArrayType);
     }
 
-    @NotNull
-    @Override
-    public PsiArrayType getPsi() {
-        return (PsiArrayType) super.getPsi();
-    }
-
     @Override
     @NotNull
     public JavaType getComponentType() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java
index 7bef4a83cb8..e1ea5789ad5 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java
@@ -21,17 +21,11 @@ import com.intellij.psi.PsiTypeParameter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier;
 
-public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier {
+public abstract class JavaClassifierImpl extends JavaElementImpl<PsiClass> implements JavaClassifier {
     protected JavaClassifierImpl(@NotNull PsiClass psiClass) {
         super(psiClass);
     }
 
-    @NotNull
-    @Override
-    public PsiClass getPsi() {
-        return (PsiClass) super.getPsi();
-    }
-
     @NotNull
     /* package */ static JavaClassifier create(@NotNull PsiClass psiClass) {
         if (psiClass instanceof PsiTypeParameter) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java
index f84034c13e3..bbb5f54dd7c 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.types;
 
-public class JavaClassifierTypeImpl extends JavaTypeImpl implements JavaClassifierType {
+public class JavaClassifierTypeImpl extends JavaTypeImpl<PsiClassType> implements JavaClassifierType {
     private static class ResolutionResult {
         private final JavaClassifier classifier;
         private final JavaTypeSubstitutor substitutor;
@@ -50,12 +50,6 @@ public class JavaClassifierTypeImpl extends JavaTypeImpl implements JavaClassifi
         super(psiClassType);
     }
 
-    @NotNull
-    @Override
-    public PsiClassType getPsi() {
-        return (PsiClassType) super.getPsi();
-    }
-
     @Override
     @Nullable
     public JavaClassifier getClassifier() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java
index 9ca4c32d338..c3ac686acad 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java
@@ -20,15 +20,15 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaElement;
 
-public abstract class JavaElementImpl implements JavaElement {
-    private final PsiElement psiElement;
+public abstract class JavaElementImpl<Psi extends PsiElement> implements JavaElement {
+    private final Psi psiElement;
 
-    protected JavaElementImpl(@NotNull PsiElement psiElement) {
+    protected JavaElementImpl(@NotNull Psi psiElement) {
         this.psiElement = psiElement;
     }
 
     @NotNull
-    public PsiElement getPsi() {
+    public Psi getPsi() {
         return psiElement;
     }
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java
index 948b4b5cf1c..9aa5bc3bbc7 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java
@@ -29,17 +29,12 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.Collection;
 
-public abstract class JavaMemberImpl extends JavaElementImpl implements JavaMember, JavaAnnotationOwnerImpl, JavaModifierListOwnerImpl {
+public abstract class JavaMemberImpl extends JavaElementImpl<PsiMember>
+        implements JavaMember, JavaAnnotationOwnerImpl, JavaModifierListOwnerImpl {
     protected JavaMemberImpl(@NotNull PsiMember psiMember) {
         super(psiMember);
     }
 
-    @NotNull
-    @Override
-    public PsiMember getPsi() {
-        return (PsiMember) super.getPsi();
-    }
-
     @NotNull
     @Override
     public Name getName() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java
index 1bee04eaed4..36acd62af93 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java
@@ -27,17 +27,11 @@ import java.util.Collection;
 import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes;
 import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages;
 
-public class JavaPackageImpl extends JavaElementImpl implements JavaPackage {
+public class JavaPackageImpl extends JavaElementImpl<PsiPackage> implements JavaPackage {
     public JavaPackageImpl(@NotNull PsiPackage psiPackage) {
         super(psiPackage);
     }
 
-    @NotNull
-    @Override
-    public PsiPackage getPsi() {
-        return (PsiPackage) super.getPsi();
-    }
-
     @Override
     @NotNull
     public Collection<JavaClass> getClasses() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java
index efc97c2b920..184de1fde16 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java
@@ -20,17 +20,11 @@ import com.intellij.psi.PsiPrimitiveType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaPrimitiveType;
 
-public class JavaPrimitiveTypeImpl extends JavaTypeImpl implements JavaPrimitiveType {
+public class JavaPrimitiveTypeImpl extends JavaTypeImpl<PsiPrimitiveType> implements JavaPrimitiveType {
     public JavaPrimitiveTypeImpl(@NotNull PsiPrimitiveType psiPrimitiveType) {
         super(psiPrimitiveType);
     }
 
-    @NotNull
-    @Override
-    public PsiPrimitiveType getPsi() {
-        return (PsiPrimitiveType) super.getPsi();
-    }
-
     @Override
     @NotNull
     public String getCanonicalText() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java
index ac64a1dfb6f..82623b853e1 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java
@@ -21,15 +21,15 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
 
-public abstract class JavaTypeImpl implements JavaType {
-    private final PsiType psiType;
+public abstract class JavaTypeImpl<Psi extends PsiType> implements JavaType {
+    private final Psi psiType;
 
-    public JavaTypeImpl(@NotNull PsiType psiType) {
+    public JavaTypeImpl(@NotNull Psi psiType) {
         this.psiType = psiType;
     }
 
     @NotNull
-    public PsiType getPsi() {
+    public Psi getPsi() {
         return psiType;
     }
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java
index 92119258238..78403e70d46 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java
@@ -27,17 +27,11 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.Collection;
 
-public class JavaValueParameterImpl extends JavaElementImpl implements JavaValueParameter, JavaAnnotationOwnerImpl {
+public class JavaValueParameterImpl extends JavaElementImpl<PsiParameter> implements JavaValueParameter, JavaAnnotationOwnerImpl {
     public JavaValueParameterImpl(@NotNull PsiParameter psiParameter) {
         super(psiParameter);
     }
 
-    @NotNull
-    @Override
-    public PsiParameter getPsi() {
-        return (PsiParameter) super.getPsi();
-    }
-
     @NotNull
     @Override
     public Collection<JavaAnnotation> getAnnotations() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java
index 647a66a33e9..76ddea9ca01 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java
@@ -24,17 +24,11 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaWildcardType;
 
-public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardType {
+public class JavaWildcardTypeImpl extends JavaTypeImpl<PsiWildcardType> implements JavaWildcardType {
     public JavaWildcardTypeImpl(@NotNull PsiWildcardType psiWildcardType) {
         super(psiWildcardType);
     }
 
-    @NotNull
-    @Override
-    public PsiWildcardType getPsi() {
-        return (PsiWildcardType) super.getPsi();
-    }
-
     @Override
     @Nullable
     public JavaType getBound() {