diff --git a/java/java-psi-api/src/com/intellij/psi/PsiExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
index cff6e10d1eee..6f7fdf3eea8f 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -34,7 +34,7 @@ public interface PsiExpression extends PsiAnnotationMemberValue {
     @NotNull
     @Override
     public PsiExpression[] create(final int count) {
-      return count == 0 ? PsiExpression.EMPTY_ARRAY : new PsiExpression[count];
+      return count == 0 ? EMPTY_ARRAY : new PsiExpression[count];
     }
   };
 
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiSuperExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiSuperExpression.java
index 0e6512779cdb..34be7bcdf2ed 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiSuperExpression.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiSuperExpression.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.
@@ -18,15 +18,12 @@ package com.intellij.psi;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Represents a Java <code>super</code> expression in a super method call. Note that the qualifier of
- * a super constructor call is represented as a {@link PsiKeyword} rather than a <code>PsiSuperExpression</code>.  
+ * Represents a Java {@code super} expression in a superclass member reference (but not in a super constructor call,
+ * where the {@code super} qualifier is represented as a {@link PsiKeyword} wrapped in a {@link PsiReferenceExpression}).
  */
 public interface PsiSuperExpression extends PsiQualifiedExpression {
   /**
-   * Returns the expression representing the class name qualifying the <code>super</code>
-   * expression.
-   *
-   * @return the qualifier, or null if the expression has no qualifier.
+   * Returns an expression representing a type name qualifying the {@code super} expression.
    */
   @Override
   @Nullable
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiThisExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiThisExpression.java
index a32b29e8f3fc..3d64548318d7 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiThisExpression.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiThisExpression.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.
@@ -18,14 +18,11 @@ package com.intellij.psi;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Represents a Java <code>this</code> expression.
+ * Represents a Java {@code this} expression.
  */
 public interface PsiThisExpression extends PsiQualifiedExpression {
   /**
-   * Returns the expression representing the class name qualifying the <code>this</code>
-   * expression.
-   *
-   * @return the qualifier, or null if the expression has no qualifier.
+   * Returns an expression representing a type name qualifying the {@code this} expression.
    */
   @Override
   @Nullable