diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index b0cea14788b0..1d103f112961 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -416,33 +416,25 @@ comments::FullComment *ASTContext::getCommentForDecl(
     if (isa<ObjCMethodDecl>(D) || isa<FunctionDecl>(D)) {
       SmallVector<const NamedDecl*, 8> Overridden;
       const ObjCMethodDecl *OMD = dyn_cast<ObjCMethodDecl>(D);
-      if (OMD && OMD->isPropertyAccessor()) {
-        if (const ObjCPropertyDecl *PDecl = OMD->findPropertyDecl()) {
-          if (comments::FullComment *FC = getCommentForDecl(PDecl, PP)) {
-            comments::FullComment *CFC = cloneFullComment(FC, D);
-            return CFC;
-          }
-        }
-      }
+      if (OMD && OMD->isPropertyAccessor())
+        if (const ObjCPropertyDecl *PDecl = OMD->findPropertyDecl())
+          if (comments::FullComment *FC = getCommentForDecl(PDecl, PP))
+            return cloneFullComment(FC, D);
       if (OMD)
         addRedeclaredMethods(OMD, Overridden);
       getOverriddenMethods(dyn_cast<NamedDecl>(D), Overridden);
-      for (unsigned i = 0, e = Overridden.size(); i < e; i++) {
-        if (comments::FullComment *FC = getCommentForDecl(Overridden[i], PP)) {
-          comments::FullComment *CFC = cloneFullComment(FC, D);
-          return CFC;
-        }
-      }
+      for (unsigned i = 0, e = Overridden.size(); i < e; i++)
+        if (comments::FullComment *FC = getCommentForDecl(Overridden[i], PP))
+          return cloneFullComment(FC, D);
     }
     else if (const TypedefDecl *TD = dyn_cast<TypedefDecl>(D)) {
+      // Attach enum's documentation to its typedef if latter
+      // does not have one of its own.
       QualType QT = TD->getUnderlyingType();
-      if (const EnumType *ET = QT->getAs<EnumType>()) {
+      if (const EnumType *ET = QT->getAs<EnumType>())
         if (const EnumDecl *ED = ET->getDecl())
-          if (comments::FullComment *FC = getCommentForDecl(ED, PP)) {
-            comments::FullComment *CFC = cloneFullComment(FC, D);
-            return CFC;
-          }
-      }
+          if (comments::FullComment *FC = getCommentForDecl(ED, PP))
+            return cloneFullComment(FC, D);
     }
     return NULL;
   }