Index: tools/llvm-nm/llvm-nm.cpp
===================================================================
--- tools/llvm-nm/llvm-nm.cpp
+++ tools/llvm-nm/llvm-nm.cpp
@@ -190,19 +190,15 @@
       return true;
     else if (A.Address == B.Address && A.Name < B.Name)
       return true;
-    else if (A.Address == B.Address && A.Name == B.Name && A.Size < B.Size)
-      return true;
     else
-      return false;
+      return A.Address == B.Address && A.Name == B.Name && A.Size < B.Size;
   } else {
     if (A.Address > B.Address)
       return true;
     else if (A.Address == B.Address && A.Name > B.Name)
       return true;
-    else if (A.Address == B.Address && A.Name == B.Name && A.Size > B.Size)
-      return true;
     else
-      return false;
+      return A.Address == B.Address && A.Name == B.Name && A.Size > B.Size;
   }
 }
 
@@ -212,19 +208,15 @@
       return true;
     else if (A.Size == B.Size && A.Name < B.Name)
       return true;
-    else if (A.Size == B.Size && A.Name == B.Name && A.Address < B.Address)
-      return true;
     else
-      return false;
+      return A.Size == B.Size && A.Name == B.Name && A.Address < B.Address;
   } else {
     if (A.Size > B.Size)
       return true;
     else if (A.Size == B.Size && A.Name > B.Name)
       return true;
-    else if (A.Size == B.Size && A.Name == B.Name && A.Address > B.Address)
-      return true;
     else
-      return false;
+      return A.Size == B.Size && A.Name == B.Name && A.Address > B.Address;
   }
 }
 
@@ -234,19 +226,15 @@
       return true;
     else if (A.Name == B.Name && A.Size < B.Size)
       return true;
-    else if (A.Name == B.Name && A.Size == B.Size && A.Address < B.Address)
-      return true;
     else
-      return false;
+      return A.Name == B.Name && A.Size == B.Size && A.Address < B.Address;
   } else {
     if (A.Name > B.Name)
       return true;
     else if (A.Name == B.Name && A.Size > B.Size)
       return true;
-    else if (A.Name == B.Name && A.Size == B.Size && A.Address > B.Address)
-      return true;
     else
-      return false;
+      return A.Name == B.Name && A.Size == B.Size && A.Address > B.Address;
   }
 }
 
@@ -263,10 +251,8 @@
     return true;
   else if (isa<ELF32BEObjectFile>(Obj))
     return false;
-  else if (isa<ELF64BEObjectFile>(Obj))
-    return true;
   else
-    return false;
+    return isa<ELF64BEObjectFile>(Obj);
 }
 
 static StringRef CurrentFilename;