diff --git a/lib/Target/WDC65816/WDC65816ISelDAGToDAG.cpp b/lib/Target/WDC65816/WDC65816ISelDAGToDAG.cpp
index 34e289eb..9daef5ff 100644
--- a/lib/Target/WDC65816/WDC65816ISelDAGToDAG.cpp
+++ b/lib/Target/WDC65816/WDC65816ISelDAGToDAG.cpp
@@ -174,6 +174,8 @@ SDNode *WDC65816DAGToDAGISel::Select(SDNode *N) {
     }
     
     WDC_LOG("WDC_TODO - Unimplemented method called, opcode=" << N->getOpcode());
+    // Uncomment the following line to see the node info.
+    // N->dumprFull(CurDAG);
     switch (N->getOpcode()) {
         default: break;
             
diff --git a/lib/Target/WDC65816/WDC65816ISelLowering.cpp b/lib/Target/WDC65816/WDC65816ISelLowering.cpp
index c00e2ebf..c403aa6c 100644
--- a/lib/Target/WDC65816/WDC65816ISelLowering.cpp
+++ b/lib/Target/WDC65816/WDC65816ISelLowering.cpp
@@ -1102,34 +1102,16 @@ WDC65816TargetLowering::WDC65816TargetLowering(TargetMachine &TM)
 #endif
 }
 
-#if 0 // WDC_TODO - Disable this stuff for now...
 const char *WDC65816TargetLowering::getTargetNodeName(unsigned Opcode) const {
     switch (Opcode) {
         default: return 0;
-        case SPISD::CMPICC:     return "SPISD::CMPICC";
-        case SPISD::CMPFCC:     return "SPISD::CMPFCC";
-        case SPISD::BRICC:      return "SPISD::BRICC";
-        case SPISD::BRXCC:      return "SPISD::BRXCC";
-        case SPISD::BRFCC:      return "SPISD::BRFCC";
-        case SPISD::SELECT_ICC: return "SPISD::SELECT_ICC";
-        case SPISD::SELECT_XCC: return "SPISD::SELECT_XCC";
-        case SPISD::SELECT_FCC: return "SPISD::SELECT_FCC";
-        case SPISD::Hi:         return "SPISD::Hi";
-        case SPISD::Lo:         return "SPISD::Lo";
-        case SPISD::FTOI:       return "SPISD::FTOI";
-        case SPISD::ITOF:       return "SPISD::ITOF";
-        case SPISD::FTOX:       return "SPISD::FTOX";
-        case SPISD::XTOF:       return "SPISD::XTOF";
-        case SPISD::CALL:       return "SPISD::CALL";
-        case SPISD::RET_FLAG:   return "SPISD::RET_FLAG";
-        case SPISD::GLOBAL_BASE_REG: return "SPISD::GLOBAL_BASE_REG";
-        case SPISD::FLUSHW:     return "SPISD::FLUSHW";
-        case SPISD::TLS_ADD:    return "SPISD::TLS_ADD";
-        case SPISD::TLS_LD:     return "SPISD::TLS_LD";
-        case SPISD::TLS_CALL:   return "SPISD::TLS_CALL";
+        case WDCISD::RET_FLAG:   return "WDCSD::RET_FLAG";
     }
 }
 
+
+#if 0 // WDC_TODO - Disable this stuff for now...
+
 EVT WDC65816TargetLowering::getSetCCResultType(LLVMContext &, EVT VT) const {
     if (!VT.isVector())
         return MVT::i32;
diff --git a/lib/Target/WDC65816/WDC65816ISelLowering.h b/lib/Target/WDC65816/WDC65816ISelLowering.h
index 24a61d87..546e99e1 100644
--- a/lib/Target/WDC65816/WDC65816ISelLowering.h
+++ b/lib/Target/WDC65816/WDC65816ISelLowering.h
@@ -70,6 +70,8 @@ namespace llvm {
                     const SmallVectorImpl<SDValue> &OutVals,
                     SDLoc dl, SelectionDAG &DAG) const;
         
+        virtual const char *getTargetNodeName(unsigned Opcode) const;
+        
 #if 0 // WDC_TODO - Do I need any of this?
         virtual SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const;
         
@@ -86,7 +88,6 @@ namespace llvm {
         EmitInstrWithCustomInserter(MachineInstr *MI,
                                     MachineBasicBlock *MBB) const;
         
-        virtual const char *getTargetNodeName(unsigned Opcode) const;
         
         ConstraintType getConstraintType(const std::string &Constraint) const;
         std::pair<unsigned, const TargetRegisterClass*>