diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index 9b552014077..603a52b2358 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -794,23 +794,21 @@ void SCCPSolver::Solve() {
 
 
 namespace {
-//===----------------------------------------------------------------------===//
-//
-/// SCCP Class - This class does all of the work of Sparse Conditional Constant
-/// Propagation.
-///
-class SCCP : public FunctionPass, public InstVisitor<SCCP> {
-public:
-
-  // runOnFunction - Run the Sparse Conditional Constant Propagation algorithm,
-  // and return true if the function was modified.
+  //===--------------------------------------------------------------------===//
   //
-  bool runOnFunction(Function &F);
-
-  virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.setPreservesCFG();
-  }
-};
+  /// SCCP Class - This class uses the SCCPSolver to implement a per-function
+  /// Sparse Conditional COnstant Propagator.
+  ///
+  struct SCCP : public FunctionPass {
+    // runOnFunction - Run the Sparse Conditional Constant Propagation
+    // algorithm, and return true if the function was modified.
+    //
+    bool runOnFunction(Function &F);
+    
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesCFG();
+    }
+  };
 
   RegisterOpt<SCCP> X("sccp", "Sparse Conditional Constant Propagation");
 } // end anonymous namespace
@@ -822,10 +820,6 @@ FunctionPass *llvm::createSCCPPass() {
 }
 
 
-//===----------------------------------------------------------------------===//
-// SCCP Class Implementation
-
-
 // runOnFunction() - Run the Sparse Conditional Constant Propagation algorithm,
 // and return true if the function was modified.
 //
@@ -907,4 +901,3 @@ bool SCCP::runOnFunction(Function &F) {
   return MadeChanges;
 }
 
-