diff --git a/lib/Analysis/DataStructure/GraphChecker.cpp b/lib/Analysis/DataStructure/GraphChecker.cpp
index 5cbd5ba7629..af8731eb05c 100644
--- a/lib/Analysis/DataStructure/GraphChecker.cpp
+++ b/lib/Analysis/DataStructure/GraphChecker.cpp
@@ -12,7 +12,7 @@
 // or not a node is collapsed, etc.  These are the command line arguments that
 // it supports:
 //
-//   --dsgc-dsapass={local,bu,td}     - Specify what flavor of graph to check
+//   --dsgc-dspass={local,bu,td}      - Specify what flavor of graph to check
 //   --dsgc-abort-if-any-collapsed    - Abort if any collapsed nodes are found
 //   --dsgc-abort-if-collapsed=<list> - Abort if a node pointed to by an SSA
 //                                      value with name in <list> is collapsed
diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp
index a3a0e2ebc6b..88dd5a309a4 100644
--- a/lib/Analysis/DataStructure/Local.cpp
+++ b/lib/Analysis/DataStructure/Local.cpp
@@ -38,7 +38,6 @@ X("datastructure", "Local Data Structure Analysis");
 static cl::opt<bool>
 TrackIntegersAsPointers("dsa-track-integers",
          cl::desc("If this is set, track integers as potential pointers"));
-                        
 
 namespace llvm {
 namespace DS {
@@ -581,6 +580,7 @@ void GraphBuilder::visitCallSite(CallSite CS) {
               if (DSNode *N = getValueDest(**AI).getNode())
                 N->setReadMarker();   
           }
+          return;
         } else if (F->getName() == "scanf" || F->getName() == "fscanf" ||
                    F->getName() == "sscanf") {
           CallSite::arg_iterator AI = CS.arg_begin(), E = CS.arg_end();
@@ -612,6 +612,7 @@ void GraphBuilder::visitCallSite(CallSite CS) {
               if (DSNode *N = getValueDest(**AI).getNode())
                 N->setModifiedMarker();   
           }
+          return;
         } else if (F->getName() == "strtok") {
           // strtok reads and writes the first argument, returning it.  It reads
           // its second arg.  FIXME: strtok also modifies some hidden static