diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp
index 4c671be..0a56ceb 100644
--- a/tools/bugpoint/ExtractFunction.cpp
+++ b/tools/bugpoint/ExtractFunction.cpp
@@ -24,16 +24,12 @@
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Target/TargetData.h"
 #include "Support/CommandLine.h"
-
+using namespace llvm;
 
 namespace llvm {
-
-bool DisableSimplifyCFG = false;
-
+  bool DisableSimplifyCFG = false;
 } // End llvm namespace
 
-using namespace llvm;
-
 namespace {
   cl::opt<bool>
   NoADCE("disable-adce",
@@ -46,8 +42,6 @@
          cl::desc("Do not use the -simplifycfg pass to reduce testcases"));
 }
 
-namespace llvm {
-
 /// deleteInstructionFromProgram - This method clones the current Program and
 /// deletes the specified instruction from the cloned module.  It then runs a
 /// series of cleanup passes (ADCE and SimplifyCFG) to eliminate any code which
@@ -114,8 +108,12 @@
   CleanupPasses.push_back(getPI(createFunctionResolvingPass()));
   CleanupPasses.push_back(getPI(createGlobalDCEPass()));
   CleanupPasses.push_back(getPI(createDeadTypeEliminationPass()));
-  CleanupPasses.push_back(getPI(createDeadArgHackingPass()));
 
+  if (MayModifySemantics)
+    CleanupPasses.push_back(getPI(createDeadArgHackingPass()));
+  else
+    CleanupPasses.push_back(getPI(createDeadArgEliminationPass()));
+  
   std::swap(Program, M);
   std::string Filename;
   bool Failed = runPasses(CleanupPasses, Filename);
@@ -134,5 +132,3 @@
   }
   return M;
 }
-
-} // End llvm namespace