diff --git a/SMPInstr.cpp b/SMPInstr.cpp
index 4fa373ca2b59fcc25d89913ec0bd18ef4579fdbf..d654d8b2e69e2f22425c85cec1a0e8c70404ef5d 100644
--- a/SMPInstr.cpp
+++ b/SMPInstr.cpp
@@ -5255,7 +5255,6 @@ void SMPInstr::MDFixupSignedness(void) {
 			// Note that old FG info should be null at this point in FG inference,
 			//  so we only have to pass in the SIGNED bits.
 			bool MapsChanged = this->UpdateDefOpFGInfo(DefOp, NewFG);
-			assert(MapsChanged);
 		}
 	} // end if Underflow on register
 
diff --git a/SMPStaticAnalyzer.cpp b/SMPStaticAnalyzer.cpp
index ab3bae8e5cffbb3b525929d0e6bdb97f770d96b9..19f3dc2bb958da842b4d3dfa1830ddfab1a36a38 100644
--- a/SMPStaticAnalyzer.cpp
+++ b/SMPStaticAnalyzer.cpp
@@ -1619,6 +1619,10 @@ void FindOrphanedCode(segment_t *CurrSeg, FILE *AnnotFile, FILE *InfoAnnotFile)
 				//  some kind, then make a function chunk and make
 				//  it a tail of all functions that jump to it. **!!**
 
+				// Do machine-dependent fixes for DEF and USE lists.
+				//  The fixes can help produce better annotations.
+				CurrInst.MDFixupDefUseLists();
+
 				// If instruction is still not included in a code chunk,
 				//  emit annotations for it in isolation.
 				CurrInst.EmitAnnotations(true, false, true, AnnotFile, InfoAnnotFile);