diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 38fb4a6c59139e02a7a40c3393b7bbd9f8897293..2d677d98d52ce529e7884cb09a477cdef8630981 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -4059,7 +4059,6 @@ void SMPFunction::AdvancedAnalysis(void) {
 
 	this->FindAllAllocsAndDeallocs();
 
-#if 1
 	InstIter = this->Instrs.begin();
 	if ((*InstIter)->IsMarkerInst()) {
 		++InstIter; // skip marker inst
@@ -4068,9 +4067,9 @@ void SMPFunction::AdvancedAnalysis(void) {
 		CurrInst = (*InstIter);
 		STARS_ea_t InstAddr = CurrInst->GetAddr(); // for debugging breakpoints
 		// We can finally search for stack loads now that UseFP has been fixed by
-		//  MDFixUseFP(). Otherwise, we would do this in SMPInstr::Analyze(),
+		//  MDFixFrameInfo(). Otherwise, we would do this in SMPInstr::Analyze(),
 		//  but the UseFP flag is not ready that early.
-		CurrInst->MDFindLoadFromStack(this->UseFP);
+		CurrInst->MDFindLoadFromStack(this->UsesFramePointer());
 
 		// Fix up machine dependent quirks in the def and use lists.
 		//  This used to be called from within SMPInstr.Analyze(), but info such as UseFP
@@ -4081,9 +4080,8 @@ void SMPFunction::AdvancedAnalysis(void) {
 			CurrInst->SyncAllRTs(this->UsesFramePointer(), this->GetFramePtrStackDelta());
 
 		// Detect indirect memory references.
-		CurrInst->AnalyzeIndirectRefs(this->UseFP);
+		CurrInst->AnalyzeIndirectRefs(this->UsesFramePointer());
 	}
-#endif
 
 	// Audit the call instructions and call targets.
 	//  !!!!****!!!! NOTE: Not sure the address range checks in this code are valid
@@ -4157,7 +4155,6 @@ void SMPFunction::AdvancedAnalysis(void) {
 	}
 
 	// Figure out the stack frame and related info.
-#if SMP_ANALYZE_STACK_POINTER
 	(void) this->AnalyzeStackPointerDeltas();
 	this->StackPtrCopySet.clear(); // free memory
 	this->TempStackDeltaReachesList.clear();
@@ -4175,9 +4172,6 @@ void SMPFunction::AdvancedAnalysis(void) {
 		CurrInst = (*InstIter);
 		CurrInst->MDFixupCallDefUseLists();
 	}
-#else
-	(void) this->UseIDAStackPointerDeltas();
-#endif
 
 #if SMP_DEBUG_CONTROLFLOW
 	SMP_msg("SMPFunction::Analyze: set stack frame info.\n");
diff --git a/src/base/SMPInstr.cpp b/src/base/SMPInstr.cpp
index 8479ae2127062480f6b7a30c8c74b83f997bebad..c1cacaec41511c248bf4ca83dd33cf609ffdaaee 100644
--- a/src/base/SMPInstr.cpp
+++ b/src/base/SMPInstr.cpp
@@ -3650,7 +3650,7 @@ bool SMPInstr::MDIsStackPointerCopy(bool UseFP) {
 		&& (!(this->HasSourceMemoryOperand()))) { // reg to reg move
 		set<DefOrUse, LessDefUse>::iterator UseIter = this->GetFirstUse();
 		if (UseIter == this->GetLastUse()) {
-			SMP_msg("ERROR: No first USE at %llu in MDIsStackPointerCopy\n", this->GetAddr());
+			SMP_msg("ERROR: No first USE at %llx in MDIsStackPointerCopy\n", (unsigned long long) this->GetAddr());
 		}
 		else if (UseFP) {
 			if (UseIter->GetOp()->MatchesReg(MD_FRAME_POINTER_REG))
@@ -11366,7 +11366,7 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<std::size_t
 				}
 				if (IgnoreOverflow) {
 					if (11 == IdiomCode) {
-						SMP_fprintf(InfoAnnotFile, " ZZ IDIOM %d CONST %llu %s \n", IdiomCode, (unsigned long long) ConstValue, disasm);
+						SMP_fprintf(InfoAnnotFile, " ZZ IDIOM %d CONST %lu %s \n", IdiomCode, (unsigned long) ConstValue, disasm);
 					}
 					else if (18 == IdiomCode) {
 						// Need a tag field telling what kind of pointer.
@@ -11517,8 +11517,11 @@ void SMPInstr::EmitIntegerErrorAnnotations(FILE *InfoAnnotFile, list<std::size_t
 				SMP_fprintf(InfoAnnotFile, "%18llx %6zu INSTR CHECK OVERFLOW UNKNOWNSIGN %zu %s ZZ",
 					(unsigned long long) this->GetAddr(), this->GetSize(), DefBitWidth, MDGetRegName(DefOp));
 			}
-			if (0 < IdiomCode) {
-				SMP_fprintf(InfoAnnotFile, " IDIOM %d CONST %llu %s \n", IdiomCode, (unsigned long long) ConstValue, disasm);
+			if (33 == IdiomCode) {
+				SMP_fprintf(InfoAnnotFile, " IDIOM %d %s \n", IdiomCode, disasm);
+			}
+			else if (0 < IdiomCode) {
+				SMP_fprintf(InfoAnnotFile, " IDIOM %d CONST %lu %s \n", IdiomCode, (unsigned long) ConstValue, disasm);
 			}
 			else {
 				SMP_fprintf(InfoAnnotFile, " %s \n", disasm);
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index 723ab2ad6511e912d7bc74e6c1f0174ddba324e6..fe572988db5d0cd6818287e49b4e1f5328ac2e73 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -1234,9 +1234,9 @@
             40fe25      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+48 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+30h] 
             40fe3c      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+208 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+0D0h] 
             40ff53      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbp+54h] 
-            40ff5b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, [rbp+34h]  ; len 
+            40ff5b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, [rbp+34h]  ; len 
             40ff6f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbp+60h] 
-            40ffbe      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 CONST 0 imul    edx, [rbp+44h] 
+            40ffbe      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 imul    edx, [rbp+44h] 
             410249     42 FUNC RETURNTYPE RAX 1
             410249     42 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             410273     12 FUNC RETURNTYPE RAX 0
@@ -1296,7 +1296,7 @@
             411a88    457 FUNC RETURNTYPE RAX 0
             411a88    457 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             411ba6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EBX ZZ sub     ebx, r13d 
-            411bec      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 1024000000 imul    rdx, rax, 3D090000h 
+            411bec      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rax, 3D090000h 
             411c0c      3 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 32 ECX ZZ mov     r8d, ecx 
             411c51   4860 FUNC RETURNTYPE RAX 1
             411c51   4860 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1418,7 +1418,7 @@
             415146   1145 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             415477      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+14 ZZ lea     rdi, [rax+0Eh] 
             4154c4      7 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, [rsp+198h+var_54] 
-            4154d2      8 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, [rsp+198h+var_50] 
+            4154d2      8 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, [rsp+198h+var_50] 
             4154da      7 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, [rsp+198h+var_48] 
             4155bf    421 FUNC RETURNTYPE RAX 1
             4155bf    421 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
@@ -2670,7 +2670,7 @@
             4352c7    947 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             435305      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+R14 ZZ IDIOM 32 lea     ecx, [rbp+r14-1] 
             435305      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+R14+-1 ZZ IDIOM 32 lea     ecx, [rbp+r14-1] 
-            435317      3 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 CONST 0 imul    edx, ecx 
+            435317      3 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 imul    edx, ecx 
             43531a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+RDX ZZ lea     rdi, [rsi+rdx+2] 
             43531a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+RDX+2 ZZ lea     rdi, [rsi+rdx+2] 
             4353af      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+4 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+4] 
@@ -2718,7 +2718,7 @@
             436a6b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+28 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [r13+1Ch] 
             436b1c   1405 FUNC RETURNTYPE RAX 1
             436b1c   1405 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            436c3e      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, 24h 
+            436c3e      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 imul    rdi, 24h 
             436d1a      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+1 ZZ lea     edi, [rbx+1]    ; nfds 
             436fed      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+8] 
             437099     37 FUNC RETURNTYPE RAX 1
@@ -2770,7 +2770,7 @@
             437e1a     20 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             437e2e    309 FUNC RETURNTYPE RAX 4
             437e2e    309 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 1 ARG5 0 
-            437e60      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 36 imul    rdi, 24h 
+            437e60      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, 24h 
             437e64      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, cs:qword_6CB490 
             437e6b      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8          ; s1 
             437efd      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+1 ZZ lea     edx, [r15+1] 
@@ -2946,7 +2946,7 @@
             43b582      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+3]    ; nptr 
             43b60a      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     edx, ebx 
             43b610      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, r13d 
-            43b627      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 20 imul    rdi, 14h 
+            43b627      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, 14h 
             43b62b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
             43b62d      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rcx] 
             43b633      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, 4 
@@ -2979,9 +2979,9 @@
             43bed8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RAX ZZ IDIOM 18 MEMORYSINK lea     rcx, [r12+rax]  ; tp 
             43bf00   1360 FUNC RETURNTYPE RAX 1
             43bf00   1360 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            43bfb2      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, 14h 
+            43bfb2      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 imul    rdi, 14h 
             43bfb6      4 INSTR CHECK OVERFLOW SIGNED 64 RDI ZZ imul    rdi, r12 
-            43bfca      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, 14h 
+            43bfca      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 imul    rdi, 14h 
             43bfce      4 INSTR CHECK OVERFLOW SIGNED 64 RDI ZZ imul    rdi, r12 
             43bfec      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ IDIOM 32 lea     edi, [r13+1] 
             43c196      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+65 ZZ IDIOM 18 STACKMEMSINK lea     rcx, [rbx+41h] 
@@ -2992,14 +2992,14 @@
             43c202      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+144 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+90h] 
             43c21e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+168 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+0A8h] 
             43c23a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+248 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+0F8h] 
-            43c258      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, rsi, 48h 
+            43c258      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, rsi, 48h 
             43c25e      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI*8 ZZ lea     rcx, ds:0[rsi*8] 
-            43c279      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, rsi 
-            43c27d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, 14h 
-            43c28d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, rsi 
-            43c291      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, 14h 
-            43c349      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, 48h 
-            43c353      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 56 imul    rdi, rbx, 38h 
+            43c279      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, rsi 
+            43c27d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, 14h 
+            43c28d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, rsi 
+            43c291      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, 14h 
+            43c349      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, 48h 
+            43c353      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, rbx, 38h 
             43c357      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RBP ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+rbp+0C0h]; tp 
             43c357      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RBP+192 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+rbp+0C0h]; tp 
             43c36a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+rbx*8+48h] 
@@ -3245,7 +3245,7 @@
             440425      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+10h] 
             44043e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx] 
             440698      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rax 
-            4406ae      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, [rbp+10h] 
+            4406ae      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [rbp+10h] 
             4406bf      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, [rsp+208h+var_200] 
             44070e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+48 ZZ IDIOM 32 lea     edx, [r15+30h] 
             44072e      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 30h 
@@ -3285,8 +3285,8 @@
             4411ba    305 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4412ac      4 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 16 CX ZZ IDIOM 5 movzx   r8, cx 
             4412b8      4 INSTR CHECK TRUNCATION UNSIGNED 64 RSI 16 SI ZZ IDIOM 5 movzx   rdx, si 
-            4412c0      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 100 imul    rdx, 64h 
-            4412c8      4 INSTR CHECK OVERFLOW UNSIGNED 64 R8 ZZ IDIOM 33 CONST 100 imul    r8, 64h 
+            4412c0      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, 64h 
+            4412c8      4 INSTR CHECK OVERFLOW UNSIGNED 64 R8 ZZ IDIOM 33 imul    r8, 64h 
             4412eb    278 FUNC RETURNTYPE RAX 0
             4412eb    278 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4413c6      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+rax-14h]; s 
@@ -3422,12 +3422,12 @@
             444a56    548 FUNC RETURNTYPE RAX 0
             444a56    548 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             444a97      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, [r12] 
-            444b6e      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 CONST 0 imul    edx, 3E8h       ; timeout 
+            444b6e      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 imul    edx, 3E8h       ; timeout 
             444c7a   1468 FUNC RETURNTYPE RAX 1
             444c7a   1468 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             444c7a   1468 FUNC PROBLEM sub_444C7A CALLUNRESOLVED 
             444cb9      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+64 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+40h] 
-            444d8f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, 68h 
+            444d8f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 imul    rdi, 68h 
             44502f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
             44504d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
             4451d5      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
@@ -3782,7 +3782,7 @@
             449faf      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+56 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+38h] 
             44a0e6    145 FUNC RETURNTYPE RAX 1
             44a0e6    145 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44a12a      7 INSTR CHECK OVERFLOW UNSIGNED 64 RCX ZZ IDIOM 33 CONST 1000 imul    rcx, rdx, 3E8h 
+            44a12a      7 INSTR CHECK OVERFLOW UNSIGNED 64 RCX ZZ IDIOM 33 imul    rcx, rdx, 3E8h 
             44a177    182 FUNC RETURNTYPE RAX 1
             44a177    182 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             44a1af      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ sub     rsi, rax 
@@ -4666,7 +4666,7 @@
             461785      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+10h]  ; preg 
             4617e0      5 INSTR MEMSET STACKOFFSET_ESP 32 SIZE 80 ZZ call    _memset 
             461816      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+56 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+38h]  ; preg 
-            4618da      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, rax 
+            4618da      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, rax 
             4618de      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rbx 
             46191f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rsp+0D8h+string]; src 
             461929      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 EBX ZZ mov     edx, ebx        ; n 
@@ -4689,35 +4689,35 @@
             4622da     49 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             46230b   2442 FUNC RETURNTYPE RAX 1
             46230b   2442 FUNC INARGS    2  ARG0 0 ARG1 4 
-            462629      5 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, [rsp+158h+var_130] 
-            462649      5 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, [rsp+158h+var_130] 
+            462629      5 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [rsp+158h+var_130] 
+            462649      5 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [rsp+158h+var_130] 
             462667      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ dec     edi 
             46280d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+104 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+68h]  ; buf 
             462876      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+236 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+0ECh] ; buf 
             4628a2      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+78h] 
             4628aa      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 14h 
             46298e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, eax 
-            4629a1      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
+            4629a1      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             4629b8      4 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, [rsp+158h+var_FC] 
             4629cb      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
             462a58      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RBX ZZ lea     rdi, [rax+rbx] 
             462a77      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX ZZ lea     rdi, [rbx+rax] 
             462aba      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [r12+rcx+8] 
-            462abf      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
-            462b1d      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
+            462abf      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
+            462b1d      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462b2b      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rax 
-            462b7e      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
+            462b7e      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462b86      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rax 
             462bae      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rdx+8] 
             462bb4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+RAX ZZ lea     edi, [rdi+rax+1] 
             462bb4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+RAX+1 ZZ lea     edi, [rdi+rax+1] 
-            462bb8      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
+            462bb8      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462c16      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
             462c18      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rsp+158h+var_11C] 
-            462c1c      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
+            462c1c      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462c2c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+20h]  ; dest 
             462c69      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rbx+8] 
-            462c6c      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rsp+158h+var_150] 
+            462c6c      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462c95     26 FUNC RETURNTYPE RAX 1
             462c95     26 FUNC INARGS    2  ARG0 4 ARG1 1 
             462caf     23 FUNC RETURNTYPE RAX 1
@@ -4766,7 +4766,7 @@
             463ab4   1364 FUNC RETURNTYPE RAX 1
             463ab4   1364 FUNC INARGS    2  ARG0 0 ARG1 4 
             463df7      4 INSTR CHECK TRUNCATION UNSIGNED 64 R14 16 R14 ZZ IDIOM 5 movzx   r8d, r14w 
-            463e35      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, [rsp+148h+var_114] 
+            463e35      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 imul    edi, [rsp+148h+var_114] 
             463e7f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+71 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+47h]  ; dest 
             463ee0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+90 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+5Ah] 
             464008    331 FUNC RETURNTYPE RAX 1
@@ -4896,11 +4896,11 @@
             4670db    871 FUNC RETURNTYPE RAX 0
             4670db    871 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             467104      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+3]    ; s1 
-            46728b      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, r8d 
+            46728b      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r8d 
             467337      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+-2 ZZ lea     esi, [rbp-2] 
-            467349      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, rax 
+            467349      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, rax 
             467350      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax 
-            467353      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, r15 
+            467353      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, r15 
             46738a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI*4 ZZ lea     rsi, [rax+rsi*4] 
             46738a      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+RSI*4 ZZ lea     rsi, [rax+rsi*4] 
             4673a4      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+-2 ZZ lea     eax, [rbp-2] 
@@ -4910,16 +4910,16 @@
             4674d3    757 FUNC RETURNTYPE RAX 0
             4674d3    757 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             467545      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
-            467563      3 INSTR CHECK OVERFLOW UNSIGNED 32 ECX ZZ IDIOM 33 CONST 0 imul    ecx, edx 
+            467563      3 INSTR CHECK OVERFLOW UNSIGNED 32 ECX ZZ IDIOM 33 imul    ecx, edx 
             467575      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+1024 ZZ lea     rsi, [r14+400h] 
             46759a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+37 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+25h] 
             4675aa      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+116 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+74h] 
             4675db      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+104 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+68h] 
             4675ed      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+288 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+120h] 
-            467653      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, r12d 
+            467653      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r12d 
             467657      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RSI ZZ lea     rsi, [r14+rsi] 
             46774e      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, edi 
-            467756      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, r12d 
+            467756      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r12d 
             46775a      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, r14 
             467790      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 16h 
             4677a4      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 27 add     rcx, rcx 
@@ -4954,7 +4954,7 @@
             467ba1    266 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             467bc6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+3]    ; s1 
             467be1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+72 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+48h] 
-            467c29      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 3 imul    esi, r12d, 3 
+            467c29      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r12d, 3 
             467c2d      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax 
             467c6e      2 INSTR CHECK OVERFLOW UNSIGNED 32  EBX ZZ add     ebx, edx 
             467c8a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RSI ZZ IDIOM 32 lea     rsi, [rax+rsi] 
@@ -5353,7 +5353,7 @@
             4702cb    258 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             470312      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 118h 
             470322      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 50h        ; env 
-            470350      6 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 CONST 100000 imul    edi, edx, 186A0h 
+            470350      6 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, edx, 186A0h 
             47035a      6 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 6105C200h 
             4703cd   2018 FUNC RETURNTYPE RAX 1
             4703cd   2018 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
@@ -5430,7 +5430,7 @@
             472c22   2379 FUNC RETURNTYPE RAX 1
             472c22   2379 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             472c4b      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+144 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+90h] 
-            472cbb      3 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 CONST 0 imul    edx, eax 
+            472cbb      3 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 imul    edx, eax 
             473206      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2824 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+0B08h] 
             473238      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1796 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+704h] 
             4733ed      3 INSTR CHECK OVERFLOW UNSIGNED 64  R9 ZZ inc     r9 
@@ -5559,7 +5559,7 @@
             47674a    926 FUNC RETURNTYPE RAX 0
             47674a    926 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             47689a      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R9+7 ZZ lea     edx, [r9+7] 
-            4768cc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, ebx 
+            4768cc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 imul    edi, ebx 
             476ae8     74 FUNC RETURNTYPE RAX 1
             476ae8     74 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             476b32    449 FUNC RETURNTYPE RAX 1
@@ -5610,7 +5610,7 @@
             47764f     49 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             477680    145 FUNC RETURNTYPE RAX 4
             477680    145 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
-            477691      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 CONST 0 imul    edx, cs:dword_6CB4D0, 7 
+            477691      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 imul    edx, cs:dword_6CB4D0, 7 
             477698      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 15h        ; n 
             477711     37 FUNC RETURNTYPE RAX 4
             477711     37 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
@@ -5619,18 +5619,18 @@
             477786      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ inc     rdx 
             477898   1058 FUNC RETURNTYPE RAX 0
             477898   1058 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47795b      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, cs:dword_6CB4D0, 7 
+            47795b      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, cs:dword_6CB4D0, 7 
             47797a      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A1h 
-            477ac7      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, cs:dword_6CB4D0, 7 
+            477ac7      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, cs:dword_6CB4D0, 7 
             477ae3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 14h 
             477ae6      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, eax 
             477afc      4 INSTR CHECK OVERFLOW UNSIGNED 64  R12 ZZ IDIOM 18 STACKMEMSINK add     r12, 1Ch 
-            477b43      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, cs:dword_6CB4D0, 0F8h 
+            477b43      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, cs:dword_6CB4D0, 0F8h 
             477b51      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 40h 
             477c4c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+R14 ZZ lea     esi, [r12+r14] 
             477c50      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+2 ZZ lea     edi, [r13+2] 
-            477c56      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 CONST 42 imul    rsi, 2Ah 
-            477c5a      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, r12d 
+            477c56      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, 2Ah 
+            477c5a      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, r12d 
             477c61      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax 
             477c68      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RDI ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rdx+rdi] 
             477c80      6 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ sub     eax, cs:dword_6CB4D0 
@@ -5683,9 +5683,9 @@
             478e6d    295 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             478f94   1402 FUNC RETURNTYPE RAX 1
             478f94   1402 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            479250      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, rax        ; length 
+            479250      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, rax        ; length 
             4792bd      4 INSTR CHECK OVERFLOW SIGNED 64 RSI ZZ imul    rsi, rax        ; offset 
-            47931d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, rax        ; offset 
+            47931d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, rax        ; offset 
             47950e    816 FUNC RETURNTYPE RAX 1
             47950e    816 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47979e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
@@ -5870,7 +5870,7 @@
             47da9c      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 9 sub     esi, 30h 
             47dae3      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, r12 
             47daef      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
-            47dafb      3 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, eax 
+            47dafb      3 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, eax 
             47db71   2254 FUNC RETURNTYPE RAX 1
             47db71   2254 FUNC INARGS    2  ARG0 0 ARG1 4 
             47db71   2254 FUNC PROBLEM sub_47DB71 CALLUNRESOLVED 
@@ -5878,7 +5878,7 @@
             47e2c7      3 INSTR CHECK UNDERFLOW SIGNED 64  RDI ZZ sub     rdi, r13 
             47e386      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RCX ZZ lea     rsi, [rdi+rcx-1] 
             47e386      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RCX+-1 ZZ lea     rsi, [rdi+rcx-1] 
-            47e39a      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, rcx 
+            47e39a      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, rcx 
             47e3ae      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R8+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [r8+rdi] 
             47e43f    102 FUNC RETURNTYPE RAX 0
             47e43f    102 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -6385,7 +6385,7 @@
             48b133   1517 FUNC RETURNTYPE RAX 1
             48b133   1517 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48b173      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     r8, [rax+4] 
-            48b4a8      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 144 imul    rdx, rbx, 90h 
+            48b4a8      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rbx, 90h 
             48b4c1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RBP ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
             48b4c1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
             48b50b      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r14d 
@@ -6393,7 +6393,7 @@
             48b51d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RBP ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
             48b51d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
             48b69f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+1] 
-            48b6c8      7 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 CONST 144 imul    rsi, 90h 
+            48b6c8      7 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, 90h 
             48b6cf      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+RBP ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+rbp+20h]; stat_buf 
             48b6cf      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+rbp+20h]; stat_buf 
             48b720     19 FUNC RETURNTYPE RAX 4
@@ -6633,7 +6633,7 @@
             48fd70      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ dec     rdi 
             48fdbc     47 FUNC RETURNTYPE RAX 1
             48fdbc     47 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
-            48fdbc      3 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 CONST 10 imul    edx, edi, 0Ah   ; timeout 
+            48fdbc      3 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 imul    edx, edi, 0Ah   ; timeout 
             48fdeb     39 FUNC RETURNTYPE RAX 0
             48fdeb     39 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48fe06      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 288h       ; env 
@@ -6771,7 +6771,7 @@
             4938f2    323 FUNC RETURNTYPE RAX 1
             4938f2    323 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             493968      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+-2 ZZ lea     rcx, [r14-2] 
-            49396c      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, rcx 
+            49396c      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rcx 
             493970      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDX ZZ lea     rdi, [rax+rdx+1] 
             493970      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDX+1 ZZ lea     rdi, [rax+rdx+1] 
             493a67     28 FUNC RETURNTYPE RAX 1
@@ -7663,7 +7663,7 @@
             4a2ac5     86 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4a2ae8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+R12 ZZ lea     esi, [rbp+r12+1] 
             4a2ae8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+R12+1 ZZ lea     esi, [rbp+r12+1] 
-            4a2af0      3 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, ebx 
+            4a2af0      3 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, ebx 
             4a2b1b     82 FUNC RETURNTYPE RAX 4
             4a2b1b     82 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             4a2b6d     34 FUNC RETURNTYPE RAX 4
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index a5f8ddb24b8e9c739811ef9006b18a4aba8a0020..2d3eb955f9fe70e3961203d38da4574d407cf984 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-c1644c4f1ead5ae5bfa2b3b45b1bcdcdf843366b
\ No newline at end of file
+ccc239a03cb1e8442fe4c65e2438d5f18c95bb28
\ No newline at end of file
diff --git a/tests/commit/save-firefox-bin.psexe.infoannot b/tests/commit/save-firefox-bin.psexe.infoannot
index 82c57c3ff3a586cf81b2c62d4273bde8d4ea1b49..a1b0d0d68824516d0977eb703fe5cd5f88b2928a 100644
--- a/tests/commit/save-firefox-bin.psexe.infoannot
+++ b/tests/commit/save-firefox-bin.psexe.infoannot
@@ -803,7 +803,7 @@
             417c90      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX*8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rax*8+20h] 
             417c90      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX*8+32 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rax*8+20h] 
             417ecb      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            417ee8      4 INSTR CHECK OVERFLOW UNSIGNED 64 R9 ZZ IDIOM 33 CONST 24 imul    r9, 18h 
+            417ee8      4 INSTR CHECK OVERFLOW UNSIGNED 64 R9 ZZ IDIOM 33 imul    r9, 18h 
             417f40   1275 FUNC RETURNTYPE RAX 4
             417f40   1275 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             418440   1498 FUNC RETURNTYPE RAX 96
diff --git a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
index d35e5c0cf566d70e0259ef466ac649e946082976..c70839e1a331d5b8ffa1dd5cb9b2e421e7a58d97 100644
--- a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-1aa6fcb5768fb083fe7e6937697caec82736df9a
\ No newline at end of file
+5091b89ca5c99b8fc7d520253c128c2bea76d538
\ No newline at end of file
diff --git a/tests/commit/save-gnome-calculator.psexe.infoannot b/tests/commit/save-gnome-calculator.psexe.infoannot
index ce6776a6577a705f77b06184f67373c67b617b5f..261082475c8296de1ca80ef2049e8f3cc143955f 100644
--- a/tests/commit/save-gnome-calculator.psexe.infoannot
+++ b/tests/commit/save-gnome-calculator.psexe.infoannot
@@ -904,7 +904,7 @@
             411170    271 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             411280    384 FUNC RETURNTYPE RAX 0
             411280    384 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            41135f      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, rbx, 1F50h 
+            41135f      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 imul    rdx, rbx, 1F50h 
             411373      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rcx 
             411400    178 FUNC RETURNTYPE RAX 0
             411400    178 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -1583,17 +1583,17 @@
             423680   4550 FUNC INARGS    5  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
             423680   4550 FUNC PROBLEM _mp_equation_parse CALLUNRESOLVED 
             423744      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+R14 ZZ lea     rax, [r14+r14] 
-            423758      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 8034 imul    rdi, r14, 1F62h 
+            423758      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, r14, 1F62h 
             42375f      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ SINKMALLOC add     rdi, 3E9Eh      ; size 
             423793      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+RBX ZZ lea     rdx, [rbx+rbx]  ; n 
             42379c      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+R14 ZZ lea     rdx, [r14+r14+1F4Fh] 
             42379c      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+R14+8015 ZZ lea     rdx, [r14+r14+1F4Fh] 
-            4237bc      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 8016 imul    rdx, 1F50h 
+            4237bc      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, 1F50h 
             4237c3      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, rcx 
-            4237d0      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, rbx, 1F50h ; n 
-            4237dc      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 8016 imul    rdx, r14, 1F50h 
+            4237d0      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 imul    rdx, rbx, 1F50h ; n 
+            4237dc      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, r14, 1F50h 
             4237e8      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, 1F4Fh 
-            4237fd      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 8016 imul    rdx, 1F50h 
+            4237fd      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, 1F50h 
             423804      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+190288h+dest] 
             423988      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+6 ZZ lea     rdi, [rax+6]    ; size 
             4239e0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+2] 
diff --git a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
index 35b19b5852ffee632bf1a25d285a131cb9f859d7..c7775e7e5c09cf538c9997ea3cc045156cdde9ae 100644
--- a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
@@ -4375,7 +4375,7 @@
             4992a0   1225 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 0 ARG4 1 ARG5 0 
             49946f      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edx, [rax+1] 
             499566      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ sub     edi, 1 
-            499569      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, rbp 
+            499569      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, rbp 
             49956d      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+0B8h+var_60]; dest 
             499770   2065 FUNC RETURNTYPE RAX 1
             499770   2065 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 4 
diff --git a/tests/commit/save-gnome-session.psexe.infoannot b/tests/commit/save-gnome-session.psexe.infoannot
index 9d8c0703bc6d7419c26f8fbd518dec4e92a7f1d3..a90b9111855f86009f89fa43e72e98e9d1f7eafe 100644
--- a/tests/commit/save-gnome-session.psexe.infoannot
+++ b/tests/commit/save-gnome-session.psexe.infoannot
@@ -1509,7 +1509,7 @@
             41d1a0     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41d3d0     33 FUNC RETURNTYPE RAX 1
             41d3d0     33 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41d3dc      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, eax, 3E8h 
+            41d3dc      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, eax, 3E8h 
             41d400     26 FUNC RETURNTYPE RAX 1
             41d400     26 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41d510    234 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-sound-recorder.psexe.infoannot b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
index bd8f9be57acb2118cea0bfdf204652c1ab44af12..6fdd917114c364295c81aec00f30814975898ef9 100644
--- a/tests/commit/save-gnome-sound-recorder.psexe.infoannot
+++ b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
@@ -607,8 +607,8 @@
             407190    591 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4071d7      3 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ neg     r8 
             4071e7      3 INSTR CHECK OVERFLOW UNSIGNED 64  R8 ZZ add     r8, rbx 
-            4071f4      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 18446744073709550176 imul    rdx, 0FFFFFFFFFFFFFA60h 
-            4071fb      4 INSTR CHECK OVERFLOW UNSIGNED 32 ECX ZZ IDIOM 33 CONST 60 imul    ecx, r11d 
+            4071f4      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, 0FFFFFFFFFFFFFA60h 
+            4071fb      4 INSTR CHECK OVERFLOW UNSIGNED 32 ECX ZZ IDIOM 33 imul    ecx, r11d 
             4073e0    873 FUNC RETURNTYPE RAX 1
             4073e0    873 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40751d      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rcx 
diff --git a/tests/commit/save-gnome-system-monitor.psexe.infoannot b/tests/commit/save-gnome-system-monitor.psexe.infoannot
index 9abb3281de0b74c42324c3cb57ebdca4d9a8b1fe..3757760d1fbe7a700122d226cfaa89ecd4618d5f 100644
--- a/tests/commit/save-gnome-system-monitor.psexe.infoannot
+++ b/tests/commit/save-gnome-system-monitor.psexe.infoannot
@@ -1457,7 +1457,7 @@
             4190f9      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+3 ZZ lea     edx, [rax+3] 
             41931f      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBP+1 ZZ lea     ecx, [rbp+1] 
             419322      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ IDIOM 32 lea     r9d, [r13+1] 
-            419373      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RAX ZZ IDIOM 33 CONST 0 imul    rax, rdx 
+            419373      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RAX ZZ IDIOM 33 imul    rax, rdx 
             419380      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, [rsp+0E8h+var_98] 
             41a054      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+12 ZZ lea     rdi, [rdx+0Ch] 
             41a51f      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+49 ZZ lea     esi, [rbp+31h] 
@@ -1811,7 +1811,7 @@
             4250b0    237 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4251a0    651 FUNC RETURNTYPE RAX 0
             4251a0    651 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42529e      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 CONST 100 imul    edx, r8d 
+            42529e      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 imul    edx, r8d 
             4252a2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, edx 
             425430    153 FUNC RETURNTYPE RAX 0
             425430    153 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-terminal.psexe.infoannot b/tests/commit/save-gnome-terminal.psexe.infoannot
index e2c16aee6bf1bebca9cd95e41f45ba824f6a5542..160d402f4383d3ac30197bbd8c8b9883d433191e 100644
--- a/tests/commit/save-gnome-terminal.psexe.infoannot
+++ b/tests/commit/save-gnome-terminal.psexe.infoannot
@@ -1975,7 +1975,7 @@
             41f690      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+64 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+40h] 
             41f6d0   1480 FUNC RETURNTYPE RAX 0
             41f6d0   1480 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41fb60      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 CONST 0 imul    edi, eax, 0Eh 
+            41fb60      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 imul    edi, eax, 0Eh 
             41fbbe      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ add     ebx, 1 
             41fbd3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rdx, [rax+1] 
             41fca0     16 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-grep.psexe.infoannot b/tests/commit/save-grep.psexe.infoannot
index 237561126f55e71fbcde8c7414a9b6134cae986e..ea9841cf8336fa165e6d69f9dbb5c18a0d2e1e93 100644
--- a/tests/commit/save-grep.psexe.infoannot
+++ b/tests/commit/save-grep.psexe.infoannot
@@ -554,7 +554,7 @@
             4139b0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4139c0    370 FUNC RETURNTYPE RAX 1
             4139c0    370 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 16 ARG3 1 ARG4 1 ARG5 0 
-            413a2b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, r15 
+            413a2b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 imul    rdi, r15 
             413a2f      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+68h+s2]; s1 
             413be0    259 FUNC RETURNTYPE RAX 4
             413be0    259 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-httpd.psexe.infoannot b/tests/commit/save-httpd.psexe.infoannot
index e72f713ed1f776768722a3d87fe8767982b37ddb..86b7f567f2247cdf96aa69ca009f0965599a805c 100644
--- a/tests/commit/save-httpd.psexe.infoannot
+++ b/tests/commit/save-httpd.psexe.infoannot
@@ -3790,7 +3790,7 @@
             463150   2479 FUNC RETURNTYPE RAX 1
             463150   2479 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             46339a      3 INSTR CHECK OVERFLOW SIGNED 32 EDX ZZ imul    edx, eax 
-            463799      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 CONST 0 imul    edx, eax 
+            463799      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 imul    edx, eax 
             463b00    154 FUNC RETURNTYPE RAX 0
             463b00    154 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             463ba0    263 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-ls-64bit.psexe.infoannot b/tests/commit/save-ls-64bit.psexe.infoannot
index cd3a1b66cf47d3e88fdbf71bdedb4299d0e5706c..99d32e59dcda34977a216cc6aa13718225830b13 100644
--- a/tests/commit/save-ls-64bit.psexe.infoannot
+++ b/tests/commit/save-ls-64bit.psexe.infoannot
@@ -433,7 +433,7 @@
             409bb0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             409bc0    295 FUNC RETURNTYPE RAX 1
             409bc0    295 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 16 ARG3 1 ARG4 1 ARG5 0 
-            409c27      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, r14 
+            409c27      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDI ZZ IDIOM 33 imul    rdi, r14 
             409c2b      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+68h+s2]; s1 
             409cf0    145 FUNC RETURNTYPE RAX 1
             409cf0    145 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
@@ -508,7 +508,7 @@
             40bf08      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R9 ZZ IDIOM 18 MEMORYSINK sub     r9, r8 
             40bf88      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R9 ZZ IDIOM 18 MEMORYSINK sub     r9, r8 
             40c06c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, rbx        ; src 
-            40c180      4 INSTR CHECK OVERFLOW UNSIGNED 64 RAX ZZ IDIOM 33 CONST 0 imul    rax, rdx 
+            40c180      4 INSTR CHECK OVERFLOW UNSIGNED 64 RAX ZZ IDIOM 33 imul    rax, rdx 
             40c240    450 FUNC RETURNTYPE RAX 1
             40c240    450 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40c410    157 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-lt-svn.psexe.infoannot b/tests/commit/save-lt-svn.psexe.infoannot
index 3e50268164361a5ca0bfa9f7ae6486ad55e548bf..4fec95cf7a4ae09a8c30a912edba66c88e8a022d 100644
--- a/tests/commit/save-lt-svn.psexe.infoannot
+++ b/tests/commit/save-lt-svn.psexe.infoannot
@@ -835,7 +835,7 @@
             41c4e7      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
             41c7e1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+72 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+48h]  ; notify_baton_p 
             41c7e8      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 40h        ; notify_func_p 
-            41cc17      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 11 CONST 18446744073709551488 sub     rdi, 0FFFFFFFFFFFFFF80h 
+            41cc17      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 11 CONST 4294967168 sub     rdi, 0FFFFFFFFFFFFFF80h 
             41ce60   1201 FUNC RETURNTYPE RAX 96
             41ce60   1201 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 0 
             41cfae      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     r8, [opt_state+8] 
diff --git a/tests/commit/save-nginx.psexe.infoannot b/tests/commit/save-nginx.psexe.infoannot
index 73e4360f8c31448a154e167066d8b72f901b0d7b..b9bcff379fef166d0e46a34abe10ba22a2cb230d 100644
--- a/tests/commit/save-nginx.psexe.infoannot
+++ b/tests/commit/save-nginx.psexe.infoannot
@@ -475,7 +475,7 @@
             40641d    149 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4064b4    129 FUNC RETURNTYPE RAX 4
             4064b4    129 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 4 ARG5 0 
-            4064fe      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, n          ; size 
+            4064fe      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, n          ; size 
             406535     44 FUNC RETURNTYPE RAX 4
             406535     44 FUNC INARGS    2  ARG0 4 ARG1 0 
             406561    160 FUNC RETURNTYPE RAX 0
@@ -483,14 +483,14 @@
             4065ab      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RBP ZZ lea     rsi, [size+size+0]; size 
             406601    200 FUNC RETURNTYPE RAX 0
             406601    200 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            406669      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, nalloc     ; size 
-            406683      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, [a+8]      ; n 
+            406669      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, nalloc     ; size 
+            406683      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 imul    rdx, [a+8]      ; n 
             4066cc    145 FUNC RETURNTYPE RAX 4
             4066cc    145 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 1 ARG3 4 ARG4 1 ARG5 0 
-            406702      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, n          ; size 
+            406702      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, n          ; size 
             40675d    156 FUNC RETURNTYPE RAX 0
             40675d    156 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40679a      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, [l+28h]    ; size 
+            40679a      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [l+28h]    ; size 
             406800    117 FUNC RETURNTYPE RAX 0
             406800    117 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 4 ARG3 0 
             406875    224 FUNC RETURNTYPE RAX 4
@@ -559,7 +559,7 @@
             407b62     38 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             407b88    191 FUNC RETURNTYPE RAX 0
             407b88    191 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            407b9f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, [bufs+8]   ; size 
+            407b9f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [bufs+8]   ; size 
             407c47    102 FUNC RETURNTYPE RAX 1
             407c47    102 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             407cad    121 FUNC RETURNTYPE RAX 4
@@ -1059,7 +1059,7 @@
             4147c0     64 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 1 
             414800    277 FUNC RETURNTYPE RAX 4
             414800    277 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
-            414834      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 CONST 110 imul    rsi, n, 6Eh     ; size 
+            414834      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, n, 6Eh     ; size 
             414915    320 FUNC RETURNTYPE RAX 1
             414915    320 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             414a55    120 FUNC RETURNTYPE RAX 0
@@ -1497,7 +1497,7 @@
             4209fa   2394 FUNC RETURNTYPE RAX 0
             4209fa   2394 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             420b7d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1]    ; dst 
-            420c71      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 1000 imul    rdx, 3E8h 
+            420c71      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, 3E8h 
             420d95      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 GLOBALMEMSINK add     rdi, 85E188h    ; fd 
             420ec0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*2 ZZ lea     rdx, [rax+rax*2] 
             420ec0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RAX*2 ZZ lea     rdx, [rax+rax*2] 
@@ -2278,7 +2278,7 @@
             439668     36 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43968c     17 FUNC RETURNTYPE RAX 4
             43968c     17 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            439690      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 CONST 0 imul    esi, edx        ; size 
+            439690      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, edx        ; size 
             43969d    216 FUNC RETURNTYPE RAX 4
             43969d    216 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             439775     37 FUNC RETURNTYPE RAX 0
@@ -2700,7 +2700,7 @@
             4412f9      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*4 ZZ lea     v, [rax+rdx*4] 
             4412f9      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RDX*4 ZZ lea     v, [rax+rdx*4] 
             4412fd      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, rsi        ; size 
-            44134b      8 INSTR CHECK OVERFLOW UNSIGNED 64 RCX ZZ IDIOM 33 CONST 1000 imul    rcx, [rax+18h], 3E8h 
+            44134b      8 INSTR CHECK OVERFLOW UNSIGNED 64 RCX ZZ IDIOM 33 imul    rcx, [rax+18h], 3E8h 
             441371      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rax 
             44137b      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     ms, rax 
             441399      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+1 ZZ lea     rax, [i+1] 
@@ -3069,7 +3069,7 @@
             44c165     98 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             44c1c7     42 FUNC RETURNTYPE RAX 0
             44c1c7     42 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
-            44c1cb      7 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 CONST 1000 imul    edi, [cache+48h], 3E8h; useconds 
+            44c1cb      7 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [cache+48h], 3E8h; useconds 
             44c1f1    343 FUNC RETURNTYPE RAX 4
             44c1f1    343 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44c1f1    343 FUNC PROBLEM ngx_http_file_cache_lock_wait_handler CALLUNRESOLVED 
@@ -3367,7 +3367,7 @@
             454332   2559 FUNC RETURNTYPE RAX 1
             454332   2559 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             454332   2559 FUNC PROBLEM ngx_http_charset_body_filter CALLUNRESOLVED 
-            4545e7      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, rax 
+            4545e7      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rax 
             4545eb      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, rax 
             4545ee      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, r12        ; size 
             454937      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [ctx+38h]  ; dest 
@@ -3465,7 +3465,7 @@
             456b4b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 1          ; len 
             456b69      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, last_0     ; size 
             456c52      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX*4 ZZ lea     rdx, ds:0[rax*4] 
-            456c69      5 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rdx+8] 
+            456c69      5 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rdx+8] 
             456c6e      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rbx+30h]  ; t 
             456e42      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
             456fa0     65 FUNC RETURNTYPE RAX 1
@@ -3600,11 +3600,11 @@
             459929      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
             45993f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
             4599e5      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
-            4599f5      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, [rax], 3E8h 
+            4599f5      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, [rax], 3E8h 
             4599fc      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, [rax+8] 
             459a0e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, [rbx+18h] 
             459a1c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, rax 
-            459a1f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, [rbp+10h] 
+            459a1f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RDX ZZ IDIOM 33 imul    rdx, [rbp+10h] 
             459a56      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
             459afb      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 18h 
             459b08      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R9 ZZ sub     r9, rax 
@@ -7091,7 +7091,7 @@
             4b9883      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX*8+8 ZZ lea     edi, ds:8[rdx*8] 
             4b9f70   1634 FUNC RETURNTYPE RAX 1
             4b9f70   1634 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4ba0cb      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, rax 
+            4ba0cb      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rax 
             4ba0cf      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX*8 ZZ lea     edi, ds:8[rdx*8] 
             4ba0cf      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX*8+8 ZZ lea     edi, ds:8[rdx*8] 
             4ba1a6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+48 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+30h] 
@@ -12011,7 +12011,7 @@
             50f8e0    406 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 1 
             50fa80    345 FUNC RETURNTYPE RAX 1
             50fa80    345 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 1 ARG4 4 ARG5 0 
-            50fba2      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 11 CONST 18446744073709551600 add     rdx, 0FFFFFFFFFFFFFFF0h 
+            50fba2      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 11 CONST 4294967280 add     rdx, 0FFFFFFFFFFFFFFF0h 
             50fbe0     31 FUNC RETURNTYPE RAX 1
             50fbe0     31 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 4 ARG3 1 
             50fc00     33 FUNC RETURNTYPE RAX 0
@@ -12567,7 +12567,7 @@
             5318c0    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             531970    840 FUNC RETURNTYPE RAX 1
             531970    840 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            531a81      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, [rbx] 
+            531a81      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, [rbx] 
             531cc0    393 FUNC RETURNTYPE RAX 1
             531cc0    393 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 4 ARG5 0 
             531dc1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+80 ZZ IDIOM 18 MEMORYSINK lea     r8, [r15+50h] 
diff --git a/tests/commit/save-openssl.psexe.infoannot b/tests/commit/save-openssl.psexe.infoannot
index 6aed76101e9d11b25dd243d9b65b1a8a954e2812..c426c1b79f5b8a06e0c0a3b46de58172ced5373b 100644
--- a/tests/commit/save-openssl.psexe.infoannot
+++ b/tests/commit/save-openssl.psexe.infoannot
@@ -4169,7 +4169,7 @@
             4bdb80    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4bdc30    840 FUNC RETURNTYPE RAX 1
             4bdc30    840 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            4bdd41      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 CONST 0 imul    rcx, [rbx] 
+            4bdd41      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RCX ZZ IDIOM 33 imul    rcx, [rbx] 
             4bdf80    393 FUNC RETURNTYPE RAX 1
             4bdf80    393 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 4 ARG5 0 
             4be081      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+80 ZZ IDIOM 18 MEMORYSINK lea     r8, [r15+50h] 
@@ -4374,7 +4374,7 @@
             4c0e73      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX*8+8 ZZ lea     edi, ds:8[rdx*8] 
             4c1560   1634 FUNC RETURNTYPE RAX 1
             4c1560   1634 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4c16bb      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 CONST 0 imul    rdx, rax 
+            4c16bb      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rax 
             4c16bf      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX*8 ZZ lea     edi, ds:8[rdx*8] 
             4c16bf      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX*8+8 ZZ lea     edi, ds:8[rdx*8] 
             4c1796      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+48 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+30h] 
@@ -12650,7 +12650,7 @@
             5636a0    406 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 1 
             563840    345 FUNC RETURNTYPE RAX 1
             563840    345 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 1 ARG4 4 ARG5 0 
-            563962      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 11 CONST 18446744073709551600 add     rdx, 0FFFFFFFFFFFFFFF0h 
+            563962      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 11 CONST 4294967280 add     rdx, 0FFFFFFFFFFFFFFF0h 
             5639a0     31 FUNC RETURNTYPE RAX 1
             5639a0     31 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 4 ARG3 1 
             5639c0     33 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-xedit.psexe.infoannot b/tests/commit/save-xedit.psexe.infoannot
index 9faddd0547e8f648185dd880343e9a02175fad94..98fd23fb96f10cd44bc910c84c3d084cdef7d0af 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -2235,9 +2235,9 @@
             46c57f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+0D8h+var_60] 
             46c61a      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R9 ZZ add     r9, [rsp+0D8h+var_90] 
             46c679      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+0D8h+var_60] 
-            46c72c      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, [rsp+0D8h+var_50] 
-            46c781      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, [rsp+0D8h+s] 
-            46c7d7      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 CONST 0 imul    rsi, [rsp+0D8h+var_48] 
+            46c72c      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+var_50] 
+            46c781      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+s] 
+            46c7d7      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+var_48] 
             46c858      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, [rsp+0D8h+var_A8] 
             46cb14      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+rdx*4] 
             46cb14      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RDX*4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+rdx*4]