Index: lib/Serialization/ASTReader.cpp
===================================================================
--- lib/Serialization/ASTReader.cpp
+++ lib/Serialization/ASTReader.cpp
@@ -3817,10 +3817,7 @@
         
     case llvm::BitstreamEntry::SubBlock:
       if (Entry.ID == BlockID) {
-        if (Cursor.EnterSubBlock(BlockID))
-          return true;
-        // Found it!
-        return false;
+        return Cursor.EnterSubBlock(BlockID);
       }
       
       if (Cursor.SkipBlock())
Index: lib/Serialization/ASTWriter.cpp
===================================================================
--- lib/Serialization/ASTWriter.cpp
+++ lib/Serialization/ASTWriter.cpp
@@ -3096,15 +3096,9 @@
   /// doesn't check whether the name has macros defined; use PublicMacroIterator
   /// to check that.
   bool isInterestingIdentifier(IdentifierInfo *II, uint64_t MacroOffset) {
-    if (MacroOffset ||
-        II->isPoisoned() ||
-        II->isExtensionToken() ||
-        II->getObjCOrBuiltinID() ||
-        II->hasRevertedTokenIDToIdentifier() ||
-        II->getFETokenInfo<void>())
-      return true;
-
-    return false;
+    return MacroOffset || II->isPoisoned() || II->isExtensionToken() ||
+           II->getObjCOrBuiltinID() || II->hasRevertedTokenIDToIdentifier() ||
+           II->getFETokenInfo<void>();
   }
 
 public: