diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java b/java/java-impl/src/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java
index 92613ecd4baa..1b7b2dcfc05e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java
@@ -9,7 +9,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -18,14 +17,6 @@ import org.jetbrains.annotations.Nullable;
 public class CastingLookupElementDecorator extends LookupElementDecorator<LookupElement> implements TypedLookupItem {
   private final LookupElement myCastItem;
   private final PsiType myCastType;
-  private static final LookupElementVisagiste<CastingLookupElementDecorator> CASTING_VISAGISTE = new LookupElementVisagiste<CastingLookupElementDecorator>() {
-    @Override
-    public void applyCosmetics(@NotNull CastingLookupElementDecorator item, @NotNull LookupElementPresentation base) {
-      final String castType = getItemText(base, item.getCastItem());
-      base.setItemText("(" + castType + ")" + base.getItemText());
-      base.setTypeText(castType);
-    }
-  };
 
   @Nullable
   private static String getItemText(LookupElementPresentation base, LookupElement castItem) {
@@ -49,6 +40,13 @@ public class CastingLookupElementDecorator extends LookupElementDecorator<Lookup
     return "(" + myCastItem.getLookupString() + ")" + getDelegate().getLookupString();
   }
 
+  public void renderElement(LookupElementPresentation presentation) {
+    getDelegate().renderElement(presentation);
+    final String castType = getItemText(presentation, getCastItem());
+    presentation.setItemText("(" + castType + ")" + presentation.getItemText());
+    presentation.setTypeText(castType);
+  }
+
   @Override
   public void handleInsert(InsertionContext context) {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(context.getProject());
@@ -66,6 +64,6 @@ public class CastingLookupElementDecorator extends LookupElementDecorator<Lookup
   }
 
   static LookupElement createCastingElement(final LookupElement delegate, PsiType castTo) {
-    return decorate(new CastingLookupElementDecorator(delegate, castTo), CASTING_VISAGISTE);
+    return new CastingLookupElementDecorator(delegate, castTo);
   }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
index 219772b25fcc..ad1963a92c35 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
@@ -20,16 +20,6 @@ import java.util.Set;
  */
 public class JavaChainLookupElement extends LookupElementDecorator<LookupElement> implements TypedLookupItem {
   private final LookupElement myQualifier;
-  private static final LookupElementVisagiste<JavaChainLookupElement> CHAINING_VISAGISTE = new LookupElementVisagiste<JavaChainLookupElement>() {
-    @Override
-    public void applyCosmetics(@NotNull JavaChainLookupElement item, @NotNull LookupElementPresentation base) {
-      final LookupElementPresentation qualifierPresentation = new LookupElementPresentation(base.isReal());
-      item.myQualifier.renderElement(qualifierPresentation);
-      String name = item.maybeAddParentheses(qualifierPresentation.getItemText());
-      final String qualifierText = item.myQualifier.as(CastingLookupElementDecorator.class) != null ? "(" + name + ")" : name;
-      base.setItemText(qualifierText + "." + base.getItemText());
-    }
-  };
 
   private JavaChainLookupElement(LookupElement qualifier, LookupElement main) {
     super(main);
@@ -65,6 +55,16 @@ public class JavaChainLookupElement extends LookupElementDecorator<LookupElement
     return myQualifier.getObject() instanceof PsiMethod ? s + "()" : s;
   }
 
+  @Override
+  public void renderElement(LookupElementPresentation presentation) {
+    super.renderElement(presentation);
+    final LookupElementPresentation qualifierPresentation = new LookupElementPresentation(presentation.isReal());
+    myQualifier.renderElement(qualifierPresentation);
+    String name = maybeAddParentheses(qualifierPresentation.getItemText());
+    final String qualifierText = myQualifier.as(CastingLookupElementDecorator.class) != null ? "(" + name + ")" : name;
+    presentation.setItemText(qualifierText + "." + presentation.getItemText());
+  }
+
   @Override
   public void handleInsert(InsertionContext context) {
     FeatureUsageTracker.getInstance().triggerFeatureUsed(JavaCompletionFeatures.SECOND_SMART_COMPLETION_CHAIN);
@@ -138,6 +138,6 @@ public class JavaChainLookupElement extends LookupElementDecorator<LookupElement
   }
 
   public static LookupElement chainElements(LookupElement qualifier, LookupElement main) {
-    return decorate(new JavaChainLookupElement(qualifier, main), CHAINING_VISAGISTE);
+    return new JavaChainLookupElement(qualifier, main);
   }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index a8f5e830d15d..bde2a2813ca9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -193,7 +193,7 @@ public class JavaCompletionContributor extends CompletionContributor {
                                                                                      checkAccess,
                                                                                      result.getPrefixMatcher(), parameters)) {
                   if (isSwitchLabel) {
-                    result.addElement(TailTypeDecorator.createDecorator(element, TailType.createSimpleTailType(':')));
+                    result.addElement(TailTypeDecorator.withTail(element, TailType.createSimpleTailType(':')));
                   } else {
                     final LookupItem item = element.as(LookupItem.class);
                     if (file instanceof PsiJavaCodeReferenceCodeFragment &&
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
index f3982162c27a..75a62e525b51 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
@@ -954,10 +954,11 @@ public class JavaCompletionUtil {
   }
 
   private static LookupElementDecorator<LookupElement> highlight(LookupElement decorator) {
-    return LookupElementDecorator.decorate(decorator, new LookupElementVisagiste<LookupElement>() {
+    return LookupElementDecorator.withRenderer(decorator, new LookupElementRenderer<LookupElementDecorator<LookupElement>>() {
       @Override
-      public void applyCosmetics(@NotNull LookupElement item, @NotNull LookupElementPresentation base) {
-        base.setItemTextBold(true);
+      public void renderElement(LookupElementDecorator<LookupElement> element, LookupElementPresentation presentation) {
+        element.getDelegate().renderElement(presentation);
+        presentation.setItemTextBold(true);
       }
     });
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
index 18c831dc8d5b..d8bbf47a6a8e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
@@ -313,7 +313,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
           for (PsiClassType ref : method.getThrowsList().getReferencedTypes()) {
             final PsiClass exception = ref.resolve();
             if (exception != null && throwsSet.add(exception)) {
-              result.addElement(TailTypeDecorator.createDecorator(new JavaPsiClassReferenceElement(exception).setInsertHandler(new DefaultInsertHandler()), TailType.SPACE));
+              result.addElement(TailTypeDecorator.withTail(new JavaPsiClassReferenceElement(exception).setInsertHandler(new DefaultInsertHandler()), TailType.SPACE));
             }
           }
         }
@@ -331,7 +331,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
         if (tryBlock == null) return;
 
         for (final PsiClassType type : ExceptionUtil.getThrownExceptions(tryBlock.getStatements())) {
-          result.addElement(TailTypeDecorator.createDecorator(PsiTypeLookupItem.createLookupItem(type).setInsertHandler(new DefaultInsertHandler()), TailType.SPACE));
+          result.addElement(TailTypeDecorator.withTail(PsiTypeLookupItem.createLookupItem(type).setInsertHandler(new DefaultInsertHandler()), TailType.SPACE));
         }
       }
     });
@@ -377,7 +377,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
                                                             PsiUtil.getLanguageLevel(context));
                        if (substitution != null && substitution != PsiType.NULL) {
                          final LookupItem item = PsiTypeLookupItem.createLookupItem(substitution);
-                         resultSet.addElement(TailTypeDecorator.createDecorator(item.setInsertHandler(new DefaultInsertHandler()), tail));
+                         resultSet.addElement(TailTypeDecorator.withTail(item.setInsertHandler(new DefaultInsertHandler()), tail));
                        }
                      }
                    }
@@ -393,7 +393,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
                      final PsiClass psiClass = PsiUtil.resolveClassInType(type);
                      if (psiClass == null) return;
 
-                     resultSet.addElement(TailTypeDecorator.createDecorator(new JavaPsiClassReferenceElement(psiClass).setInsertHandler(new DefaultInsertHandler()), tail));
+                     resultSet.addElement(TailTypeDecorator.withTail(new JavaPsiClassReferenceElement(psiClass).setInsertHandler(new DefaultInsertHandler()), tail));
                    }
                  }, resultSet.getPrefixMatcher());
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
index aee9a2917e84..8d401f2f880a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
@@ -66,7 +66,7 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
     final TailType tail = method.isConstructor() || method.getReturnType() instanceof PsiPrimitiveType
                           ? TailTypes.CALL_RPARENTH_SEMICOLON
                           : TailTypes.CALL_RPARENTH;
-    return TailTypeDecorator.createDecorator(element, tail);
+    return TailTypeDecorator.withTail(element, tail);
   }
 
   private static List<Pair<PsiMethod, PsiSubstitutor>> getSuperMethodCandidates(PsiReferenceExpression expression) {
diff --git a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java
index f6187e21cdce..615542341c36 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java
@@ -108,7 +108,7 @@ public abstract class LookupElementDecorator<T extends LookupElement> extends Lo
   }
 
   @NotNull
-  public static <T extends LookupElement> LookupElementDecorator<T> decorate(@NotNull final T element, @NotNull final LookupElementVisagiste<T> visagiste) {
+  public static <T extends LookupElement> LookupElementDecorator<T> withRenderer(@NotNull final T element, @NotNull final LookupElementRenderer<? super LookupElementDecorator<T>> visagiste) {
     return new VisagisteDecorator<T>(element, visagiste);
   }
 
@@ -153,19 +153,16 @@ public abstract class LookupElementDecorator<T extends LookupElement> extends Lo
   }
 
   private static class VisagisteDecorator<T extends LookupElement> extends LookupElementDecorator<T> {
-    private final T myElement;
-    private final LookupElementVisagiste<T> myVisagiste;
+    private final LookupElementRenderer<? super LookupElementDecorator<T>> myVisagiste;
 
-    public VisagisteDecorator(T element, LookupElementVisagiste<T> visagiste) {
+    public VisagisteDecorator(T element, LookupElementRenderer<? super LookupElementDecorator<T>> visagiste) {
       super(element);
-      myElement = element;
       myVisagiste = visagiste;
     }
 
     @Override
     public void renderElement(final LookupElementPresentation presentation) {
-      getDelegate().renderElement(presentation);
-      myVisagiste.applyCosmetics(getDelegate(), presentation);
+      myVisagiste.renderElement(this, presentation);
     }
 
     @Override
@@ -176,7 +173,6 @@ public abstract class LookupElementDecorator<T extends LookupElement> extends Lo
 
       VisagisteDecorator that = (VisagisteDecorator)o;
 
-      if (!myElement.equals(that.myElement)) return false;
       if (!myVisagiste.getClass().equals(that.myVisagiste.getClass())) return false;
 
       return true;
@@ -185,7 +181,6 @@ public abstract class LookupElementDecorator<T extends LookupElement> extends Lo
     @Override
     public int hashCode() {
       int result = super.hashCode();
-      result = 31 * result + myElement.hashCode();
       result = 31 * result + myVisagiste.getClass().hashCode();
       return result;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
index 5067658d56f8..e5a06c62fe6c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
@@ -46,7 +46,7 @@ public class WordCompletionContributor extends CompletionContributor implements
                                                                                                             character().javaIdentifierPart().andNot(character().equalTo('$')),
                                                                                                             character().javaIdentifierStart()));
     for (final String word : AllWordsGetter.getAllWords(insertedElement, startOffset)) {
-      final LookupElement item = TailTypeDecorator.createDecorator(LookupElementBuilder.create(word), TailType.SPACE);
+      final LookupElement item = TailTypeDecorator.withTail(LookupElementBuilder.create(word), TailType.SPACE);
       javaResultSet.addElement(item);
       plainResultSet.addElement(item);
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/TailTypeDecorator.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/TailTypeDecorator.java
index eb9fdb136fca..8cbff0df9f49 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/TailTypeDecorator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/TailTypeDecorator.java
@@ -29,7 +29,7 @@ public abstract class TailTypeDecorator<T extends LookupElement> extends LookupE
     super(delegate);
   }
 
-  public static <T extends LookupElement> TailTypeDecorator<T> createDecorator(T element, final TailType type) {
+  public static <T extends LookupElement> TailTypeDecorator<T> withTail(T element, final TailType type) {
     return new TailTypeDecorator<T>(element) {
       @Override
       protected TailType computeTailType(InsertionContext context) {
diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java b/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
index 116cf39769b2..39387dbbff53 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
@@ -166,7 +166,7 @@ public class TagNameReference implements PsiReference {
   }
 
   protected static LookupElement createClosingTagLookupElement(XmlTag tag) {
-    return TailTypeDecorator.createDecorator(LookupElementBuilder.create(tag.getName()).setAutoCompletionPolicy(
+    return TailTypeDecorator.withTail(LookupElementBuilder.create(tag.getName()).setAutoCompletionPolicy(
         AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE), TailType.createSimpleTailType('>'));
   }