diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 07e5c4d94e1fd445a6f08478e8765f7373804a6f..e67aff23143c629ee13cae00f86ebb1934e55d61 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -8167,7 +8167,7 @@ void SMPFunction::EmitAnnotations(FILE *AnnotFile, FILE *InfoAnnotFile) {
 		}
 
 #ifndef SMP_REDUCED_ANALYSIS
-		if (this->StackPtrAnalysisSucceeded() && this->HasGoodRTLs() && !this->HasUnresolvedIndirectJumps() && !this->HasSharedChunks()) {
+		if (this->StackPtrAnalysisSucceeded() && this->HasGoodRTLs() && !this->HasUnresolvedIndirectJumps()) {
 			CurrInst->EmitTypeAnnotations(this->UseFP, AllocSeen, this->NeedsStackReferent, AnnotFile, InfoAnnotFile);
 			CurrInst->EmitIntegerErrorAnnotations(InfoAnnotFile, LoopList);
 		}
diff --git a/src/base/SMPProgram.cpp b/src/base/SMPProgram.cpp
index 8142a9b6d2892901695e49cbd057b19ae6676be9..4c2829394bf45ab986dfd495e3033462adbdc13f 100644
--- a/src/base/SMPProgram.cpp
+++ b/src/base/SMPProgram.cpp
@@ -516,9 +516,9 @@ void SMPProgram::Analyze(ProfilerInformation *pi, FILE *AnnotFile, FILE *InfoAnn
 		}
 
 #if SMP_USE_SWITCH_TABLE_INFO
-		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps()) {
 #else
-		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps()) {
 #endif
 #if SMP_DEBUG_OPTIMIZATIONS
 			SMP_msg("Analyzing metadata for function %s\n", CurrFunc->GetFuncName());
@@ -541,9 +541,9 @@ void SMPProgram::Analyze(ProfilerInformation *pi, FILE *AnnotFile, FILE *InfoAnn
 		}
 
 #if SMP_USE_SWITCH_TABLE_INFO
-		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps()) {
 #else
-		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps()) {
 #endif
 #if SMP_DEBUG_OPTIMIZATIONS
 			SMP_msg("Inferring types for function %s\n", CurrFunc->GetFuncName());
@@ -597,9 +597,9 @@ void SMPProgram::Analyze(ProfilerInformation *pi, FILE *AnnotFile, FILE *InfoAnn
 				continue;
 			}
 #if SMP_USE_SWITCH_TABLE_INFO
-			if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+			if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps()) {
 #else
-			if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+			if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps()) {
 #endif
 				changed |= CurrFunc->InferInterproceduralTypes();
 			}
@@ -618,9 +618,9 @@ void SMPProgram::Analyze(ProfilerInformation *pi, FILE *AnnotFile, FILE *InfoAnn
 			continue;
 		}
 #if SMP_USE_SWITCH_TABLE_INFO
-		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasUnresolvedIndirectJumps()) {
 #else
-		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps() && !CurrFunc->HasSharedChunks()) {
+		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs() && !CurrFunc->HasIndirectJumps()) {
 #endif
 			CurrFunc->GatherIncomingArgTypes();
 		}
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index 76b310eb6733797514775ecb1e36fb17b5213f92..5698f117b0c709d9fb465d835b7952c5ddad21c9 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -779,7 +779,7 @@
             4078d1     15 FUNC RETURNTYPE RAX 1
             4078d1     15 FUNC INARGS    4  ARG0 96 ARG1 0 ARG2 96 ARG3 96 
             4078e0    174 FUNC RETURNTYPE RAX 0
-            4078e0    174 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
+            4078e0    174 FUNC INARGS    6  ARG0 16 ARG1 96 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             40798e     19 FUNC RETURNTYPE RAX 0
             40798e     19 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             4079a1    390 FUNC RETURNTYPE RAX 1
@@ -894,7 +894,7 @@
             408575      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             40857a      7 FUNC RETURNTYPE RAX 96
             40857a      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
-            408581     48 FUNC RETURNTYPE RAX 0
+            408581     48 FUNC RETURNTYPE RAX 1
             408581     48 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             4085b1     30 FUNC RETURNTYPE RAX 0
             4085b1     30 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
@@ -950,7 +950,8 @@
             408944     71 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
             40898b    189 FUNC RETURNTYPE RAX 4
             40898b    189 FUNC INARGS    6  ARG0 16 ARG1 96 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
-            408b2a      7 FUNC RETURNTYPE RAX 0
+            408b2a      7 FUNC RETURNTYPE RAX 1
+            408b2a      7 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             408b2a      7 FUNC PROBLEM sub_408B2A CHUNKS 
             408b31     13 FUNC RETURNTYPE RAX 1
             408b31     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 0 
@@ -973,7 +974,7 @@
             408cea     48 FUNC RETURNTYPE RAX 1
             408cea     48 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 4 
             408d1a     32 FUNC RETURNTYPE RAX 0
-            408d1a     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            408d1a     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 1 ARG4 1 ARG5 0 
             408d3a     35 FUNC RETURNTYPE RAX 0
             408d3a     35 FUNC INARGS    6  ARG0 96 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             408d5d    881 FUNC RETURNTYPE RAX 4
@@ -1602,7 +1603,7 @@
             41aed5     52 FUNC RETURNTYPE RAX 0
             41aed5     52 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41af09     52 FUNC RETURNTYPE RAX 0
-            41af09     52 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            41af09     52 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             41af3d    158 FUNC RETURNTYPE RAX 4
             41af3d    158 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             41af6e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBX*2 ZZ lea     edi, [rax+rbx*2+2] 
@@ -1642,7 +1643,7 @@
             41bb97      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   ecx, bl 
             41bd14      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
             41bd48      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
-            41bd76      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rdi, [rax+4] 
+            41bd76      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
             41bef4    259 FUNC RETURNTYPE RAX 96
             41bef4    259 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41bff7    385 FUNC RETURNTYPE RAX 0
@@ -2189,20 +2190,31 @@
             42793d    272 FUNC RETURNTYPE RAX 0
             42793d    272 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427a4d     60 FUNC RETURNTYPE RAX 0
-            427a4d     60 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            427a4d     60 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427a89    260 FUNC RETURNTYPE RAX 1
-            427a89    260 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            427a89    260 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 1 ARG4 1 ARG5 0 
             427b35      2 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 32 EDI ZZ IDIOM 14 mov     ecx, edi 
             427b8d     87 FUNC RETURNTYPE RAX 0
-            427b8d     87 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            427b8d     87 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427bc8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 8 
             427be4    325 FUNC RETURNTYPE RAX 0
-            427be4    325 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            427be4    325 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             427c9f      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, qword ptr cs:termios_p.c_cc+13h 
             428501     10 FUNC RETURNTYPE RAX 0
             428501     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             42850b      7 FUNC RETURNTYPE RAX 0
+            42850b      7 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 0 
             42850b      7 FUNC PROBLEM sub_42850B CHUNKS 
+            427e44      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            427ea3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rdi, [rax+4] 
+            427ed3      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 88h 
+            427efb      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
+            427f35      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
+            427f76      5 INSTR MEMSET STACKOFFSET_ESP 176 SIZE 32 ZZ call    _memset 
+            428245      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 0Ch 
+            428286      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+4]    ; optval 
+            4282b5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
+            428412      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, r13d 
             428512    697 FUNC RETURNTYPE RAX 1
             428512    697 FUNC INARGS    2  ARG0 0 ARG1 4 
             4287a8      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ inc     ecx 
@@ -2242,7 +2254,7 @@
             429748     55 FUNC RETURNTYPE RAX 0
             429748     55 FUNC INARGS    6  ARG0 16 ARG1 16 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             42977f     52 FUNC RETURNTYPE RAX 4
-            42977f     52 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
+            42977f     52 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             4297b3   2016 FUNC RETURNTYPE RAX 0
             4297b3   2016 FUNC INARGS    2  ARG0 0 ARG1 4 
             429899      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK inc     rdx 
@@ -2335,8 +2347,25 @@
             42cbfb      2 INSTR CHECK TRUNCATION SIGNED 32 EBP 32 EBP ZZ mov     esi, ebp 
             42d08d     10 FUNC RETURNTYPE RAX 0
             42d08d     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            42d097      7 FUNC RETURNTYPE RAX 0
+            42d097      7 FUNC RETURNTYPE RAX 1
+            42d097      7 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42d097      7 FUNC PROBLEM sub_42D097 CHUNKS 
+            42c3b4      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            42c505      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r15+18h]  ; optval 
+            42c5eb      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 16 BP ZZ IDIOM 5 movzx   edx, bp 
+            42c5ff      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+4]    ; optval 
+            42c626      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+4] 
+            42c658      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
+            42c6c7      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
+            42c6d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
+            42c6f0      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
+            42c770      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
+            42c8ef      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [r15+24h] 
+            42c8f7      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
+            42c91c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+4] 
+            42c929      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edx, eax 
+            42cf68      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+44 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r15+2Ch] 
+            42d050      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
             42d09e    416 FUNC RETURNTYPE RAX 1
             42d09e    416 FUNC INARGS    2  ARG0 0 ARG1 0 
             42d23e     55 FUNC RETURNTYPE RAX 4
@@ -2596,6 +2625,7 @@
             4344c4     43 FUNC RETURNTYPE RAX 4
             4344c4     43 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             4344ef     43 FUNC RETURNTYPE RAX 0
+            4344ef     43 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4344ef     43 FUNC PROBLEM sub_4344EF CHUNKS 
             43451a     71 FUNC RETURNTYPE RAX 4
             43451a     71 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3298,6 +3328,7 @@
             441576      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RAX ZZ IDIOM 18 MEMORYSINK dec     rax 
             4415d8    792 FUNC RETURNTYPE RAX 0
             4415d8    792 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            44189e      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax        ; inc 
             4418f0     60 FUNC RETURNTYPE RAX 0
             4418f0     60 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             44192c     22 FUNC RETURNTYPE RAX 1
@@ -4229,7 +4260,7 @@
             4555a0    228 FUNC RETURNTYPE RAX 1
             4555a0    228 FUNC INARGS    1  ARG0 0 
             455776     91 FUNC RETURNTYPE RAX 0
-            455776     91 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
+            455776     91 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             4557c7      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
             4557ca      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; signo 
             4557d1     51 FUNC RETURNTYPE RAX 0
@@ -6930,9 +6961,9 @@
             496ed6    122 FUNC RETURNTYPE RAX 4
             496ed6    122 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             496f50     79 FUNC RETURNTYPE RAX 0
-            496f50     79 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            496f50     79 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             496f9f     79 FUNC RETURNTYPE RAX 0
-            496f9f     79 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            496f9f     79 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             496fee     93 FUNC RETURNTYPE RAX 0
             496fee     93 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49704b     31 FUNC RETURNTYPE RAX 4
@@ -7323,9 +7354,12 @@
             49e251      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+116 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+74h] 
             49e27c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+4] 
             49e285      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+112 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+70h] 
-            49e425     17 FUNC RETURNTYPE RAX 0
+            49e425     17 FUNC RETURNTYPE RAX 4
+            49e425     17 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49e425     17 FUNC PROBLEM sub_49E425 CHUNKS CALLUNRESOLVED 
-            49e436     17 FUNC RETURNTYPE RAX 0
+            49e400      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rbp+0] 
+            49e40c      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, 4 
+            49e436     17 FUNC RETURNTYPE RAX 4
             49e436     17 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             49e447    607 FUNC RETURNTYPE RAX 0
             49e447    607 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -7407,7 +7441,7 @@
             4a0373     91 FUNC RETURNTYPE RAX 0
             4a0373     91 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a03ce    103 FUNC RETURNTYPE RAX 1
-            4a03ce    103 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
+            4a03ce    103 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             4a0435    210 FUNC RETURNTYPE RAX 0
             4a0435    210 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             4a0461      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX+4 ZZ lea     edi, [rdx+4] 
@@ -7483,7 +7517,7 @@
             4a0f28     55 FUNC RETURNTYPE RAX 0
             4a0f28     55 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a0f5f     95 FUNC RETURNTYPE RAX 1
-            4a0f5f     95 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            4a0f5f     95 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 0 
             4a0fbe      5 FUNC RETURNTYPE RAX 0
             4a0fbe      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 8 ARG3 96 
             4a0fc3    105 FUNC RETURNTYPE RAX 4
@@ -7492,11 +7526,16 @@
             4a102c     87 FUNC RETURNTYPE RAX 1
             4a102c     87 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4a1083     37 FUNC RETURNTYPE RAX 1
-            4a1083     37 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
+            4a1083     37 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 0 
             4a1195     17 FUNC RETURNTYPE RAX 1
             4a1195     17 FUNC INARGS    2  ARG0 8 ARG1 1 
-            4a11a6     12 FUNC RETURNTYPE RAX 0
+            4a11a6     12 FUNC RETURNTYPE RAX 96
+            4a11a6     12 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a11a6     12 FUNC PROBLEM sub_4A11A6 CHUNKS 
+            4a1114      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+6 ZZ lea     esi, [r12+6] 
+            4a112b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+rdi] 
+            4a1143      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+R12 ZZ lea     esi, [rbx+r12+1] 
+            4a1143      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+R12+1 ZZ lea     esi, [rbx+r12+1] 
             4a11b2     24 FUNC RETURNTYPE RAX 0
             4a11b2     24 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a11ca    137 FUNC RETURNTYPE RAX 1
@@ -7549,7 +7588,7 @@
             4a1e52     30 FUNC RETURNTYPE RAX 1
             4a1e52     30 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4a1e70     20 FUNC RETURNTYPE RAX 1
-            4a1e70     20 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
+            4a1e70     20 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             4a1e84     38 FUNC RETURNTYPE RAX 0
             4a1e84     38 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4a1eaa     21 FUNC RETURNTYPE RAX 0
@@ -7557,8 +7596,9 @@
             4a1ebf     43 FUNC RETURNTYPE RAX 0
             4a1ebf     43 FUNC INARGS    6  ARG0 96 ARG1 4 ARG2 16 ARG3 4 ARG4 0 ARG5 0 
             4a1eea    268 FUNC RETURNTYPE RAX 1
-            4a1eea    268 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
-            4a2062     23 FUNC RETURNTYPE RAX 0
+            4a1eea    268 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
+            4a2062     23 FUNC RETURNTYPE RAX 96
+            4a2062     23 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a2062     23 FUNC PROBLEM sub_4A2062 CHUNKS 
             4a2079     17 FUNC RETURNTYPE RAX 4
             4a2079     17 FUNC INARGS    3  ARG0 0 ARG1 1 ARG2 1 
@@ -7580,7 +7620,8 @@
             4a20ef      8 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
             4a20f7    263 FUNC RETURNTYPE RAX 1
             4a20f7    263 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
-            4a2280     33 FUNC RETURNTYPE RAX 0
+            4a2280     33 FUNC RETURNTYPE RAX 1
+            4a2280     33 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a2280     33 FUNC PROBLEM sub_4A2280 CHUNKS 
             4a22a1     19 FUNC RETURNTYPE RAX 1
             4a22a1     19 FUNC INARGS    3  ARG0 0 ARG1 1 ARG2 1 
@@ -7604,17 +7645,20 @@
             4a2334     25 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4a2403     10 FUNC RETURNTYPE RAX 96
             4a2403     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
-            4a240d     10 FUNC RETURNTYPE RAX 0
+            4a240d     10 FUNC RETURNTYPE RAX 96
+            4a240d     10 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 96 ARG3 96 
             4a240d     10 FUNC PROBLEM sub_4A240D CHUNKS 
             4a2417     10 FUNC RETURNTYPE RAX 96
             4a2417     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
             4a2421     10 FUNC RETURNTYPE RAX 96
-            4a2421     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
+            4a2421     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             4a242b    149 FUNC RETURNTYPE RAX 0
             4a242b    149 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4a24a3      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+4 ZZ lea     edi, [rbp+4] 
-            4a2529     10 FUNC RETURNTYPE RAX 0
+            4a2529     10 FUNC RETURNTYPE RAX 4
+            4a2529     10 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a2529     10 FUNC PROBLEM sub_4A2529 CHUNKS CALLUNRESOLVED 
+            4a24eb      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
             4a2533     10 FUNC RETURNTYPE RAX 4
             4a2533     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4a253d    629 FUNC RETURNTYPE RAX 4
@@ -7634,11 +7678,11 @@
             4a27ea    108 FUNC RETURNTYPE RAX 1
             4a27ea    108 FUNC INARGS    6  ARG0 16 ARG1 16 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4a2856     61 FUNC RETURNTYPE RAX 0
-            4a2856     61 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
+            4a2856     61 FUNC INARGS    6  ARG0 96 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             4a2893     50 FUNC RETURNTYPE RAX 0
             4a2893     50 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             4a28af      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+4] 
-            4a28c5     26 FUNC RETURNTYPE RAX 0
+            4a28c5     26 FUNC RETURNTYPE RAX 4
             4a28df     26 FUNC RETURNTYPE RAX 0
             4a28f9     71 FUNC RETURNTYPE RAX 0
             4a28f9     71 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
@@ -7652,7 +7696,7 @@
             4a29cc     10 FUNC RETURNTYPE RAX 0
             4a29cc     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 96 
             4a29d6     81 FUNC RETURNTYPE RAX 0
-            4a29d6     81 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            4a29d6     81 FUNC INARGS    6  ARG0 96 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             4a2a27    129 FUNC RETURNTYPE RAX 1
             4a2a27    129 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a2aa8     29 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index c71df1a0ac6a2764b8cd7d4e2626157237a2f76f..7d9eedcc5c0b9cba168540666834995c06bc9891 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-c8e20e151ca42c5660a9feea8d86b788356249ac
\ No newline at end of file
+4a5f8edbee4fa8b9d4520a164fe36c3125f69ef2
\ No newline at end of file
diff --git a/tests/commit/save-gedit.psexe.infoannot b/tests/commit/save-gedit.psexe.infoannot
index 01095f5f1555c94a2cb7431d522ad161d55652b3..ce99b8052d7d7bb5e04243d202a1244c323c9ae0 100644
--- a/tests/commit/save-gedit.psexe.infoannot
+++ b/tests/commit/save-gedit.psexe.infoannot
@@ -2882,7 +2882,8 @@
             430dc0    267 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             430ed0    449 FUNC RETURNTYPE RAX 1
             430ed0    449 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            431c10     23 FUNC RETURNTYPE RAX 0
+            431c10     23 FUNC RETURNTYPE RAX 4
+            431c10     23 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431c10     23 FUNC PROBLEM sub_431C10 CHUNKS 
             431c30     23 FUNC RETURNTYPE RAX 4
             431c30     23 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -3368,8 +3369,11 @@
             446960    202 FUNC RETURNTYPE RAX 1
             446960    202 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4469a6      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rsi 
-            446a30     10 FUNC RETURNTYPE RAX 0
+            446a30     10 FUNC RETURNTYPE RAX 96
+            446a30     10 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             446a30     10 FUNC PROBLEM gedit_utils_str_middle_truncate CHUNKS 
+            445d5b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
+            445e30      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
             446a40      7 FUNC RETURNTYPE RAX 1
             446a40      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             446a50    333 FUNC RETURNTYPE RAX 1
@@ -3468,7 +3472,7 @@
             449fe0    191 FUNC RETURNTYPE RAX 0
             449fe0    191 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a0a0     99 FUNC RETURNTYPE RAX 0
-            44a0a0     99 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            44a0a0     99 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             44a2a0    412 FUNC RETURNTYPE RAX 4
             44a2a0    412 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a440     21 FUNC RETURNTYPE RAX 1
@@ -3489,8 +3493,9 @@
             44b170     25 FUNC RETURNTYPE RAX 1
             44b170     25 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44b190    133 FUNC RETURNTYPE RAX 1
-            44b190    133 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            44b220    359 FUNC RETURNTYPE RAX 0
+            44b190    133 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            44b220    359 FUNC RETURNTYPE RAX 1
+            44b220    359 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44b220    359 FUNC PROBLEM sub_44B220 CHUNKS 
             44b550    208 FUNC RETURNTYPE RAX 0
             44b550    208 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4673,7 +4678,8 @@
             478490    194 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             478560    135 FUNC RETURNTYPE RAX 1
             478560    135 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            478810     96 FUNC RETURNTYPE RAX 0
+            478810     96 FUNC RETURNTYPE RAX 1
+            478810     96 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             478810     96 FUNC PROBLEM sub_478810 CHUNKS 
             478870     89 FUNC RETURNTYPE RAX 0
             478870     89 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4770,7 +4776,7 @@
             47a650    256 FUNC RETURNTYPE RAX 0
             47a650    256 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47a750     97 FUNC RETURNTYPE RAX 4
-            47a750     97 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            47a750     97 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47a7c0    136 FUNC RETURNTYPE RAX 0
             47a7c0    136 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47a850    350 FUNC RETURNTYPE RAX 0
@@ -4779,7 +4785,9 @@
             47aba0     59 FUNC RETURNTYPE RAX 0
             47aba0     59 FUNC PROBLEM sub_47ABA0 JUMPUNRESOLVED 
             47ac40    153 FUNC RETURNTYPE RAX 0
+            47ac40    153 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ac40    153 FUNC PROBLEM gedit_history_entry_prepend_text CHUNKS 
+            47aad6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 2 
             47ace0    145 FUNC RETURNTYPE RAX 0
             47ace0    145 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ad80     97 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-calculator.psexe.infoannot b/tests/commit/save-gnome-calculator.psexe.infoannot
index 7922626f63c7113e184ade9db5e77b2841b0e22c..2f65ece2fb5e10ccbb5f38c9b6a321c4f9052414 100644
--- a/tests/commit/save-gnome-calculator.psexe.infoannot
+++ b/tests/commit/save-gnome-calculator.psexe.infoannot
@@ -1248,7 +1248,7 @@
             41b550     14 FUNC RETURNTYPE RAX 1
             41b550     14 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             41b560    186 FUNC RETURNTYPE RAX 1
-            41b560    186 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
+            41b560    186 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 1 ARG5 1 
             41b620    402 FUNC RETURNTYPE RAX 1
             41b620    402 FUNC INARGS    2  ARG0 4 ARG1 4 
             41b7c0     52 FUNC RETURNTYPE RAX 0
@@ -1260,7 +1260,7 @@
             41ba50    112 FUNC RETURNTYPE RAX 1
             41ba50    112 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             41bac0      9 FUNC RETURNTYPE RAX 1
-            41bac0      9 FUNC INARGS    3  ARG0 4 ARG1 1 ARG2 4 
+            41bac0      9 FUNC INARGS    3  ARG0 4 ARG1 1 ARG2 96 
             41bad0     11 FUNC RETURNTYPE RAX 1
             41bad0     11 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             41bae0    186 FUNC RETURNTYPE RAX 1
@@ -1281,7 +1281,8 @@
             41bc10     16 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 4 ARG5 1 
             41bc20    159 FUNC RETURNTYPE RAX 1
             41bc20    159 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
-            41bfb0     42 FUNC RETURNTYPE RAX 0
+            41bfb0     42 FUNC RETURNTYPE RAX 1
+            41bfb0     42 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 8 ARG3 1 ARG4 0 ARG5 0 
             41bfb0     42 FUNC PROBLEM sub_41BFB0 CHUNKS 
             41c070     21 FUNC RETURNTYPE RAX 96
             41c070     21 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1304,9 +1305,12 @@
             41caf0      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 1 
             41cbd3      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
             41cd30    100 FUNC RETURNTYPE RAX 1
-            41cd30    100 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            41cea0     13 FUNC RETURNTYPE RAX 0
+            41cd30    100 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
+            41cea0     13 FUNC RETURNTYPE RAX 96
+            41cea0     13 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 0 ARG4 0 ARG5 1 
             41cea0     13 FUNC PROBLEM mp_subtract CHUNKS 
+            41ce13      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, ebp 
+            41ce36      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, ebp 
             41ceb0     13 FUNC RETURNTYPE RAX 96
             41ceb0     13 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 4 
             41cfe0     85 FUNC RETURNTYPE RAX 96
@@ -1321,7 +1325,7 @@
             41d250     73 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41d2a0    500 FUNC RETURNTYPE RAX 1
             41d2a0    500 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41d4a0     69 FUNC RETURNTYPE RAX 0
+            41d4a0     69 FUNC RETURNTYPE RAX 96
             41d4a0     69 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 4 ARG5 1 
             41d4f0    106 FUNC RETURNTYPE RAX 1
             41d4f0    106 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 96 ARG5 1 
@@ -1369,8 +1373,10 @@
             41e430    143 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e4c0    175 FUNC RETURNTYPE RAX 1
             41e4c0    175 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 96 ARG5 1 
-            41e740     53 FUNC RETURNTYPE RAX 0
+            41e740     53 FUNC RETURNTYPE RAX 96
+            41e740     53 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             41e740     53 FUNC PROBLEM sub_41E740 CHUNKS 
+            41e617      4 INSTR CHECK OVERFLOW SIGNED 32 ESI ZZ imul    esi, r12d 
             41e800     53 FUNC RETURNTYPE RAX 96
             41e800     53 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e840    958 FUNC RETURNTYPE RAX 96
diff --git a/tests/commit/save-gnome-character-map.psexe.infoannot b/tests/commit/save-gnome-character-map.psexe.infoannot
index e48fe8938d7dfc3bc27ccd033c5ec1580c8b2bfe..ae501abb923dd09ab7c51343f447692191a4e8d1 100644
--- a/tests/commit/save-gnome-character-map.psexe.infoannot
+++ b/tests/commit/save-gnome-character-map.psexe.infoannot
@@ -666,7 +666,8 @@
             40aa00     30 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40aa20     38 FUNC RETURNTYPE RAX 0
             40aa20     38 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40aa50     38 FUNC RETURNTYPE RAX 0
+            40aa50     38 FUNC RETURNTYPE RAX 4
+            40aa50     38 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40aa50     38 FUNC PROBLEM sub_40AA50 CHUNKS 
             40aa80    196 FUNC RETURNTYPE RAX 0
             40aa80    196 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -685,7 +686,8 @@
             40b1d0    189 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b290     54 FUNC RETURNTYPE RAX 0
             40b290     54 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40b2d0     54 FUNC RETURNTYPE RAX 0
+            40b2d0     54 FUNC RETURNTYPE RAX 1
+            40b2d0     54 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b2d0     54 FUNC PROBLEM sub_40B2D0 CHUNKS 
             40b310     38 FUNC RETURNTYPE RAX 0
             40b310     38 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-dictionary.psexe.infoannot b/tests/commit/save-gnome-dictionary.psexe.infoannot
index 34adb5d6c40d0c0a87d10427be4ff95a83433415..96713565bb6e577bfc11a94ed442e319e048b444 100644
--- a/tests/commit/save-gnome-dictionary.psexe.infoannot
+++ b/tests/commit/save-gnome-dictionary.psexe.infoannot
@@ -919,7 +919,8 @@
             40f590    111 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40f600     90 FUNC RETURNTYPE RAX 0
             40f600     90 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40f660    105 FUNC RETURNTYPE RAX 0
+            40f660    105 FUNC RETURNTYPE RAX 4
+            40f660    105 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40f660    105 FUNC PROBLEM sub_40F660 CHUNKS 
             40f6d0    238 FUNC RETURNTYPE RAX 0
             40f6d0    238 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-keyring-3.psexe.infoannot b/tests/commit/save-gnome-keyring-3.psexe.infoannot
index 4b6af4014b7f8812d0c8cc864169f2b458960e43..9b3236cb09499f37b978960c024b93b7967b95bb 100644
--- a/tests/commit/save-gnome-keyring-3.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-3.psexe.infoannot
@@ -114,8 +114,11 @@
             4018c0    511 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401ac0     94 FUNC RETURNTYPE RAX 1
             401ac0     94 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            401f00     15 FUNC RETURNTYPE RAX 0
+            401f00     15 FUNC RETURNTYPE RAX 96
+            401f00     15 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401f00     15 FUNC PROBLEM sub_401F00 CHUNKS 
+            401d7e      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rdi, [rbx+rbx+1] 
+            401d7e      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX+1 ZZ lea     rdi, [rbx+rbx+1] 
             401f10    137 FUNC RETURNTYPE RAX 0
             401f10    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401f10    137 FUNC PROBLEM init CALLUNRESOLVED 
diff --git a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
index 0a5e984c3b9bf27ac1786a45070540ecbcf18827..beba614713f193b716202e5105963bbf12bf9145 100644
--- a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
@@ -1287,7 +1287,7 @@
             40eb7a     32 FUNC RETURNTYPE RAX 0
             40eb7a     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40eb9a     32 FUNC RETURNTYPE RAX 0
-            40eb9a     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            40eb9a     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 4 ARG5 0 
             40ebba     32 FUNC RETURNTYPE RAX 0
             40ebba     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 1 ARG5 1 
             40ebda    374 FUNC RETURNTYPE RAX 1
@@ -1340,7 +1340,7 @@
             40fd30     10 FUNC RETURNTYPE RAX 96
             40fd30     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             40fd40    129 FUNC RETURNTYPE RAX 96
-            40fd40    129 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            40fd40    129 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40fdb3      2 INSTR INFINITELOOP jmp     short loc_40FDB3 
             40fdd0     41 FUNC RETURNTYPE RAX 0
             40fdd0     41 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -1413,6 +1413,7 @@
             4113a0      2 FUNC RETURNTYPE RAX 0
             4113a0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             4113b0     89 FUNC RETURNTYPE RAX 0
+            4113b0     89 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4113b0     89 FUNC PROBLEM sub_4113B0 CHUNKS 
             411410     80 FUNC RETURNTYPE RAX 0
             411410     80 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1431,7 +1432,7 @@
             411ad0     55 FUNC RETURNTYPE RAX 0
             411ad0     55 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             411b10    631 FUNC RETURNTYPE RAX 0
-            411b10    631 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            411b10    631 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             411d90     47 FUNC RETURNTYPE RAX 1
             411d90     47 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             411dc0    142 FUNC RETURNTYPE RAX 1
@@ -1856,7 +1857,7 @@
             424ec0   3265 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             425b90    362 FUNC RETURNTYPE RAX 0
             425b90    362 FUNC INARGS    6  ARG0 0 ARG1 16 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
-            425d00    253 FUNC RETURNTYPE RAX 0
+            425d00    253 FUNC RETURNTYPE RAX 1
             425d00    253 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 8 ARG4 0 ARG5 0 
             425e00    238 FUNC RETURNTYPE RAX 1
             425e00    238 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
@@ -2277,10 +2278,15 @@
             436080    738 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 4 ARG4 4 ARG5 0 
             436370    428 FUNC RETURNTYPE RAX 0
             436370    428 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            436710     15 FUNC RETURNTYPE RAX 0
+            436710     15 FUNC RETURNTYPE RAX 1
+            436710     15 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             436710     15 FUNC PROBLEM sub_436710 CHUNKS 
-            436720     77 FUNC RETURNTYPE RAX 0
+            4365c7      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+1 ZZ IDIOM 32 lea     rdi, [rax+1] 
+            436720     77 FUNC RETURNTYPE RAX 96
+            436720     77 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
             436720     77 FUNC PROBLEM sub_436720 CHUNKS 
+            43677e      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rdi, [rbx+rbx+1] 
+            43677e      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX+1 ZZ lea     rdi, [rbx+rbx+1] 
             436900     15 FUNC RETURNTYPE RAX 4
             436910    734 FUNC RETURNTYPE RAX 1
             436910    734 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 1 
@@ -2310,8 +2316,11 @@
             4373a0    532 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 4 ARG5 4 
             4373a0    532 FUNC PROBLEM egg_padding_pkcs1_pad_02 CALLUNRESOLVED 
             437565      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+R13 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r13]  ; dest 
-            437600     62 FUNC RETURNTYPE RAX 0
+            437600     62 FUNC RETURNTYPE RAX 1
+            437600     62 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 4 
             437600     62 FUNC PROBLEM egg_padding_pkcs1_unpad_02 CHUNKS CALLUNRESOLVED 
+            436fe0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rsi+2]    ; s 
+            436fe4      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+-2 ZZ lea     rdx, [rdx-2]    ; n 
             437640    384 FUNC RETURNTYPE RAX 1
             437640    384 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 4 ARG3 1 ARG4 4 ARG5 4 
             437640    384 FUNC PROBLEM sub_437640 CALLUNRESOLVED 
@@ -2332,7 +2341,7 @@
             438030    326 FUNC RETURNTYPE RAX 96
             438030    326 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             438180    512 FUNC RETURNTYPE RAX 96
-            438180    512 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            438180    512 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             438236      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+18h] 
             438380    177 FUNC RETURNTYPE RAX 4
             438380    177 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2342,16 +2351,22 @@
             4385bc      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+18h] 
             438630      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+18h] 
             438760    793 FUNC RETURNTYPE RAX 96
-            438760    793 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            438760    793 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4388c7      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+24 ZZ lea     rdi, [r12+18h] 
             438a80     10 FUNC RETURNTYPE RAX 0
             438a80     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             438a90    220 FUNC RETURNTYPE RAX 1
-            438a90    220 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            438a90    220 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             438b70     10 FUNC RETURNTYPE RAX 0
             438b70     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
-            439090     10 FUNC RETURNTYPE RAX 0
+            439090     10 FUNC RETURNTYPE RAX 96
+            439090     10 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             439090     10 FUNC PROBLEM egg_secure_realloc CHUNKS 
+            438dd3      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ add     rcx, rdi 
+            438ea7      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+R15 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r15]  ; s 
+            438eab      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, r15        ; n 
+            438f88      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+R13 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r13]  ; s 
+            438f8e      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, r13        ; n 
             4390a0    105 FUNC RETURNTYPE RAX 1
             4390a0    105 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             439410     70 FUNC RETURNTYPE RAX 4
@@ -2737,11 +2752,11 @@
             44d3f0     82 FUNC RETURNTYPE RAX 1
             44d3f0     82 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             44d450    146 FUNC RETURNTYPE RAX 0
-            44d450    146 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            44d450    146 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             44d4f0     82 FUNC RETURNTYPE RAX 1
             44d4f0     82 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             44d6a0    146 FUNC RETURNTYPE RAX 0
-            44d6a0    146 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            44d6a0    146 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             44da10    106 FUNC RETURNTYPE RAX 0
             44da10    106 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44da80    201 FUNC RETURNTYPE RAX 1
@@ -2853,13 +2868,13 @@
             451f10    604 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             4520c6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+8 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+8] 
             452170    121 FUNC RETURNTYPE RAX 0
-            452170    121 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            452170    121 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4521f0     78 FUNC RETURNTYPE RAX 1
             4521f0     78 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             452240    159 FUNC RETURNTYPE RAX 0
             452240    159 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             452330     38 FUNC RETURNTYPE RAX 1
-            452330     38 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
+            452330     38 FUNC INARGS    4  ARG0 0 ARG1 96 ARG2 0 ARG3 0 
             452390    163 FUNC RETURNTYPE RAX 0
             452390    163 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             452440     80 FUNC RETURNTYPE RAX 1
@@ -2870,7 +2885,7 @@
             4524e0     80 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             452530    220 FUNC RETURNTYPE RAX 0
             452530    220 FUNC PROBLEM sub_452530 STACKANALYSIS 
-            452610    161 FUNC RETURNTYPE RAX 0
+            452610    161 FUNC RETURNTYPE RAX 96
             452610    161 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4526c0    100 FUNC RETURNTYPE RAX 0
             4526c0    100 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2917,13 +2932,13 @@
             454400     92 FUNC RETURNTYPE RAX 1
             454400     92 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             454460    174 FUNC RETURNTYPE RAX 0
-            454460    174 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
+            454460    174 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             454510     78 FUNC RETURNTYPE RAX 1
             454510     78 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             4546b0    173 FUNC RETURNTYPE RAX 0
             4546b0    173 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 16 ARG3 1 ARG4 0 ARG5 0 
             454930    119 FUNC RETURNTYPE RAX 1
-            454930    119 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
+            454930    119 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 16 ARG3 4 ARG4 0 ARG5 0 
             4549b0    122 FUNC RETURNTYPE RAX 1
             4549b0    122 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 16 ARG3 1 ARG4 0 ARG5 0 
             454a30    159 FUNC RETURNTYPE RAX 1
@@ -2931,8 +2946,10 @@
             454ad0   1833 FUNC RETURNTYPE RAX 1
             454ad0   1833 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455200    122 FUNC RETURNTYPE RAX 0
+            455200    122 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455200    122 FUNC PROBLEM sub_455200 CHUNKS 
-            455942    495 FUNC RETURNTYPE RAX 0
+            455942    495 FUNC RETURNTYPE RAX 96
+            455942    495 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455942    495 FUNC PROBLEM sub_455942 CHUNKS 
             455c00    156 FUNC RETURNTYPE RAX 1
             455c00    156 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
@@ -3530,7 +3547,7 @@
             47b160     49 FUNC RETURNTYPE RAX 1
             47b160     49 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47b1a0    142 FUNC RETURNTYPE RAX 1
-            47b1a0    142 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            47b1a0    142 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47b230     82 FUNC RETURNTYPE RAX 1
             47b230     82 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47b290     82 FUNC RETURNTYPE RAX 1
@@ -3578,7 +3595,7 @@
             47c830    155 FUNC RETURNTYPE RAX 0
             47c830    155 FUNC PROBLEM sub_47C830 JUMPUNRESOLVED 
             47c9b0    157 FUNC RETURNTYPE RAX 96
-            47c9b0    157 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            47c9b0    157 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             47ca50    196 FUNC RETURNTYPE RAX 1
             47ca50    196 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47ca50    196 FUNC PROBLEM sub_47CA50 CALLUNRESOLVED 
@@ -3689,7 +3706,7 @@
             480d80    541 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             480f18      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
             480fa0     89 FUNC RETURNTYPE RAX 1
-            480fa0     89 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            480fa0     89 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             481220    183 FUNC RETURNTYPE RAX 0
             481220    183 FUNC PROBLEM sub_481220 JUMPUNRESOLVED 
             4812e0    225 FUNC RETURNTYPE RAX 1
@@ -3767,7 +3784,7 @@
             484440     60 FUNC RETURNTYPE RAX 0
             484440     60 FUNC PROBLEM sub_484440 JUMPUNRESOLVED 
             484480    162 FUNC RETURNTYPE RAX 4
-            484480    162 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
+            484480    162 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             4844b8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+1 ZZ lea     rdi, [rbp+1] 
             484530      5 FUNC RETURNTYPE RAX 0
             484530      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 0 
@@ -3825,7 +3842,7 @@
             485f30    175 FUNC RETURNTYPE RAX 1
             485f30    175 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             485fe0    154 FUNC RETURNTYPE RAX 96
-            485fe0    154 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
+            485fe0    154 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             486080     82 FUNC RETURNTYPE RAX 1
             486080     82 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             486250    146 FUNC RETURNTYPE RAX 0
@@ -3836,10 +3853,11 @@
             4865a0    178 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4865a0    178 FUNC PROBLEM sub_4865A0 CALLUNRESOLVED 
             486660     96 FUNC RETURNTYPE RAX 1
-            486660     96 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            486660     96 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             4868d0     96 FUNC RETURNTYPE RAX 1
             4868d0     96 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            486930     10 FUNC RETURNTYPE RAX 0
+            486930     10 FUNC RETURNTYPE RAX 1
+            486930     10 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             486930     10 FUNC PROBLEM sub_486930 CHUNKS 
             486940    555 FUNC RETURNTYPE RAX 1
             486940    555 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-keyring.psexe.infoannot b/tests/commit/save-gnome-keyring.psexe.infoannot
index 4b6af4014b7f8812d0c8cc864169f2b458960e43..9b3236cb09499f37b978960c024b93b7967b95bb 100644
--- a/tests/commit/save-gnome-keyring.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring.psexe.infoannot
@@ -114,8 +114,11 @@
             4018c0    511 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401ac0     94 FUNC RETURNTYPE RAX 1
             401ac0     94 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            401f00     15 FUNC RETURNTYPE RAX 0
+            401f00     15 FUNC RETURNTYPE RAX 96
+            401f00     15 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401f00     15 FUNC PROBLEM sub_401F00 CHUNKS 
+            401d7e      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rdi, [rbx+rbx+1] 
+            401d7e      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX+1 ZZ lea     rdi, [rbx+rbx+1] 
             401f10    137 FUNC RETURNTYPE RAX 0
             401f10    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401f10    137 FUNC PROBLEM init CALLUNRESOLVED 
diff --git a/tests/commit/save-gnome-search-tool.psexe.infoannot b/tests/commit/save-gnome-search-tool.psexe.infoannot
index d5e8297d18295db4896d1a1417f19838bcfa85f8..cb94324248cdf431fe62ef9aae624d8c5768117c 100644
--- a/tests/commit/save-gnome-search-tool.psexe.infoannot
+++ b/tests/commit/save-gnome-search-tool.psexe.infoannot
@@ -1283,7 +1283,7 @@
             419210    224 FUNC RETURNTYPE RAX 0
             419210    224 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4192f0     97 FUNC RETURNTYPE RAX 4
-            4192f0     97 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            4192f0     97 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             419360    136 FUNC RETURNTYPE RAX 0
             419360    136 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4193f0    316 FUNC RETURNTYPE RAX 0
@@ -1291,7 +1291,9 @@
             419700    104 FUNC RETURNTYPE RAX 0
             419700    104 FUNC PROBLEM sub_419700 JUMPUNRESOLVED 
             419940    141 FUNC RETURNTYPE RAX 0
+            419940    141 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             419940    141 FUNC PROBLEM sub_419940 CHUNKS 
+            41962e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 2 
             419ac0    129 FUNC RETURNTYPE RAX 4
             419ac0    129 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             419d60     97 FUNC RETURNTYPE RAX 1
@@ -1373,7 +1375,8 @@
             41c1c0    194 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41c290    135 FUNC RETURNTYPE RAX 1
             41c290    135 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41c540     96 FUNC RETURNTYPE RAX 0
+            41c540     96 FUNC RETURNTYPE RAX 1
+            41c540     96 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41c540     96 FUNC PROBLEM sub_41C540 CHUNKS 
             41c5a0     89 FUNC RETURNTYPE RAX 0
             41c5a0     89 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-session.psexe.infoannot b/tests/commit/save-gnome-session.psexe.infoannot
index 1fccf39e1e58f42aa056f64648e1f7ddb13fc2e1..14b653e643ac96914186865179a303dccda9ac62 100644
--- a/tests/commit/save-gnome-session.psexe.infoannot
+++ b/tests/commit/save-gnome-session.psexe.infoannot
@@ -1059,8 +1059,10 @@
             40c820    351 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40c980    128 FUNC RETURNTYPE RAX 1
             40c980    128 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40ca00    271 FUNC RETURNTYPE RAX 0
+            40ca00    271 FUNC RETURNTYPE RAX 96
+            40ca00    271 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 4 
             40ca00    271 FUNC PROBLEM sub_40CA00 CHUNKS 
+            40ca1d      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
             40cb10    505 FUNC RETURNTYPE RAX 1
             40cb10    505 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40cd10    124 FUNC RETURNTYPE RAX 0
@@ -1084,7 +1086,7 @@
             40ed70    139 FUNC RETURNTYPE RAX 0
             40ed70    139 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ee00     49 FUNC RETURNTYPE RAX 0
-            40ee00     49 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            40ee00     49 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40ee40    234 FUNC RETURNTYPE RAX 0
             40ee40    234 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             40ee40    234 FUNC PROBLEM sub_40EE40 CALLUNRESOLVED 
@@ -1168,7 +1170,8 @@
             411000    378 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 0 ARG4 1 ARG5 1 
             411180    132 FUNC RETURNTYPE RAX 1
             411180    132 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4112a0    277 FUNC RETURNTYPE RAX 0
+            4112a0    277 FUNC RETURNTYPE RAX 4
+            4112a0    277 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4112a0    277 FUNC PROBLEM sub_4112A0 CHUNKS 
             411500    127 FUNC RETURNTYPE RAX 0
             411500    127 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1286,6 +1289,7 @@
             415a00     13 FUNC RETURNTYPE RAX 0
             415a00     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             415a10     10 FUNC RETURNTYPE RAX 0
+            415a10     10 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             415a10     10 FUNC PROBLEM sub_415A10 CHUNKS 
             415a20    238 FUNC RETURNTYPE RAX 0
             415a20    238 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1377,10 +1381,10 @@
             419400   1066 FUNC RETURNTYPE RAX 1
             419400   1066 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             419830    461 FUNC RETURNTYPE RAX 1
-            419830    461 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            419830    461 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             419910      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+3] 
             419a20     21 FUNC RETURNTYPE RAX 1
-            419a20     21 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            419a20     21 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             419a60    143 FUNC RETURNTYPE RAX 1
             419a60    143 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             419b40    328 FUNC RETURNTYPE RAX 1
@@ -1427,7 +1431,7 @@
             41b390     66 FUNC RETURNTYPE RAX 0
             41b390     66 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b470    245 FUNC RETURNTYPE RAX 1
-            41b470    245 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            41b470    245 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b720     38 FUNC RETURNTYPE RAX 0
             41b720     38 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b750     95 FUNC RETURNTYPE RAX 0
@@ -1598,7 +1602,8 @@
             422de0    210 FUNC RETURNTYPE RAX 0
             422de0    210 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             422e68      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     edi, ebx 
-            422ec0      7 FUNC RETURNTYPE RAX 0
+            422ec0      7 FUNC RETURNTYPE RAX 1
+            422ec0      7 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             422ec0      7 FUNC PROBLEM sub_422EC0 CHUNKS 
             422ee0    286 FUNC RETURNTYPE RAX 1
             422ee0    286 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-sound-applet.psexe.infoannot b/tests/commit/save-gnome-sound-applet.psexe.infoannot
index df9d57e4d004f1d785f7eef214cf8915eb87b442..bc7ac52206cdaba30e1486ff9c5d93e5a075e322 100644
--- a/tests/commit/save-gnome-sound-applet.psexe.infoannot
+++ b/tests/commit/save-gnome-sound-applet.psexe.infoannot
@@ -599,10 +599,11 @@
               8820      5 FUNC RETURNTYPE RAX 0
               8820      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
               8830     75 FUNC RETURNTYPE RAX 1
-              8830     75 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+              8830     75 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
               8880      5 FUNC RETURNTYPE RAX 0
               8880      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-              8890     86 FUNC RETURNTYPE RAX 0
+              8890     86 FUNC RETURNTYPE RAX 1
+              8890     86 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
               8890     86 FUNC PROBLEM sub_8890 CHUNKS 
               88f0    122 FUNC RETURNTYPE RAX 0
               88f0    122 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -767,7 +768,7 @@
               e8d0    389 FUNC RETURNTYPE RAX 0
               e8d0    389 FUNC PROBLEM sub_E8D0 JUMPUNRESOLVED 
               efb0    104 FUNC RETURNTYPE RAX 96
-              efb0    104 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+              efb0    104 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
               f020    104 FUNC RETURNTYPE RAX 96
               f020    104 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
               f480    137 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-system-monitor.psexe.infoannot b/tests/commit/save-gnome-system-monitor.psexe.infoannot
index 6632fa1ddbfe275b959b601ec7dc090b9169abdd..929a5c035d47510e903de505affbf5affde72006 100644
--- a/tests/commit/save-gnome-system-monitor.psexe.infoannot
+++ b/tests/commit/save-gnome-system-monitor.psexe.infoannot
@@ -1483,6 +1483,7 @@
             41a980     73 FUNC RETURNTYPE RAX 0
             41a980     73 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41a9d0     13 FUNC RETURNTYPE RAX 0
+            41a9d0     13 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 0 
             41a9d0     13 FUNC PROBLEM _Z14cb_end_processP10_GtkActionPv CHUNKS 
             41a9e0     13 FUNC RETURNTYPE RAX 0
             41a9e0     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
diff --git a/tests/commit/save-gnome-terminal.psexe.infoannot b/tests/commit/save-gnome-terminal.psexe.infoannot
index f6e287b9dbd7354b87188cab80213759e4ed8abf..ae2804bcf299cf576af1275b5cc642ec46659065 100644
--- a/tests/commit/save-gnome-terminal.psexe.infoannot
+++ b/tests/commit/save-gnome-terminal.psexe.infoannot
@@ -1836,10 +1836,13 @@
             419180    311 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4192c0     14 FUNC RETURNTYPE RAX 0
             4192c0     14 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            4192d0      8 FUNC RETURNTYPE RAX 0
+            4192d0      8 FUNC RETURNTYPE RAX 1
+            4192d0      8 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4192d0      8 FUNC PROBLEM sub_4192D0 CHUNKS 
-            4192e0      8 FUNC RETURNTYPE RAX 0
+            4192e0      8 FUNC RETURNTYPE RAX 1
+            4192e0      8 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4192e0      8 FUNC PROBLEM sub_4192E0 CHUNKS 
+            41bcbf      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+64 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+40h] 
             419310     90 FUNC RETURNTYPE RAX 1
             419310     90 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             419370    138 FUNC RETURNTYPE RAX 1
@@ -1893,7 +1896,7 @@
             41b530      2 FUNC RETURNTYPE RAX 0
             41b530      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             41b540     84 FUNC RETURNTYPE RAX 0
-            41b540     84 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            41b540     84 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b5a0     71 FUNC RETURNTYPE RAX 0
             41b5a0     71 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b5f0     56 FUNC RETURNTYPE RAX 0
@@ -1969,9 +1972,9 @@
             41f570    113 FUNC RETURNTYPE RAX 0
             41f570    113 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41f5f0     88 FUNC RETURNTYPE RAX 4
-            41f5f0     88 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
+            41f5f0     88 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             41f650    113 FUNC RETURNTYPE RAX 96
-            41f650    113 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
+            41f650    113 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             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 
@@ -1994,7 +1997,7 @@
             420fe0     73 FUNC RETURNTYPE RAX 96
             420fe0     73 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             421030     73 FUNC RETURNTYPE RAX 96
-            421030     73 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            421030     73 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             421080     73 FUNC RETURNTYPE RAX 96
             421080     73 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4210d0     73 FUNC RETURNTYPE RAX 96
@@ -2087,7 +2090,8 @@
             423f70     95 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             423fd0    110 FUNC RETURNTYPE RAX 1
             423fd0    110 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4240e0     27 FUNC RETURNTYPE RAX 0
+            4240e0     27 FUNC RETURNTYPE RAX 96
+            4240e0     27 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4240e0     27 FUNC PROBLEM sub_4240E0 CHUNKS 
             424100     25 FUNC RETURNTYPE RAX 4
             424100     25 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -2097,7 +2101,8 @@
             4241f0     83 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             424250    111 FUNC RETURNTYPE RAX 96
             424250    111 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4242c0    166 FUNC RETURNTYPE RAX 0
+            4242c0    166 FUNC RETURNTYPE RAX 1
+            4242c0    166 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4242c0    166 FUNC PROBLEM sub_4242C0 CHUNKS 
             424370   1994 FUNC RETURNTYPE RAX 0
             424370   1994 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -2136,7 +2141,7 @@
             425570     63 FUNC RETURNTYPE RAX 1
             425570     63 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4255b0    196 FUNC RETURNTYPE RAX 0
-            4255b0    196 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            4255b0    196 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             425680    307 FUNC RETURNTYPE RAX 0
             425680    307 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4257c0    127 FUNC RETURNTYPE RAX 0
@@ -2150,7 +2155,7 @@
             425b80    176 FUNC RETURNTYPE RAX 1
             425b80    176 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             425f20    154 FUNC RETURNTYPE RAX 0
-            425f20    154 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            425f20    154 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             425fc0     35 FUNC RETURNTYPE RAX 0
             425fc0     35 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             425ff0     45 FUNC RETURNTYPE RAX 0
@@ -2243,7 +2248,7 @@
             4295e0     40 FUNC RETURNTYPE RAX 1
             4295e0     40 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             429610     95 FUNC RETURNTYPE RAX 0
-            429610     95 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
+            429610     95 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 16 ARG3 96 ARG4 0 ARG5 0 
             429670     66 FUNC RETURNTYPE RAX 0
             429670     66 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 16 ARG3 1 ARG4 0 ARG5 0 
             4296c0    199 FUNC RETURNTYPE RAX 0
@@ -2539,7 +2544,8 @@
             435710    170 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4357c0    135 FUNC RETURNTYPE RAX 1
             4357c0    135 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            435a80     80 FUNC RETURNTYPE RAX 0
+            435a80     80 FUNC RETURNTYPE RAX 1
+            435a80     80 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             435a80     80 FUNC PROBLEM sub_435A80 CHUNKS 
             435ad0     73 FUNC RETURNTYPE RAX 0
             435ad0     73 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-text-editor.psexe.infoannot b/tests/commit/save-gnome-text-editor.psexe.infoannot
index 01095f5f1555c94a2cb7431d522ad161d55652b3..ce99b8052d7d7bb5e04243d202a1244c323c9ae0 100644
--- a/tests/commit/save-gnome-text-editor.psexe.infoannot
+++ b/tests/commit/save-gnome-text-editor.psexe.infoannot
@@ -2882,7 +2882,8 @@
             430dc0    267 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             430ed0    449 FUNC RETURNTYPE RAX 1
             430ed0    449 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            431c10     23 FUNC RETURNTYPE RAX 0
+            431c10     23 FUNC RETURNTYPE RAX 4
+            431c10     23 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431c10     23 FUNC PROBLEM sub_431C10 CHUNKS 
             431c30     23 FUNC RETURNTYPE RAX 4
             431c30     23 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -3368,8 +3369,11 @@
             446960    202 FUNC RETURNTYPE RAX 1
             446960    202 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4469a6      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rsi 
-            446a30     10 FUNC RETURNTYPE RAX 0
+            446a30     10 FUNC RETURNTYPE RAX 96
+            446a30     10 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             446a30     10 FUNC PROBLEM gedit_utils_str_middle_truncate CHUNKS 
+            445d5b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
+            445e30      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
             446a40      7 FUNC RETURNTYPE RAX 1
             446a40      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             446a50    333 FUNC RETURNTYPE RAX 1
@@ -3468,7 +3472,7 @@
             449fe0    191 FUNC RETURNTYPE RAX 0
             449fe0    191 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a0a0     99 FUNC RETURNTYPE RAX 0
-            44a0a0     99 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            44a0a0     99 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             44a2a0    412 FUNC RETURNTYPE RAX 4
             44a2a0    412 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a440     21 FUNC RETURNTYPE RAX 1
@@ -3489,8 +3493,9 @@
             44b170     25 FUNC RETURNTYPE RAX 1
             44b170     25 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44b190    133 FUNC RETURNTYPE RAX 1
-            44b190    133 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            44b220    359 FUNC RETURNTYPE RAX 0
+            44b190    133 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            44b220    359 FUNC RETURNTYPE RAX 1
+            44b220    359 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44b220    359 FUNC PROBLEM sub_44B220 CHUNKS 
             44b550    208 FUNC RETURNTYPE RAX 0
             44b550    208 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4673,7 +4678,8 @@
             478490    194 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             478560    135 FUNC RETURNTYPE RAX 1
             478560    135 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            478810     96 FUNC RETURNTYPE RAX 0
+            478810     96 FUNC RETURNTYPE RAX 1
+            478810     96 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             478810     96 FUNC PROBLEM sub_478810 CHUNKS 
             478870     89 FUNC RETURNTYPE RAX 0
             478870     89 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4770,7 +4776,7 @@
             47a650    256 FUNC RETURNTYPE RAX 0
             47a650    256 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47a750     97 FUNC RETURNTYPE RAX 4
-            47a750     97 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            47a750     97 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47a7c0    136 FUNC RETURNTYPE RAX 0
             47a7c0    136 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47a850    350 FUNC RETURNTYPE RAX 0
@@ -4779,7 +4785,9 @@
             47aba0     59 FUNC RETURNTYPE RAX 0
             47aba0     59 FUNC PROBLEM sub_47ABA0 JUMPUNRESOLVED 
             47ac40    153 FUNC RETURNTYPE RAX 0
+            47ac40    153 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ac40    153 FUNC PROBLEM gedit_history_entry_prepend_text CHUNKS 
+            47aad6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 2 
             47ace0    145 FUNC RETURNTYPE RAX 0
             47ace0    145 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ad80     97 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-less.psexe.infoannot b/tests/commit/save-less.psexe.infoannot
index a7a4983b2155a2220c88f10d5e8da0208f0d14b6..dc6ca074f0d9055db95b8c4f0796879a82b18d02 100644
--- a/tests/commit/save-less.psexe.infoannot
+++ b/tests/commit/save-less.psexe.infoannot
@@ -317,7 +317,8 @@
             405740    170 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4057f0    244 FUNC RETURNTYPE RAX 96
             4057f0    244 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4058f0     44 FUNC RETURNTYPE RAX 0
+            4058f0     44 FUNC RETURNTYPE RAX 96
+            4058f0     44 FUNC INARGS    4  ARG0 1 ARG1 1 ARG2 96 ARG3 0 
             4058f0     44 FUNC PROBLEM sub_4058F0 CHUNKS 
             405920     99 FUNC RETURNTYPE RAX 0
             405920     99 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
@@ -437,9 +438,9 @@
             409afa      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             409b90    105 FUNC RETURNTYPE RAX 96
             409b90    105 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            409c47      2 FUNC RETURNTYPE RAX 0
+            409c47      2 FUNC RETURNTYPE RAX 1
             409c47      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
-            409c50      2 FUNC RETURNTYPE RAX 0
+            409c50      2 FUNC RETURNTYPE RAX 4
             409c50      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             409c70     40 FUNC RETURNTYPE RAX 0
             409c70     40 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -521,8 +522,9 @@
             40b720      6 FUNC RETURNTYPE RAX 16
             40b720      6 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             40b730     72 FUNC RETURNTYPE RAX 4
-            40b730     72 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40b780     29 FUNC RETURNTYPE RAX 0
+            40b730     72 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            40b780     29 FUNC RETURNTYPE RAX 1
+            40b780     29 FUNC INARGS    4  ARG0 0 ARG1 96 ARG2 0 ARG3 96 
             40b780     29 FUNC PROBLEM sub_40B780 CHUNKS 
             40b7a0    101 FUNC RETURNTYPE RAX 1
             40b7a0    101 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -542,7 +544,7 @@
             40be10    146 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             40be75      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             40bef0     31 FUNC RETURNTYPE RAX 0
-            40bef0     31 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 1 
+            40bef0     31 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 1 
             40bf10     32 FUNC RETURNTYPE RAX 0
             40bf10     32 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 1 
             40bf30     63 FUNC RETURNTYPE RAX 0
@@ -550,13 +552,13 @@
             40bf70    139 FUNC RETURNTYPE RAX 0
             40bf70    139 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40c000      7 FUNC RETURNTYPE RAX 0
-            40c000      7 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
+            40c000      7 FUNC INARGS    4  ARG0 96 ARG1 4 ARG2 1 ARG3 1 
             40c010    222 FUNC RETURNTYPE RAX 4
             40c010    222 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40c0f0     19 FUNC RETURNTYPE RAX 1
             40c0f0     19 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             40c110      4 FUNC RETURNTYPE RAX 0
-            40c110      4 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
+            40c110      4 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 1 ARG3 1 
             40c120     16 FUNC RETURNTYPE RAX 0
             40c120     16 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 4 ARG3 0 
             40c130     16 FUNC RETURNTYPE RAX 0
@@ -688,7 +690,7 @@
             40f010    368 FUNC RETURNTYPE RAX 1
             40f010    368 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40f180    131 FUNC RETURNTYPE RAX 1
-            40f180    131 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            40f180    131 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             40f210    658 FUNC RETURNTYPE RAX 1
             40f210    658 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40f3ff      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX ZZ lea     edx, [r13+rax+5] 
@@ -799,7 +801,7 @@
             411810    150 FUNC RETURNTYPE RAX 4
             411810    150 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4118b0     36 FUNC RETURNTYPE RAX 1
-            4118b0     36 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
+            4118b0     36 FUNC INARGS    4  ARG0 1 ARG1 1 ARG2 96 ARG3 96 
             4118e0     86 FUNC RETURNTYPE RAX 1
             4118e0     86 FUNC INARGS    3  ARG0 0 ARG1 1 ARG2 1 
             411940     76 FUNC RETURNTYPE RAX 16
@@ -811,11 +813,11 @@
             411a90     41 FUNC RETURNTYPE RAX 1
             411a90     41 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             411ac0    172 FUNC RETURNTYPE RAX 1
-            411ac0    172 FUNC INARGS    2  ARG0 0 ARG1 4 
+            411ac0    172 FUNC INARGS    2  ARG0 1 ARG1 4 
             411b70    172 FUNC RETURNTYPE RAX 1
             411b70    172 FUNC INARGS    2  ARG0 1 ARG1 4 
             411c20    154 FUNC RETURNTYPE RAX 1
-            411c20    154 FUNC INARGS    2  ARG0 0 ARG1 4 
+            411c20    154 FUNC INARGS    2  ARG0 1 ARG1 4 
             411cc0    364 FUNC RETURNTYPE RAX 0
             411cc0    364 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             411e30     50 FUNC RETURNTYPE RAX 1
@@ -857,24 +859,29 @@
             4126b0    109 FUNC RETURNTYPE RAX 4
             4126b0    109 FUNC INARGS    1  ARG0 4 
             412720     96 FUNC RETURNTYPE RAX 4
-            412720     96 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            412720     96 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             412780      9 FUNC RETURNTYPE RAX 1
-            412780      9 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
+            412780      9 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             412790     96 FUNC RETURNTYPE RAX 0
-            412790     96 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            412790     96 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4127f0     69 FUNC RETURNTYPE RAX 1
-            4127f0     69 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            4127f0     69 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             412840     69 FUNC RETURNTYPE RAX 1
-            412840     69 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            412840     69 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             412890    207 FUNC RETURNTYPE RAX 4
             412890    207 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             412960    140 FUNC RETURNTYPE RAX 4
             412960    140 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            4129f0    142 FUNC RETURNTYPE RAX 0
+            4129f0    142 FUNC RETURNTYPE RAX 16
+            4129f0    142 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             4129f0    142 FUNC PROBLEM sub_4129F0 CHUNKS 
+            412e60      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+-1 ZZ lea     rdi, [rax-1] 
+            412eca      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-1 ZZ lea     rdi, [rax-1] 
+            412ee7      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 1 
+            412ef8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+1 ZZ lea     rdi, [rax+1] 
             4130e0     16 FUNC RETURNTYPE RAX 1
             4130e0     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            4130f0    108 FUNC RETURNTYPE RAX 0
+            4130f0    108 FUNC RETURNTYPE RAX 16
             4130f0    108 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             413160     35 FUNC RETURNTYPE RAX 1
             413160     35 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 1 
@@ -916,7 +923,7 @@
             413d20    123 FUNC RETURNTYPE RAX 1
             413d20    123 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             413da0     48 FUNC RETURNTYPE RAX 1
-            413da0     48 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
+            413da0     48 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             413dd0    606 FUNC RETURNTYPE RAX 1
             413dd0    606 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             414030     69 FUNC RETURNTYPE RAX 1
@@ -967,7 +974,7 @@
             415360      7 FUNC RETURNTYPE RAX 0
             415360      7 FUNC INARGS    4  ARG0 96 ARG1 4 ARG2 96 ARG3 1 
             415370      7 FUNC RETURNTYPE RAX 0
-            415370      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
+            415370      7 FUNC INARGS    4  ARG0 1 ARG1 4 ARG2 1 ARG3 1 
             415380     38 FUNC RETURNTYPE RAX 1
             415380     38 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4153b0     39 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-ls-64bit.psexe.infoannot b/tests/commit/save-ls-64bit.psexe.infoannot
index ad90f1d4d6acd5d64fcb6ed4ff3b81787362a3ba..61bc1af6c2a05ab3f5e21f7e30875028e93f9466 100644
--- a/tests/commit/save-ls-64bit.psexe.infoannot
+++ b/tests/commit/save-ls-64bit.psexe.infoannot
@@ -264,7 +264,8 @@
             404ff0     14 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             405000     94 FUNC RETURNTYPE RAX 1
             405000     94 FUNC INARGS    2  ARG0 4 ARG1 4 
-            405060     11 FUNC RETURNTYPE RAX 0
+            405060     11 FUNC RETURNTYPE RAX 1
+            405060     11 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405060     11 FUNC PROBLEM sub_405060 CHUNKS 
             405070    394 FUNC RETURNTYPE RAX 0
             405070    394 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -448,7 +449,8 @@
             40a060     92 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             40a0c0     44 FUNC RETURNTYPE RAX 1
             40a0c0     44 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            40a280      8 FUNC RETURNTYPE RAX 0
+            40a280      8 FUNC RETURNTYPE RAX 1
+            40a280      8 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             40a280      8 FUNC PROBLEM sub_40A280 CHUNKS 
             40a290     24 FUNC RETURNTYPE RAX 4
             40a290     24 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-synaptic.psexe.infoannot b/tests/commit/save-synaptic.psexe.infoannot
index 5679f1e84872a611cb357845b5ebb46b1e353414..25a91ccd2a0237ed06bcd7d3f441e780560f3c69 100644
--- a/tests/commit/save-synaptic.psexe.infoannot
+++ b/tests/commit/save-synaptic.psexe.infoannot
@@ -3744,20 +3744,36 @@
             471b2d      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14*8 ZZ IDIOM 32 lea     rdx, ds:0[r14*8]; n 
             471b8e      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12*8 ZZ IDIOM 32 lea     rdx, ds:0[r12*8]; n 
             471ba1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, rdx        ; dest 
-            471c10    786 FUNC RETURNTYPE RAX 0
+            471c10    786 FUNC RETURNTYPE RAX 96
+            471c10    786 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             471c10    786 FUNC PROBLEM sub_471C10 CHUNKS 
-            471f30    786 FUNC RETURNTYPE RAX 0
+            471d3f      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, r10 
+            471d7d      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            471d7d      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            471f30    786 FUNC RETURNTYPE RAX 96
+            471f30    786 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             471f30    786 FUNC PROBLEM sub_471F30 CHUNKS 
+            47205f      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, r10 
+            47209d      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            47209d      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
             472250    888 FUNC RETURNTYPE RAX 4
             472250    888 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             472376      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R8 ZZ sub     r8, r10 
             4723ad      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [rdx+rax*8] 
             4723ad      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RAX*8 ZZ IDIOM 32 lea     rdx, [rdx+rax*8] 
             4725ae      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBP ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbx+rbp] 
-            472600    794 FUNC RETURNTYPE RAX 0
+            472600    794 FUNC RETURNTYPE RAX 96
+            472600    794 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             472600    794 FUNC PROBLEM sub_472600 CHUNKS 
-            472920    802 FUNC RETURNTYPE RAX 0
+            472728      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R8 ZZ sub     r8, r10 
+            472768      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            472768      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            472920    802 FUNC RETURNTYPE RAX 96
+            472920    802 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             472920    802 FUNC PROBLEM sub_472920 CHUNKS 
+            472a4f      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, r10 
+            472a8d      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            472a8d      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
             472c50   1594 FUNC RETURNTYPE RAX 0
             472c50   1594 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             472cd6      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ add     rcx, rbp 
@@ -3837,15 +3853,23 @@
             47540d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+R12 ZZ lea     rsi, [rbx+r12] 
             475442      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*8 ZZ lea     rsi, [rbx+rdx*8] 
             475442      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RDX*8 ZZ lea     rsi, [rbx+rdx*8] 
-            475590    794 FUNC RETURNTYPE RAX 0
+            475590    794 FUNC RETURNTYPE RAX 96
+            475590    794 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             475590    794 FUNC PROBLEM sub_475590 CHUNKS 
+            4756b8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R8 ZZ sub     r8, r10 
+            4756f8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            4756f8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
             4758b0    173 FUNC RETURNTYPE RAX 4
             4758b0    173 FUNC INARGS    5  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 1 
             47590d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+R12 ZZ lea     rsi, [rbx+r12] 
             475942      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*8 ZZ lea     rsi, [rbx+rdx*8] 
             475942      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RDX*8 ZZ lea     rsi, [rbx+rdx*8] 
-            475a90    794 FUNC RETURNTYPE RAX 0
+            475a90    794 FUNC RETURNTYPE RAX 96
+            475a90    794 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 4 
             475a90    794 FUNC PROBLEM sub_475A90 CHUNKS 
+            475bb8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R8 ZZ sub     r8, r10 
+            475bf8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
+            475bf8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+RAX*8 ZZ IDIOM 32 lea     rdx, [r11+rax*8] 
             475db0    352 FUNC RETURNTYPE RAX 1
             475db0    352 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 4 ARG5 4 
             475f10     95 FUNC RETURNTYPE RAX 1
@@ -3876,7 +3900,7 @@
             476590    187 FUNC RETURNTYPE RAX 96
             476590    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             476621      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rcx, [rbx+rbx] 
-            476650    241 FUNC RETURNTYPE RAX 0
+            476650    241 FUNC RETURNTYPE RAX 96
             476650    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             4766cd      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, rbp 
             4766d0      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     rcx, rbx 
@@ -3892,7 +3916,7 @@
             4769d0    187 FUNC RETURNTYPE RAX 96
             4769d0    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             476a61      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rcx, [rbx+rbx] 
-            476a90    241 FUNC RETURNTYPE RAX 0
+            476a90    241 FUNC RETURNTYPE RAX 96
             476a90    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             476b0d      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, rbp 
             476b10      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     rcx, rbx 
@@ -3924,7 +3948,7 @@
             4772d0    187 FUNC RETURNTYPE RAX 96
             4772d0    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             477361      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rcx, [rbx+rbx] 
-            477390    241 FUNC RETURNTYPE RAX 0
+            477390    241 FUNC RETURNTYPE RAX 96
             477390    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             47740d      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, rbp 
             477410      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     rcx, rbx 
@@ -3940,7 +3964,7 @@
             477710    187 FUNC RETURNTYPE RAX 96
             477710    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             4777a1      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rcx, [rbx+rbx] 
-            4777d0    241 FUNC RETURNTYPE RAX 0
+            4777d0    241 FUNC RETURNTYPE RAX 96
             4777d0    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             47784d      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, rbp 
             477850      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     rcx, rbx 
@@ -3956,7 +3980,7 @@
             477b50    187 FUNC RETURNTYPE RAX 96
             477b50    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             477be1      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rcx, [rbx+rbx] 
-            477c10    241 FUNC RETURNTYPE RAX 0
+            477c10    241 FUNC RETURNTYPE RAX 96
             477c10    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             477c8d      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, rbp 
             477c90      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     rcx, rbx 
@@ -3972,7 +3996,7 @@
             477f90    187 FUNC RETURNTYPE RAX 96
             477f90    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             478021      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX ZZ lea     rcx, [rbx+rbx] 
-            478050    241 FUNC RETURNTYPE RAX 0
+            478050    241 FUNC RETURNTYPE RAX 96
             478050    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             4780cd      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8, rbp 
             4780d0      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     rcx, rbx 
diff --git a/tests/commit/save-xcalc.psexe.infoannot b/tests/commit/save-xcalc.psexe.infoannot
index e60735ca6e314a47743b1e545ab075ab8f9334a6..3b77c3ea90484fbbea208fd60f5c4a49d7b95e75 100644
--- a/tests/commit/save-xcalc.psexe.infoannot
+++ b/tests/commit/save-xcalc.psexe.infoannot
@@ -170,6 +170,7 @@
             402670    103 FUNC RETURNTYPE RAX 1
             402670    103 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4026e0      9 FUNC RETURNTYPE RAX 0
+            4026e0      9 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4026e0      9 FUNC PROBLEM sub_4026E0 CHUNKS 
             4026f0     74 FUNC RETURNTYPE RAX 1
             4026f0     74 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-xedit.psexe.infoannot b/tests/commit/save-xedit.psexe.infoannot
index 7bc005a38e959b5ff56d992f0cab499c8702d891..e2d445307ab67342a4739f561b3aa5522c6d3e3c 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -620,7 +620,8 @@
             40fed0     43 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ff00      5 FUNC RETURNTYPE RAX 0
             40ff00      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 4 
-            40ff10     12 FUNC RETURNTYPE RAX 0
+            40ff10     12 FUNC RETURNTYPE RAX 96
+            40ff10     12 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ff10     12 FUNC PROBLEM sub_40FF10 CHUNKS 
             40ff20    149 FUNC RETURNTYPE RAX 0
             40ff20    149 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
@@ -709,8 +710,14 @@
             412e32      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+1] 
             412ef0     90 FUNC RETURNTYPE RAX 0
             412ef0     90 FUNC INARGS    1  ARG0 1 
-            413023    485 FUNC RETURNTYPE RAX 0
+            413023    485 FUNC RETURNTYPE RAX 1
+            413023    485 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             413023    485 FUNC PROBLEM sub_413023 CHUNKS 
+            4130c9      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX*8 ZZ lea     rdx, ds:0[rax*8]; n 
+            4130d4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX*8 ZZ lea     rdi, [rcx+rbx*8]; dest 
+            4130d4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RBX*8 ZZ lea     rdi, [rcx+rbx*8]; dest 
+            4130d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX*8 ZZ lea     rsi, [rcx+rax*8]; src 
+            4130d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RAX*8 ZZ lea     rsi, [rcx+rax*8]; src 
             413210    175 FUNC RETURNTYPE RAX 4
             413210    175 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4132c0    181 FUNC RETURNTYPE RAX 0
@@ -1155,7 +1162,7 @@
             4264b0      2 FUNC RETURNTYPE RAX 0
             4264b0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             426500     18 FUNC RETURNTYPE RAX 1
-            426500     18 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 1 ARG3 0 
+            426500     18 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 1 ARG3 1 
             426580     36 FUNC RETURNTYPE RAX 1
             426580     36 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4265b0     82 FUNC RETURNTYPE RAX 1
@@ -1175,7 +1182,7 @@
             4268b0     60 FUNC RETURNTYPE RAX 1
             4268b0     60 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             4268f0     60 FUNC RETURNTYPE RAX 1
-            4268f0     60 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
+            4268f0     60 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             426930    341 FUNC RETURNTYPE RAX 1
             426930    341 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             426a90    393 FUNC RETURNTYPE RAX 1
@@ -1268,7 +1275,8 @@
             428fe0    218 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4290c0    184 FUNC RETURNTYPE RAX 1
             4290c0    184 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            429180    850 FUNC RETURNTYPE RAX 0
+            429180    850 FUNC RETURNTYPE RAX 1
+            429180    850 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             429180    850 FUNC PROBLEM sub_429180 CHUNKS 
             4294e0    317 FUNC RETURNTYPE RAX 96
             4294e0    317 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
@@ -1288,8 +1296,12 @@
             42a8d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
             42a9ba      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
             42aa57      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
-            42aac0   1193 FUNC RETURNTYPE RAX 0
+            42aac0   1193 FUNC RETURNTYPE RAX 1
+            42aac0   1193 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             42aac0   1193 FUNC PROBLEM sub_42AAC0 CHUNKS 
+            4272c8      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 18h 
+            427455      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+24 ZZ lea     rdx, [rbp+18h] 
+            427515      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+24 ZZ lea     rdx, [rbp+18h] 
             42af70    889 FUNC RETURNTYPE RAX 1
             42af70    889 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42b2f0   1180 FUNC RETURNTYPE RAX 1
@@ -1482,6 +1494,7 @@
             43e8c0     16 FUNC RETURNTYPE RAX 0
             43e8c0     16 FUNC INARGS    4  ARG0 0 ARG1 1 ARG2 0 ARG3 0 
             43e8d0     16 FUNC RETURNTYPE RAX 0
+            43e8d0     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             43e8d0     16 FUNC PROBLEM sub_43E8D0 CHUNKS 
             43e8e0     16 FUNC RETURNTYPE RAX 0
             43e8e0     16 FUNC INARGS    4  ARG0 0 ARG1 1 ARG2 0 ARG3 0 
@@ -1772,7 +1785,8 @@
             44ba90     51 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44bac8     46 FUNC RETURNTYPE RAX 0
             44bac8     46 FUNC PROBLEM sub_44BAC8 JUMPUNRESOLVED 
-            44bb00     55 FUNC RETURNTYPE RAX 0
+            44bb00     55 FUNC RETURNTYPE RAX 1
+            44bb00     55 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44bb00     55 FUNC PROBLEM sub_44BB00 CHUNKS 
             44bb40    166 FUNC RETURNTYPE RAX 1
             44bb40    166 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1826,7 +1840,8 @@
             44c0f8     12 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             44c108     44 FUNC RETURNTYPE RAX 0
             44c108     44 FUNC PROBLEM sub_44C108 JUMPUNRESOLVED 
-            44c138     74 FUNC RETURNTYPE RAX 0
+            44c138     74 FUNC RETURNTYPE RAX 96
+            44c138     74 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             44c138     74 FUNC PROBLEM sub_44C138 CHUNKS 
             44c188    108 FUNC RETURNTYPE RAX 4
             44c188    108 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
@@ -1864,7 +1879,8 @@
             44c6c0     30 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             44c6e0     36 FUNC RETURNTYPE RAX 1
             44c6e0     36 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            44c708     46 FUNC RETURNTYPE RAX 0
+            44c708     46 FUNC RETURNTYPE RAX 1
+            44c708     46 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             44c708     46 FUNC PROBLEM sub_44C708 CHUNKS 
             44c740     64 FUNC RETURNTYPE RAX 1
             44c740     64 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -2000,8 +2016,10 @@
             4506d0    220 FUNC RETURNTYPE RAX 4
             4506d0    220 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             450790      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+10h] 
-            4507b0      7 FUNC RETURNTYPE RAX 0
+            4507b0      7 FUNC RETURNTYPE RAX 96
+            4507b0      7 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4507b0      7 FUNC PROBLEM sub_4507B0 CHUNKS 
+            4501db      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+16 ZZ lea     rdi, [rbp+10h] 
             4507c0    966 FUNC RETURNTYPE RAX 4
             4507c0    966 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             450b90    202 FUNC RETURNTYPE RAX 0
@@ -2181,9 +2199,9 @@
             46bbb0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             46bbc0      5 FUNC RETURNTYPE RAX 96
             46bbc0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 1 
-            46bbd0      5 FUNC RETURNTYPE RAX 1
-            46bbd0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 96 
-            46bbe0      5 FUNC RETURNTYPE RAX 1
+            46bbd0      5 FUNC RETURNTYPE RAX 96
+            46bbd0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
+            46bbe0      5 FUNC RETURNTYPE RAX 96
             46bbe0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             46bbf0      5 FUNC RETURNTYPE RAX 96
             46bbf0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
@@ -2196,7 +2214,7 @@
             46bc50     15 FUNC RETURNTYPE RAX 0
             46bc50     15 FUNC INARGS    4  ARG0 2 ARG1 4 ARG2 0 ARG3 0 
             46bc60     25 FUNC RETURNTYPE RAX 0
-            46bc60     25 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
+            46bc60     25 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             46bc80     15 FUNC RETURNTYPE RAX 0
             46bc80     15 FUNC INARGS    4  ARG0 2 ARG1 4 ARG2 0 ARG3 0 
             46bc90      9 FUNC RETURNTYPE RAX 0
@@ -2262,7 +2280,7 @@
             46ce20    121 FUNC RETURNTYPE RAX 0
             46ce20    121 FUNC INARGS    2  ARG0 4 ARG1 1 
             46d120     50 FUNC RETURNTYPE RAX 4
-            46d120     50 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 1 ARG5 0 
+            46d120     50 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 96 ARG4 1 ARG5 0 
             46d160     27 FUNC RETURNTYPE RAX 96
             46d160     27 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 96 ARG3 1 
             46d180    139 FUNC RETURNTYPE RAX 1
@@ -2287,16 +2305,18 @@
             46db74      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*4 ZZ lea     rsi, ds:0[rax*4] 
             46dbc0     70 FUNC RETURNTYPE RAX 1
             46dbc0     70 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            46dc10    305 FUNC RETURNTYPE RAX 0
+            46dc10    305 FUNC RETURNTYPE RAX 96
+            46dc10    305 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             46dc10    305 FUNC PROBLEM sub_46DC10 CHUNKS 
+            46e35f      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDX*4 ZZ lea     rsi, ds:0[rdx*4] 
             46e440     16 FUNC RETURNTYPE RAX 1
             46e440     16 FUNC INARGS    3  ARG0 8 ARG1 4 ARG2 4 
             46e450     13 FUNC RETURNTYPE RAX 1
             46e450     13 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 8 
             46e460    155 FUNC RETURNTYPE RAX 0
             46e460    155 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46e500     72 FUNC RETURNTYPE RAX 0
-            46e500     72 FUNC INARGS    6  ARG0 8 ARG1 8 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
+            46e500     72 FUNC RETURNTYPE RAX 96
+            46e500     72 FUNC INARGS    6  ARG0 8 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             46e550     13 FUNC RETURNTYPE RAX 0
             46e550     13 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             46e560     66 FUNC RETURNTYPE RAX 0
@@ -2309,7 +2329,9 @@
             46ea34      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13*4 ZZ lea     rsi, ds:0[r13*4] 
             46eab0      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13*4 ZZ lea     rdi, ds:0[r13*4] 
             46eae0     10 FUNC RETURNTYPE RAX 0
+            46eae0     10 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46eae0     10 FUNC PROBLEM sub_46EAE0 CHUNKS 
+            46cf2e      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP*4 ZZ lea     rsi, ds:0[rbp*4] 
             46eaf0     10 FUNC RETURNTYPE RAX 0
             46eaf0     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             46eb00     10 FUNC RETURNTYPE RAX 0
@@ -2324,13 +2346,16 @@
             46ed50    104 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             46edc0    121 FUNC RETURNTYPE RAX 1
             46edc0    121 FUNC INARGS    2  ARG0 4 ARG1 4 
-            46ee40    205 FUNC RETURNTYPE RAX 0
+            46ee40    205 FUNC RETURNTYPE RAX 1
+            46ee40    205 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             46ee40    205 FUNC PROBLEM sub_46EE40 CHUNKS 
-            46f070     75 FUNC RETURNTYPE RAX 0
+            46ef14      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBP*4 ZZ lea     rsi, ds:0[rbp*4] 
+            46f034      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15*4 ZZ lea     rsi, ds:0[r15*4] 
+            46f070     75 FUNC RETURNTYPE RAX 1
             46f070     75 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             46f0c0     10 FUNC RETURNTYPE RAX 1
             46f0c0     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 4 
-            46f0d0     72 FUNC RETURNTYPE RAX 0
+            46f0d0     72 FUNC RETURNTYPE RAX 1
             46f0d0     72 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             46f120      7 FUNC RETURNTYPE RAX 1
             46f120      7 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 4 
@@ -2343,7 +2368,7 @@
             46f210     51 FUNC RETURNTYPE RAX 0
             46f210     51 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 1 
             46f250    400 FUNC RETURNTYPE RAX 1
-            46f250    400 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 1 ARG5 0 
+            46f250    400 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 1 ARG5 0 
             46f4c0     86 FUNC RETURNTYPE RAX 1
             46f4c0     86 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             46f520     65 FUNC RETURNTYPE RAX 0
@@ -2362,7 +2387,7 @@
             46fed0    342 FUNC RETURNTYPE RAX 1
             46fed0    342 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             470140     98 FUNC RETURNTYPE RAX 4
-            470140     98 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            470140     98 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4701b0     60 FUNC RETURNTYPE RAX 0
             4701b0     60 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4701f0     79 FUNC RETURNTYPE RAX 0
@@ -2373,9 +2398,11 @@
             470280    276 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             470341      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; exponent 
             470440    158 FUNC RETURNTYPE RAX 96
-            470440    158 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 1 ARG5 0 
-            4704e0      7 FUNC RETURNTYPE RAX 0
+            470440    158 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 1 ARG5 0 
+            4704e0      7 FUNC RETURNTYPE RAX 1
+            4704e0      7 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             4704e0      7 FUNC PROBLEM sub_4704E0 CHUNKS 
+            470108      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+18h] 
             4704f0     95 FUNC RETURNTYPE RAX 96
             4704f0     95 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             470501      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+24 ZZ lea     rsi, [rsi+18h] 
@@ -2410,12 +2437,12 @@
             470850     10 FUNC RETURNTYPE RAX 1
             470850     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             470860     82 FUNC RETURNTYPE RAX 1
-            470860     82 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
+            470860     82 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             470990     44 FUNC RETURNTYPE RAX 1
             470990     44 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             4709a8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+18h] 
             4709c0     46 FUNC RETURNTYPE RAX 0
-            4709c0     46 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
+            4709c0     46 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             4709cd      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+24 ZZ lea     rdi, [rbx+18h] 
             4709f0    200 FUNC RETURNTYPE RAX 4
             4709f0    200 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
index a0d4cec7def4ee2fa3c40bf4546a9fc47d8d6aea..be52442ef2d108810e5502b0b7e8ad7c6c44a92e 100644
--- a/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-83e9b864731cfa10173995ea6887524772e05b4c
\ No newline at end of file
+83fd881f2ace81c091952dfd04a61753e87c9956
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id
index efd172bd32886b39f5484843f41a48bba472a67d..f5805279453ff0a0b9515f8b4545a50f9509f6c7 100644
--- a/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-e46f27c003c5a274a1558f1cb096e77706bf788c
\ No newline at end of file
+6ca675f6e565aeb1ddf3d2eedc9bd30dd136d7c1
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gedit.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gedit.psexe.annot.REMOVED.git-id
index 911dbb719b1ea84df9911606b3c3ebfc22c37ddb..5d68ceb91cd31f257864f8892e14e675438d4ad8 100644
--- a/tests/commit/trimmed-sorted-save-gedit.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gedit.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-fbc006187569d1012c5f638fd63f47fa782379bd
\ No newline at end of file
+225dcdc78d4d3130a9d887ad49c0cd45e21c4dce
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-calculator.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-calculator.psexe.annot.REMOVED.git-id
index 16cb921950ea70c10b6bab30c824085e60717cda..f1c12cc56c14e9bbc15c4f1afef1689f1b6e12ce 100644
--- a/tests/commit/trimmed-sorted-save-gnome-calculator.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-calculator.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-9c318cdafb76f5594d275e49e43fc37868481f06
\ No newline at end of file
+f4c40f9838d4c279c128d52dd239b8b39de3ecb0
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
index bdc199f9f94373e9926f38cec1b7e214902d490d..d97c63dd51472ac07b881ce29bbf8c5f8023ec3a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -4130,8 +4130,8 @@
             407ce6     -1 INSTR LOCAL NoMetaUpdate jmp     _g_value_set_boxed 
             407cf0      1 INSTR BELONGTO 40aa50 
             407cf0      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+            407cf1     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             407cf1      3 INSTR BELONGTO 40aa50 
-            407cf1      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
             407cf4      4 INSTR BELONGTO 40aa50 
             407cf4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
             407cf8     -1 INSTR LOCAL NoMetaUpdate ucomiss xmm0, cs:dword_40BED0 
@@ -4146,22 +4146,19 @@
             407d0a     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_get_size 
             407d0a      5 INSTR BELONGTO 40aa50 
             407d0a      5 INSTR DEADREGS  EFLAGS ZZ call    _pango_font_description_get_size 
-            407d0f     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     eax, 200h 
+            407d0f     -1 INSTR LOCAL MetadataUnused add     eax, 200h 
             407d0f      5 INSTR BELONGTO 40aa50 
-            407d14     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, [rsp+18h+var_18] 
+            407d14     -1 INSTR LOCAL MetadataUnused movss   xmm0, [rsp+18h+var_18] 
             407d14      5 INSTR BELONGTO 40aa50 
-            407d14      5 PTRIMMEDESP STACK 0 displ movss   xmm0, [rsp+18h+var_18]
-            407d19     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 0Ah 
+            407d19     -1 INSTR LOCAL MetadataUnused sar     eax, 0Ah 
             407d19      3 INSTR BELONGTO 40aa50 
-            407d19      3 INSTR DEADREGS  EFLAGS RDI R8 R9 R10 R11 ZZ sar     eax, 0Ah 
             407d1c     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm1, eax 
             407d1c      4 INSTR BELONGTO 40aa50 
             407d20     -1 INSTR LOCAL NoMetaUpdate mulss   xmm1, xmm0 
             407d20      4 INSTR BELONGTO 40aa50 
-            407d24     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM cvttss2si esi, xmm1 
+            407d24     -1 INSTR LOCAL AlwaysNUM cvttss2si esi, xmm1 
             407d24      4 INSTR BELONGTO 40aa50 
-            407d24      4 INSTR DEADREGS  EFLAGS RDI R8 R9 R10 R11 ZZ cvttss2si esi, xmm1 
-            407d28     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm1, cs:dword_40BED4 
+            407d28     -1 INSTR LOCAL MetadataUnused movss   xmm1, cs:dword_40BED4 
             407d28      8 INSTR BELONGTO 40aa50 
             407d30     -1 INSTR LOCAL NoMetaUpdate ucomiss xmm0, xmm1 
             407d30      3 INSTR BELONGTO 40aa50 
@@ -4171,16 +4168,16 @@
             407d35      3 INSTR BELONGTO 40aa50 
             407d38     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_407D42 
             407d38      2 INSTR BELONGTO 40aa50 
-            407d3a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     eax, 1 
+            407d3a     -1 INSTR LOCAL MetadataUnused sub     eax, 1 
             407d3a      3 INSTR BELONGTO 40aa50 
             407d3d     -1 INSTR LOCAL NoMetaUpdate cmp     esi, eax 
             407d3d      2 INSTR BELONGTO 40aa50 
+            407d3f     -1 INSTR LOCAL MetadataUnused cmovg   esi, eax 
             407d3f      3 INSTR BELONGTO 40aa50 
-            407d3f      3 INSTR DEADREGS  RDI R8 R9 R10 R11 XMM0 XMM1 ZZ cmovg   esi, eax 
             407d42     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             407d42      4 INSTR BELONGTO 40aa50 
+            407d46     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
             407d46      3 INSTR BELONGTO 40aa50 
-            407d46      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ mov     rdi, rbx 
             407d49      1 INSTR BELONGTO 40aa50 
             407d49      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ pop     rbx 
             407d4a     -1 INSTR LOCAL NoMetaUpdate jmp     sub_407010 
@@ -4190,24 +4187,23 @@
             407d50      4 INSTR BELONGTO 40aa50 
             407d54      5 INSTR BELONGTO 40aa50 
             407d54      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ mov     edx, offset aFactor0_0f; "factor > 0.0f" 
+            407d59     -1 INSTR LOCAL MetadataUnused mov     esi, offset aGucharmap_mi_1; "gucharmap_mini_font_selection_change_fo"... 
             407d59      5 INSTR BELONGTO 40aa50 
-            407d59      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ mov     esi, offset aGucharmap_mi_1; "gucharmap_mini_font_selection_change_fo"... 
             407d5e      1 INSTR BELONGTO 40aa50 
             407d5e      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ pop     rbx 
+            407d5f     -1 INSTR LOCAL MetadataUnused xor     edi, edi 
             407d5f      2 INSTR BELONGTO 40aa50 
-            407d5f      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ xor     edi, edi 
-            407d5f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
             407d61     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             407d61      5 INSTR BELONGTO 40aa50 
             407d61      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ jmp     _g_return_if_fail_warning 
-            407d70     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     eax, 1 
+            407d70     -1 INSTR LOCAL MetadataUnused add     eax, 1 
             407d70      3 INSTR BELONGTO 40aa50 
+            407d73     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
             407d73      3 INSTR BELONGTO 40aa50 
-            407d73      3 INSTR DEADREGS  EFLAGS RDI R8 R9 R10 R11 XMM0 XMM1 ZZ mov     rdi, rbx 
             407d76     -1 INSTR LOCAL NoMetaUpdate cmp     esi, eax 
             407d76      2 INSTR BELONGTO 40aa50 
+            407d78     -1 INSTR LOCAL MetadataUnused cmovl   esi, eax 
             407d78      3 INSTR BELONGTO 40aa50 
-            407d78      3 INSTR DEADREGS  RBX RDI R8 R9 R10 R11 XMM0 XMM1 ZZ cmovl   esi, eax 
             407d7b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             407d7b      4 INSTR BELONGTO 40aa50 
             407d7f      0 DEALLOC STACK esp - 0 pop     rbx
@@ -7789,8 +7785,8 @@
             409ddd      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r12
             409de2      4 INSTR BELONGTO 40b2d0 
             409de2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
+            409de6     -1 INSTR LOCAL MetadataUnused mov     ebp, esi 
             409de6      2 INSTR BELONGTO 40b2d0 
-            409de6      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
             409de8     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
             409de8      5 INSTR BELONGTO 40b2d0 
             409de8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ call    sub_408830 
@@ -7803,8 +7799,8 @@
             409df3      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_instance_get_private 
             409df8     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+20h], 0 
             409df8      5 INSTR BELONGTO 40b2d0 
+            409dfd     -1 INSTR LOCAL MetadataUnused mov     r12, rax 
             409dfd      3 INSTR BELONGTO 40b2d0 
-            409dfd      3 INSTR DEADREGS  R12 ZZ mov     r12, rax 
             409e00     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409E20 
             409e00      2 INSTR BELONGTO 40b2d0 
             409e02     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_type 
@@ -7836,35 +7832,29 @@
             409e2b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409e2b      5 INSTR BELONGTO 40b2d0 
             409e2b      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_type_check_instance_cast 
+            409e30     -1 INSTR LOCAL MetadataUnused mov     rbx, [rsp+18h+var_18] 
             409e30      4 INSTR BELONGTO 40b2d0 
-            409e30      4 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
-            409e30      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
+            409e34     -1 INSTR LOCAL MetadataUnused mov     rbp, [rsp+18h+var_10] 
             409e34      5 INSTR BELONGTO 40b2d0 
-            409e34      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     rbp, [rsp+18h+var_10] 
-            409e34      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+18h+var_10]
+            409e39     -1 INSTR LOCAL MetadataUnused mov     rdi, rax 
             409e39      3 INSTR BELONGTO 40b2d0 
-            409e39      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     rdi, rax 
+            409e3c     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+18h+var_8] 
             409e3c      5 INSTR BELONGTO 40b2d0 
-            409e3c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     r12, [rsp+18h+var_8] 
-            409e3c      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+18h+var_8]
             409e41     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             409e41      4 INSTR BELONGTO 40b2d0 
             409e45     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_window_present 
             409e45      5 INSTR BELONGTO 40b2d0 
             409e45      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _gtk_window_present 
+            409e50     -1 INSTR LOCAL MetadataUnused mov     esi, ebp 
             409e50      2 INSTR BELONGTO 40b2d0 
-            409e50      2 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 R12 ZZ mov     esi, ebp 
+            409e52     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
             409e52      3 INSTR BELONGTO 40b2d0 
-            409e52      3 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 R12 ZZ mov     rdi, rbx 
+            409e55     -1 INSTR LOCAL MetadataUnused mov     rbp, [rsp+18h+var_10] 
             409e55      5 INSTR BELONGTO 40b2d0 
-            409e55      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     rbp, [rsp+18h+var_10] 
-            409e55      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+18h+var_10]
+            409e5a     -1 INSTR LOCAL MetadataUnused mov     rbx, [rsp+18h+var_18] 
             409e5a      4 INSTR BELONGTO 40b2d0 
-            409e5a      4 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
-            409e5a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
+            409e5e     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+18h+var_8] 
             409e5e      5 INSTR BELONGTO 40b2d0 
-            409e5e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     r12, [rsp+18h+var_8] 
-            409e5e      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+18h+var_8]
             409e63     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             409e63      4 INSTR BELONGTO 40b2d0 
             409e67      0 DEALLOC STACK esp - 0 jmp     sub_4088B0
@@ -9389,15 +9379,15 @@
             40aa41     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407CF0 
             40aa41      5 INSTR BELONGTO 40aa20 
             40aa41      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ jmp     loc_407CF0 
-            40aa50      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+            40aa50      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 16 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40aa50      0 FUNC MMSAFENESS UNSAFE
             40aa50      1 INSTR BELONGTO 40aa50 
             40aa50      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ push    rbx 
             40aa50     38 FUNC GLOBAL sub_40AA50 FUNC_UNSAFE NOFP RET             40aa75 
             40aa50      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             40aa50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
+            40aa51     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             40aa51      3 INSTR BELONGTO 40aa50 
-            40aa51      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
             40aa54     -1 INSTR LOCAL NoMetaUpdate call    sub_407720 
             40aa54      5 INSTR BELONGTO 40aa50 
             40aa54      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_407720 
@@ -9410,10 +9400,10 @@
             40aa60      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
             40aa65      1 INSTR BELONGTO 40aa50 
             40aa65      1 INSTR DEADREGS  EFLAGS RBX RDI ZZ pop     rbx 
-            40aa66     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, cs:dword_40D4D0 
+            40aa66     -1 INSTR LOCAL SafeIfNoIndexing movss   xmm0, cs:dword_40D4D0 
             40aa66      8 INSTR BELONGTO 40aa50 
+            40aa6e     -1 INSTR LOCAL MetadataUnused mov     rdi, rax 
             40aa6e      3 INSTR BELONGTO 40aa50 
-            40aa6e      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40aa71     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407CF0 
             40aa71      5 INSTR BELONGTO 40aa50 
             40aa71      5 INSTR DEADREGS  EFLAGS ZZ jmp     loc_407CF0 
@@ -10181,7 +10171,7 @@
             40b2c1     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40B1D0 
             40b2c1      5 INSTR BELONGTO 40b290 
             40b2c1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     sub_40B1D0 
-            40b2d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+            40b2d0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40b2d0      0 FUNC MMSAFENESS UNSAFE
             40b2d0      1 INSTR BELONGTO 40b2d0 
             40b2d0      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
@@ -10190,8 +10180,8 @@
             40b2d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40b2d1     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsi+70h], 0 
             40b2d1      5 INSTR BELONGTO 40b2d0 
+            40b2d6     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             40b2d6      3 INSTR BELONGTO 40b2d0 
-            40b2d6      3 INSTR DEADREGS  RBX ZZ mov     rbx, rsi 
             40b2d9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B300 
             40b2d9      2 INSTR BELONGTO 40b2d0 
             40b2db     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
@@ -10206,9 +10196,8 @@
             40b2e7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
             40b2ec      1 INSTR BELONGTO 40b2d0 
             40b2ec      1 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ pop     rbx 
-            40b2ed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b2ed     -1 INSTR LOCAL MetadataUnused mov     esi, 1 
             40b2ed      5 INSTR BELONGTO 40b2d0 
-            40b2ed      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             40b2f2      3 INSTR BELONGTO 40b2d0 
             40b2f2      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40b2f5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409DD0 
diff --git a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
index 3c421612e7cb22f9bb2423c46038b1763e56d758..1fbc812a40b44d3bccd2ea8995d1d7013488f6b5 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3783,9 +3783,8 @@
             4091cc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4091cc      5 INSTR BELONGTO 40f660 
             4091cc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _dcgettext 
+            4091d1     -1 INSTR LOCAL MetadataRedundant xor     edi, edi        ; domainname 
             4091d1      2 INSTR BELONGTO 40f660 
-            4091d1      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            4091d1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4091d3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4091d3      5 INSTR BELONGTO 40f660 
             4091d3      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
@@ -3842,18 +3841,14 @@
             409228      8 INSTR BELONGTO 40f660 
             409228      8 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+108h+var_28] 
             409228      8 PTRIMMEDESP STACK 224 displ mov     rbp, [rsp+108h+var_28]
+            409230     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+108h+var_20] 
             409230      8 INSTR BELONGTO 40f660 
-            409230      8 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     r12, [rsp+108h+var_20] 
-            409230      8 PTRIMMEDESP STACK 232 displ mov     r12, [rsp+108h+var_20]
+            409238     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+108h+var_18] 
             409238      8 INSTR BELONGTO 40f660 
-            409238      8 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     r13, [rsp+108h+var_18] 
-            409238      8 PTRIMMEDESP STACK 240 displ mov     r13, [rsp+108h+var_18]
+            409240     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+108h+var_10] 
             409240      8 INSTR BELONGTO 40f660 
-            409240      8 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     r14, [rsp+108h+var_10] 
-            409240      8 PTRIMMEDESP STACK 248 displ mov     r14, [rsp+108h+var_10]
+            409248     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+108h+var_8] 
             409248      8 INSTR BELONGTO 40f660 
-            409248      8 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     r15, [rsp+108h+var_8] 
-            409248      8 PTRIMMEDESP STACK 256 displ mov     r15, [rsp+108h+var_8]
             409250     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 108h 
             409250      7 INSTR BELONGTO 40f660 
             409257      0 DEALLOC STACK esp - 0 retn
@@ -14018,7 +14013,7 @@
             40f655     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_grab_focus 
             40f655      5 INSTR BELONGTO 40f600 
             40f655      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _gtk_widget_grab_focus 
-            40f660      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+            40f660      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40f660      0 FUNC MMSAFENESS UNSAFE
             40f660    105 FUNC GLOBAL sub_40F660 FUNC_UNSAFE NOFP RET             40f6c8 
             40f660      1 INSTR BELONGTO 40f660 
diff --git a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
index a718dbc9cb9a33218a9313a13152af2c6d3ee78a..c5f18a12c494af13b273f0e2482a1f2cec3eac59 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -1753,8 +1753,8 @@
             401d26      2 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ push    r12 
             401d28      1 INSTR BELONGTO 401f00 
             401d28      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbp 
+            401d29     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
             401d29      3 INSTR BELONGTO 401f00 
-            401d29      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     rbp, rdi 
             401d2c      1 INSTR BELONGTO 401f00 
             401d2c      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             401d2d      3 INSTR BELONGTO 401f00 
@@ -1806,20 +1806,20 @@
             401d6c      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             401d70      7 INSTR BELONGTO 401f00 
             401d70      7 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ lea     rax, a0123456789abcd; "0123456789abcdef" 
+            401d77     -1 INSTR LOCAL MetadataUnused lea     r14, a0123456789ab_0; "0123456789ABCDEF" 
             401d77      7 INSTR BELONGTO 401f00 
-            401d77      7 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ lea     r14, a0123456789ab_0; "0123456789ABCDEF" 
             401d7e      5 INSTR BELONGTO 401f00 
             401d7e      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 ZZ lea     rdi, [rbx+rbx+1] 
             401d83     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             401d83      2 INSTR BELONGTO 401f00 
+            401d85     -1 INSTR LOCAL MetadataUnused cmovz   r14, rax 
             401d85      4 INSTR BELONGTO 401f00 
-            401d85      4 INSTR DEADREGS  R12 R13 R15 ZZ cmovz   r14, rax 
-            401d89     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
+            401d89     -1 INSTR LOCAL MetadataUnused xor     r13d, r13d 
             401d89      3 INSTR BELONGTO 401f00 
-            401d89      3 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ xor     r13d, r13d 
             401d8c     -1 INSTR LOCAL NoMetaUpdate call    _g_string_sized_new 
             401d8c      5 INSTR BELONGTO 401f00 
             401d8c      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_string_sized_new 
+            401d91     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 INSTR BELONGTO 401f00 
             401d91      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R15 ZZ movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 PTRIMMEDESP STACK 11 displ movsx   ecx, [rsp+48h+var_3D]
@@ -1827,22 +1827,21 @@
             401d96      3 INSTR BELONGTO 401f00 
             401d99      3 INSTR BELONGTO 401f00 
             401d99      3 INSTR DEADREGS  RSI RDI R12 R15 ZZ mov     r12, rax 
+            401d9c     -1 INSTR LOCAL MetadataUnused mov     r15d, [rsp+48h+var_44] 
             401d9c      5 INSTR BELONGTO 401f00 
-            401d9c      5 INSTR DEADREGS  RSI RDI R15 ZZ mov     r15d, [rsp+48h+var_44] 
-            401d9c      5 PTRIMMEDESP STACK 4 displ mov     r15d, [rsp+48h+var_44]
             401da1      4 INSTR BELONGTO 401f00 
             401da1      4 INSTR DEADREGS  RSI RDI ZZ mov     [rsp+48h+var_3C], ecx 
             401da1      4 PTRIMMEDESP STACK 12 displ mov     [rsp+48h+var_3C], ecx
             401da5     -1 INSTR LOCAL NoMetaUpdate jz      loc_401E80 
             401da5      6 INSTR BELONGTO 401f00 
             401dab      5 INSTR BELONGTO 401f00 
+            401db0     -1 INSTR LOCAL MetadataUnused movzx   eax, byte ptr [rbp+r13+0] 
             401db0      6 INSTR BELONGTO 401f00 
-            401db0      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbp+r13+0] 
-            401db6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM shr     al, 4 
+            401db6     -1 INSTR LOCAL MetadataUnused shr     al, 4 
             401db6      3 INSTR BELONGTO 401f00 
-            401db6      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ shr     al, 4 
+            401db9     -1 INSTR LOCAL MetadataUnused movzx   eax, al 
             401db9      3 INSTR BELONGTO 401f00 
-            401db9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   eax, al 
+            401dbc     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401dbc      5 INSTR BELONGTO 401f00 
             401dbc      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401dc1      5 INSTR BELONGTO 401f00 
@@ -1863,10 +1862,11 @@
             401de0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [r12+8], rcx 
             401de5      5 INSTR BELONGTO 401f00 
             401de5      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
+            401dea     -1 INSTR LOCAL MetadataUnused movzx   eax, byte ptr [rbp+r13+0] 
             401dea      6 INSTR BELONGTO 401f00 
-            401dea      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbp+r13+0] 
+            401df0     -1 INSTR LOCAL MetadataUnused and     eax, 0Fh 
             401df0      3 INSTR BELONGTO 401f00 
-            401df0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ and     eax, 0Fh 
+            401df3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401df3      5 INSTR BELONGTO 401f00 
             401df3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401df8      5 INSTR BELONGTO 401f00 
@@ -1887,29 +1887,26 @@
             401e17      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [r12+8], rcx 
             401e1c      5 INSTR BELONGTO 401f00 
             401e1c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
-            401e21     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 1 
+            401e21     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
             401e21      4 INSTR BELONGTO 401f00 
             401e25     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401E80 
             401e25      2 INSTR BELONGTO 401f00 
-            401e27     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r13, 1 
+            401e27     -1 INSTR LOCAL MetadataUnused add     r13, 1 
             401e27      4 INSTR BELONGTO 401f00 
             401e2b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401DB0 
             401e2b      2 INSTR BELONGTO 401f00 
+            401e2d     -1 INSTR LOCAL MetadataUnused mov     eax, [rsp+48h+var_44] 
             401e2d      4 INSTR BELONGTO 401f00 
-            401e2d      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     eax, [rsp+48h+var_44] 
-            401e2d      4 PTRIMMEDESP STACK 4 displ mov     eax, [rsp+48h+var_44]
             401e31     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             401e31      2 INSTR BELONGTO 401f00 
             401e33     -1 INSTR LOCAL NoMetaUpdate jz      loc_401DB0 
             401e33      6 INSTR BELONGTO 401f00 
+            401e39     -1 INSTR LOCAL MetadataUnused xor     edx, edx 
             401e39      2 INSTR BELONGTO 401f00 
-            401e39      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edx, edx 
-            401e39     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401e3b     -1 INSTR LOCAL MetadataUnused mov     rax, r13 
             401e3b      3 INSTR BELONGTO 401f00 
-            401e3b      3 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, r13 
-            401e3e     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM div     r15 
+            401e3e     -1 INSTR LOCAL MetadataUnused div     r15 
             401e3e      3 INSTR BELONGTO 401f00 
-            401e3e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ div     r15 
             401e41     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
             401e41      3 INSTR BELONGTO 401f00 
             401e44     -1 INSTR LOCAL NoMetaUpdate jnz     loc_401DB0 
@@ -1922,6 +1919,7 @@
             401e53      5 INSTR BELONGTO 401f00 
             401e58     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EE0 
             401e58      6 INSTR BELONGTO 401f00 
+            401e5e     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 INSTR BELONGTO 401f00 
             401e5e      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 PTRIMMEDESP STACK 11 displ movzx   ecx, [rsp+48h+var_3D]
@@ -1940,11 +1938,10 @@
             401e80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             401e80      4 INSTR BELONGTO 401f00 
             401e84      0 DEALLOC STACK esp - 0 mov     rdi, r12
+            401e84     -1 INSTR LOCAL MetadataUnused mov     rdi, r12 
             401e84      3 INSTR BELONGTO 401f00 
-            401e84      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ mov     rdi, r12 
+            401e87     -1 INSTR LOCAL MetadataUnused xor     esi, esi 
             401e87      2 INSTR BELONGTO 401f00 
-            401e87      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     esi, esi 
-            401e87     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
             401e89      1 INSTR BELONGTO 401f00 
             401e89      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             401e8a      1 INSTR BELONGTO 401f00 
@@ -1960,6 +1957,7 @@
             401e93     -1 INSTR LOCAL NoMetaUpdate jmp     _g_string_free 
             401e93      5 INSTR BELONGTO 401f00 
             401e93      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_string_free 
+            401ea0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
             401ea0      3 INSTR BELONGTO 401f00 
             401ea0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ea3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1972,6 +1970,7 @@
             401ead      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401eb2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401E21 
             401eb2      5 INSTR BELONGTO 401f00 
+            401ec0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
             401ec0      3 INSTR BELONGTO 401f00 
             401ec0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ec3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1984,6 +1983,7 @@
             401ecd      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401ed2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DEA 
             401ed2      5 INSTR BELONGTO 401f00 
+            401ee0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rsp+48h+var_3C] 
             401ee0      4 INSTR BELONGTO 401f00 
             401ee0      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, [rsp+48h+var_3C] 
             401ee0      4 PTRIMMEDESP STACK 12 displ mov     edx, [rsp+48h+var_3C]
@@ -1997,7 +1997,7 @@
             401eee      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401ef3     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DB0 
             401ef3      5 INSTR BELONGTO 401f00 
-            401f00      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+            401f00      0 FUNC FRAMERESTORE 0 0 96 1 0 1 2 0 1 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             401f00      0 FUNC MMSAFENESS UNSAFE
             401f00     15 FUNC GLOBAL sub_401F00 FUNC_UNSAFE NOFP RET             401f0e 
             401f00     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
diff --git a/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id
index 81b51f8769a58aefe69f83331f1a71e23f6c362f..a3e9b83c8c3395ea619c292d501269aa208c3dc9 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-2da9570d7d4f85d0e666924bd078979f7c685103
\ No newline at end of file
+dda232766ec81fece5e42a171077260284079e91
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
index a718dbc9cb9a33218a9313a13152af2c6d3ee78a..c5f18a12c494af13b273f0e2482a1f2cec3eac59 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -1753,8 +1753,8 @@
             401d26      2 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ push    r12 
             401d28      1 INSTR BELONGTO 401f00 
             401d28      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbp 
+            401d29     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
             401d29      3 INSTR BELONGTO 401f00 
-            401d29      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     rbp, rdi 
             401d2c      1 INSTR BELONGTO 401f00 
             401d2c      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             401d2d      3 INSTR BELONGTO 401f00 
@@ -1806,20 +1806,20 @@
             401d6c      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             401d70      7 INSTR BELONGTO 401f00 
             401d70      7 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ lea     rax, a0123456789abcd; "0123456789abcdef" 
+            401d77     -1 INSTR LOCAL MetadataUnused lea     r14, a0123456789ab_0; "0123456789ABCDEF" 
             401d77      7 INSTR BELONGTO 401f00 
-            401d77      7 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ lea     r14, a0123456789ab_0; "0123456789ABCDEF" 
             401d7e      5 INSTR BELONGTO 401f00 
             401d7e      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 ZZ lea     rdi, [rbx+rbx+1] 
             401d83     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             401d83      2 INSTR BELONGTO 401f00 
+            401d85     -1 INSTR LOCAL MetadataUnused cmovz   r14, rax 
             401d85      4 INSTR BELONGTO 401f00 
-            401d85      4 INSTR DEADREGS  R12 R13 R15 ZZ cmovz   r14, rax 
-            401d89     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
+            401d89     -1 INSTR LOCAL MetadataUnused xor     r13d, r13d 
             401d89      3 INSTR BELONGTO 401f00 
-            401d89      3 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ xor     r13d, r13d 
             401d8c     -1 INSTR LOCAL NoMetaUpdate call    _g_string_sized_new 
             401d8c      5 INSTR BELONGTO 401f00 
             401d8c      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_string_sized_new 
+            401d91     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 INSTR BELONGTO 401f00 
             401d91      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R15 ZZ movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 PTRIMMEDESP STACK 11 displ movsx   ecx, [rsp+48h+var_3D]
@@ -1827,22 +1827,21 @@
             401d96      3 INSTR BELONGTO 401f00 
             401d99      3 INSTR BELONGTO 401f00 
             401d99      3 INSTR DEADREGS  RSI RDI R12 R15 ZZ mov     r12, rax 
+            401d9c     -1 INSTR LOCAL MetadataUnused mov     r15d, [rsp+48h+var_44] 
             401d9c      5 INSTR BELONGTO 401f00 
-            401d9c      5 INSTR DEADREGS  RSI RDI R15 ZZ mov     r15d, [rsp+48h+var_44] 
-            401d9c      5 PTRIMMEDESP STACK 4 displ mov     r15d, [rsp+48h+var_44]
             401da1      4 INSTR BELONGTO 401f00 
             401da1      4 INSTR DEADREGS  RSI RDI ZZ mov     [rsp+48h+var_3C], ecx 
             401da1      4 PTRIMMEDESP STACK 12 displ mov     [rsp+48h+var_3C], ecx
             401da5     -1 INSTR LOCAL NoMetaUpdate jz      loc_401E80 
             401da5      6 INSTR BELONGTO 401f00 
             401dab      5 INSTR BELONGTO 401f00 
+            401db0     -1 INSTR LOCAL MetadataUnused movzx   eax, byte ptr [rbp+r13+0] 
             401db0      6 INSTR BELONGTO 401f00 
-            401db0      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbp+r13+0] 
-            401db6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM shr     al, 4 
+            401db6     -1 INSTR LOCAL MetadataUnused shr     al, 4 
             401db6      3 INSTR BELONGTO 401f00 
-            401db6      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ shr     al, 4 
+            401db9     -1 INSTR LOCAL MetadataUnused movzx   eax, al 
             401db9      3 INSTR BELONGTO 401f00 
-            401db9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   eax, al 
+            401dbc     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401dbc      5 INSTR BELONGTO 401f00 
             401dbc      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401dc1      5 INSTR BELONGTO 401f00 
@@ -1863,10 +1862,11 @@
             401de0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [r12+8], rcx 
             401de5      5 INSTR BELONGTO 401f00 
             401de5      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
+            401dea     -1 INSTR LOCAL MetadataUnused movzx   eax, byte ptr [rbp+r13+0] 
             401dea      6 INSTR BELONGTO 401f00 
-            401dea      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbp+r13+0] 
+            401df0     -1 INSTR LOCAL MetadataUnused and     eax, 0Fh 
             401df0      3 INSTR BELONGTO 401f00 
-            401df0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ and     eax, 0Fh 
+            401df3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401df3      5 INSTR BELONGTO 401f00 
             401df3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401df8      5 INSTR BELONGTO 401f00 
@@ -1887,29 +1887,26 @@
             401e17      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [r12+8], rcx 
             401e1c      5 INSTR BELONGTO 401f00 
             401e1c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
-            401e21     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 1 
+            401e21     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
             401e21      4 INSTR BELONGTO 401f00 
             401e25     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401E80 
             401e25      2 INSTR BELONGTO 401f00 
-            401e27     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r13, 1 
+            401e27     -1 INSTR LOCAL MetadataUnused add     r13, 1 
             401e27      4 INSTR BELONGTO 401f00 
             401e2b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401DB0 
             401e2b      2 INSTR BELONGTO 401f00 
+            401e2d     -1 INSTR LOCAL MetadataUnused mov     eax, [rsp+48h+var_44] 
             401e2d      4 INSTR BELONGTO 401f00 
-            401e2d      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     eax, [rsp+48h+var_44] 
-            401e2d      4 PTRIMMEDESP STACK 4 displ mov     eax, [rsp+48h+var_44]
             401e31     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             401e31      2 INSTR BELONGTO 401f00 
             401e33     -1 INSTR LOCAL NoMetaUpdate jz      loc_401DB0 
             401e33      6 INSTR BELONGTO 401f00 
+            401e39     -1 INSTR LOCAL MetadataUnused xor     edx, edx 
             401e39      2 INSTR BELONGTO 401f00 
-            401e39      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edx, edx 
-            401e39     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401e3b     -1 INSTR LOCAL MetadataUnused mov     rax, r13 
             401e3b      3 INSTR BELONGTO 401f00 
-            401e3b      3 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, r13 
-            401e3e     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM div     r15 
+            401e3e     -1 INSTR LOCAL MetadataUnused div     r15 
             401e3e      3 INSTR BELONGTO 401f00 
-            401e3e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ div     r15 
             401e41     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
             401e41      3 INSTR BELONGTO 401f00 
             401e44     -1 INSTR LOCAL NoMetaUpdate jnz     loc_401DB0 
@@ -1922,6 +1919,7 @@
             401e53      5 INSTR BELONGTO 401f00 
             401e58     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EE0 
             401e58      6 INSTR BELONGTO 401f00 
+            401e5e     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 INSTR BELONGTO 401f00 
             401e5e      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 PTRIMMEDESP STACK 11 displ movzx   ecx, [rsp+48h+var_3D]
@@ -1940,11 +1938,10 @@
             401e80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             401e80      4 INSTR BELONGTO 401f00 
             401e84      0 DEALLOC STACK esp - 0 mov     rdi, r12
+            401e84     -1 INSTR LOCAL MetadataUnused mov     rdi, r12 
             401e84      3 INSTR BELONGTO 401f00 
-            401e84      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ mov     rdi, r12 
+            401e87     -1 INSTR LOCAL MetadataUnused xor     esi, esi 
             401e87      2 INSTR BELONGTO 401f00 
-            401e87      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     esi, esi 
-            401e87     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
             401e89      1 INSTR BELONGTO 401f00 
             401e89      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             401e8a      1 INSTR BELONGTO 401f00 
@@ -1960,6 +1957,7 @@
             401e93     -1 INSTR LOCAL NoMetaUpdate jmp     _g_string_free 
             401e93      5 INSTR BELONGTO 401f00 
             401e93      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_string_free 
+            401ea0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
             401ea0      3 INSTR BELONGTO 401f00 
             401ea0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ea3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1972,6 +1970,7 @@
             401ead      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401eb2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401E21 
             401eb2      5 INSTR BELONGTO 401f00 
+            401ec0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
             401ec0      3 INSTR BELONGTO 401f00 
             401ec0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ec3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1984,6 +1983,7 @@
             401ecd      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401ed2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DEA 
             401ed2      5 INSTR BELONGTO 401f00 
+            401ee0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rsp+48h+var_3C] 
             401ee0      4 INSTR BELONGTO 401f00 
             401ee0      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, [rsp+48h+var_3C] 
             401ee0      4 PTRIMMEDESP STACK 12 displ mov     edx, [rsp+48h+var_3C]
@@ -1997,7 +1997,7 @@
             401eee      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401ef3     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DB0 
             401ef3      5 INSTR BELONGTO 401f00 
-            401f00      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+            401f00      0 FUNC FRAMERESTORE 0 0 96 1 0 1 2 0 1 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             401f00      0 FUNC MMSAFENESS UNSAFE
             401f00     15 FUNC GLOBAL sub_401F00 FUNC_UNSAFE NOFP RET             401f0e 
             401f00     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
diff --git a/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id
index 3a7c14208e75761c8a281750831b6ea5453acfa3..904b0a7a8da37009c7fda368e83a9be8067db9a4 100644
--- a/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-507e740bf760949be6062abf58829bc1d49edc25
\ No newline at end of file
+5875cfe31109689894d687552176d4292327e878
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-session.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-session.psexe.annot.REMOVED.git-id
index 130b00e28276d27c73ff93ee9dbe400ad42b3844..26d6c6c08190804990d86449475b635131f59c0d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-session.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-b6a83281e1c8691fb04fc50c2dac8e147b80be29
\ No newline at end of file
+f3483a313da0ceee4be9df6336125d90b583a784
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
index 60b4c66f699a960889646d6f4392a46f3670fc8d..2db5ac91d1c022f415687936d9bb34bb09d448a1 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
@@ -11556,8 +11556,8 @@
               87d0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
               87d1      4 INSTR BELONGTO 8890 
               87d1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, [rdi+18h] 
+              87d5     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
               87d5      3 INSTR BELONGTO 8890 
-              87d5      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
               87d8      4 INSTR BELONGTO 8890 
               87d8      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rax+10h] 
               87dc     -1 INSTR LOCAL NoMetaUpdate call    sub_F020 
@@ -11576,8 +11576,8 @@
               87f0     -1 INSTR LOCAL NoMetaUpdate call    sub_8300 
               87f0      5 INSTR BELONGTO 8890 
               87f0      5 INSTR DEADREGS  EFLAGS ZZ call    sub_8300 
+              87f5     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
               87f5      3 INSTR BELONGTO 8890 
-              87f5      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ mov     rdi, rbx 
               87f8      1 INSTR BELONGTO 8890 
               87f8      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
               87f9     -1 INSTR LOCAL NoMetaUpdate jmp     sub_8660 
@@ -11587,11 +11587,10 @@
               8800      1 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
               8801      7 INSTR BELONGTO 8890 
               8801      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ lea     rdx, aUnableToGetDef; "Unable to get default source, or no sou"... 
+              8808     -1 INSTR LOCAL MetadataUnused lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               8808      7 INSTR BELONGTO 8890 
-              8808      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
-              880f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              880f     -1 INSTR LOCAL MetadataUnused mov     esi, 80h 
               880f      5 INSTR BELONGTO 8890 
-              880f      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ mov     esi, 80h 
               8814      2 INSTR BELONGTO 8890 
               8814      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
               8814     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
@@ -11666,7 +11665,7 @@
               8883     -1 INSTR LOCAL NoMetaUpdate jmp     short sub_8830 
               8883      2 INSTR BELONGTO 8880 
               8883      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ jmp     short sub_8830 
-              8890      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+              8890      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 4 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               8890      0 FUNC MMSAFENESS UNSAFE
               8890     24 DATAREF STACK 1094 esp + 0 PARENT LocalFrame LOCALFRAME
               8890      4 INSTR BELONGTO 8890 
@@ -11687,11 +11686,10 @@
               88a2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
               88a8      7 INSTR BELONGTO 8890 
               88a8      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ lea     rdx, aConnecting___; "Connecting..." 
+              88af     -1 INSTR LOCAL MetadataUnused lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               88af      7 INSTR BELONGTO 8890 
-              88af      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
-              88b6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     sil, 80h 
+              88b6     -1 INSTR LOCAL MetadataUnused mov     sil, 80h 
               88b6      3 INSTR BELONGTO 8890 
-              88b6      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ mov     sil, 80h 
               88b9      2 INSTR BELONGTO 8890 
               88b9      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
               88b9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
@@ -11713,9 +11711,9 @@
               88d5      5 PTRIMMEDESP STACK 8 displ mov     rdx, [rsp+18h+var_10]
               88da     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               88da      4 INSTR BELONGTO 8890 
+              88de     -1 INSTR LOCAL MetadataUnused mov     rdi, rdx 
               88de     24 DEALLOC STACK esp - 24 mov     rdi, rdx
               88de      3 INSTR BELONGTO 8890 
-              88de      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rdx 
               88e1     -1 INSTR LOCAL NoMetaUpdate jmp     loc_87D0 
               88e1      5 INSTR BELONGTO 8890 
               88e1      5 INSTR DEADREGS  EFLAGS ZZ jmp     loc_87D0 
diff --git a/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id
index ec668cd1b34f99026df9eaa44444feedd1fd87fb..d689fdee5fbf1346ca0f01756bbf4aaa747e657e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-0f30f13e717e5d0b67db9a167536a0e2b1e7d815
\ No newline at end of file
+58568eb7e010487bbbaffffc492a5f3034fbd7e9
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-terminal.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-terminal.psexe.annot.REMOVED.git-id
index 368b54cda864e6de72f943807807ae43414569ae..f6c1c147dc24b4b24454528aed822d7e2ba08a09 100644
--- a/tests/commit/trimmed-sorted-save-gnome-terminal.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-terminal.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-96718cf4f5d540aea929aa860baa2279cc60bd01
\ No newline at end of file
+1f24b286c43325ded8718006c51c29dedaac33b7
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-text-editor.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-text-editor.psexe.annot.REMOVED.git-id
index 911dbb719b1ea84df9911606b3c3ebfc22c37ddb..5d68ceb91cd31f257864f8892e14e675438d4ad8 100644
--- a/tests/commit/trimmed-sorted-save-gnome-text-editor.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-text-editor.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-fbc006187569d1012c5f638fd63f47fa782379bd
\ No newline at end of file
+225dcdc78d4d3130a9d887ad49c0cd45e21c4dce
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id
index 1149e16ed7746152752de95c7148ffeaa8981fc2..e65fd130a7a3b5e563262cfc80c9a242dc434186 100644
--- a/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-3cf0ebde5b0360caaa721327e7d3bb78c0a87275
\ No newline at end of file
+2181a983ae2549c0b159a65f863b719c7b2759a2
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id
index 28dece040d174db3e7e3ccd07cde4580d4855621..1c656334d8907259b12baaf1adbbc1237e9c5749 100644
--- a/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-8ed50bae7303c79d94f31aa10ca4b777e670b15d
\ No newline at end of file
+270d6492524baa55451720a0bde1b943895789f3
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id
index 9f6b3c6307ea7bb0a95005bc4d0c78809f9261a2..19bfec8cf1af0bb27c1ab6b3de2332f5165ca82b 100644
--- a/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-e9a36095239293b09d649753c0cf306d175b560f
\ No newline at end of file
+7e6414b3c21b17384439b6b517e2528ea0d2bd3b
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
index 0e3460674400f9583ebc8f3a5df9b85c8483c51e..2f555151a6974cce6c6541240651f7ea89cc1725 100644
--- a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
@@ -2830,7 +2830,7 @@
             4026d0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ call    sub_4031D0 
             4026d5     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_402682 
             4026d5      2 INSTR BELONGTO 402670 
-            4026e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+            4026e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             4026e0      0 FUNC MMSAFENESS UNSAFE
             4026e0      4 INSTR BELONGTO 4026e0 
             4026e0      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rsi+38h] 
@@ -7218,10 +7218,13 @@
             404d98      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ mov     rdi, cs:qword_608860 
             404d9f      3 INSTR BELONGTO 4026e0 
             404d9f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 ZZ mov     rdx, rbx 
+            404da2     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, offset sub_404BB0 
             404da2      6 INSTR BELONGTO 4026e0 
             404da2      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 R9 ZZ mov     r9d, offset sub_404BB0 
+            404da8     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8d, offset sub_404BC0 
             404da8      6 INSTR BELONGTO 4026e0 
             404da8      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 ZZ mov     r8d, offset sub_404BC0 
+            404dae     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_404BD0 
             404dae      5 INSTR BELONGTO 4026e0 
             404dae      5 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     ecx, offset sub_404BD0 
             404db3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
diff --git a/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id
index 7f8132dca39a8dc19dad0a29a5b02bb3f64a6097..37022485d5ff9059abc2eb6a99de5cfdb1607df7 100644
--- a/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-50d136049a8a73373a6bbf251f4eb313fc781ef6
\ No newline at end of file
+b7b7830bb1e4362d251a0dc8f6fc99e9d37d10d0
\ No newline at end of file