diff --git a/src/base/SMPInstr.cpp b/src/base/SMPInstr.cpp
index f43f89c75007f94a177168111d50611fba0698f2..bda2b6054b4cdd8e6344f1063d681f55d64de536 100644
--- a/src/base/SMPInstr.cpp
+++ b/src/base/SMPInstr.cpp
@@ -5414,7 +5414,7 @@ void SMPInstr::MDFixupCallDefUseLists(void) {
 				//  all return points, then there is no need to conservatively consider these registers to
 				//  be USEs or DEFs. They essentially are untouched by the callee.
 				set<DefOrUse, LessDefUse>::iterator DefIter, UseIter;
-				bool CalleeAnalyzed = (CalleeFunc->HasSTARSStackPtrAnalysisCompleted() && CalleeFunc->StackPtrAnalysisSucceeded() && (!CalleeFunc->HasUnresolvedIndirectJumps()) && (!CalleeFunc->HasSharedChunks()));
+				bool CalleeAnalyzed = (CalleeFunc->HasSTARSStackPtrAnalysisCompleted() && CalleeFunc->StackPtrAnalysisSucceeded() && (!CalleeFunc->HasUnresolvedIndirectJumps()));
 				for (list<uint16_t>::iterator RegIter = global_STARS_program->GetFirstCallerSavedReg(); RegIter != global_STARS_program->GetLastCallerSavedReg(); ++RegIter) {
 					uint16_t RegNum = (*RegIter);
 					STARSOpndTypePtr SearchOp = this->STARSInstPtr->MakeRegOpnd(RegNum);
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index 5698f117b0c709d9fb465d835b7952c5ddad21c9..d4e90d0f09aa12c4cc6c540b82d4c82fa00ee268 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -951,7 +951,7 @@
             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 1
-            408b2a      7 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
+            408b2a      7 FUNC INARGS    6  ARG0 0 ARG1 0 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 
@@ -7530,7 +7530,7 @@
             4a1195     17 FUNC RETURNTYPE RAX 1
             4a1195     17 FUNC INARGS    2  ARG0 8 ARG1 1 
             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 INARGS    6  ARG0 4 ARG1 0 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] 
@@ -7656,7 +7656,7 @@
             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 4
-            4a2529     10 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            4a2529     10 FUNC INARGS    6  ARG0 0 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
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index 7d9eedcc5c0b9cba168540666834995c06bc9891..05a9deebe2105bdea11df8a11328b91c14423be8 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-4a5f8edbee4fa8b9d4520a164fe36c3125f69ef2
\ No newline at end of file
+0bacb4250e6dc0c9fa5be461a383fbfea8222492
\ No newline at end of file
diff --git a/tests/commit/save-gedit.psexe.infoannot b/tests/commit/save-gedit.psexe.infoannot
index ce99b8052d7d7bb5e04243d202a1244c323c9ae0..7204421571c1a4e7c4636268f3d5c1acc31628df 100644
--- a/tests/commit/save-gedit.psexe.infoannot
+++ b/tests/commit/save-gedit.psexe.infoannot
@@ -3370,7 +3370,7 @@
             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 96
-            446a30     10 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            446a30     10 FUNC INARGS    6  ARG0 0 ARG1 0 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 
diff --git a/tests/commit/save-gnome-calculator.psexe.infoannot b/tests/commit/save-gnome-calculator.psexe.infoannot
index 2f65ece2fb5e10ccbb5f38c9b6a321c4f9052414..aa3acdd8762b23da41f57d4f8aa17c071b4c5a39 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 96 ARG3 1 ARG4 1 ARG5 1 
+            41b560    186 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 1 ARG5 0 
             41b620    402 FUNC RETURNTYPE RAX 1
             41b620    402 FUNC INARGS    2  ARG0 4 ARG1 4 
             41b7c0     52 FUNC RETURNTYPE RAX 0
@@ -1282,7 +1282,7 @@
             41bc20    159 FUNC RETURNTYPE RAX 1
             41bc20    159 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 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 INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 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 
@@ -1307,7 +1307,7 @@
             41cd30    100 FUNC RETURNTYPE RAX 1
             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 INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             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 
@@ -1374,7 +1374,7 @@
             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 96
-            41e740     53 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            41e740     53 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 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
diff --git a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
index beba614713f193b716202e5105963bbf12bf9145..a7f82482ebc5a227d8e5305daceb1871a4c795bf 100644
--- a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
@@ -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 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            40fd40    129 FUNC INARGS    6  ARG0 0 ARG1 0 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 
@@ -2279,15 +2279,15 @@
             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 1
-            436710     15 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
+            436710     15 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             436710     15 FUNC PROBLEM sub_436710 CHUNKS 
             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 INARGS    6  ARG0 8 ARG1 1 ARG2 0 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
+            436900     15 FUNC RETURNTYPE RAX 0
             436910    734 FUNC RETURNTYPE RAX 1
             436910    734 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 1 
             436bf0     19 FUNC RETURNTYPE RAX 1
@@ -2341,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 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            438180    512 FUNC INARGS    6  ARG0 4 ARG1 0 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 
@@ -2351,7 +2351,7 @@
             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 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            438760    793 FUNC INARGS    6  ARG0 0 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 
@@ -2360,7 +2360,7 @@
             438b70     10 FUNC RETURNTYPE RAX 0
             438b70     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             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 INARGS    6  ARG0 4 ARG1 0 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 
diff --git a/tests/commit/save-gnome-text-editor.psexe.infoannot b/tests/commit/save-gnome-text-editor.psexe.infoannot
index ce99b8052d7d7bb5e04243d202a1244c323c9ae0..7204421571c1a4e7c4636268f3d5c1acc31628df 100644
--- a/tests/commit/save-gnome-text-editor.psexe.infoannot
+++ b/tests/commit/save-gnome-text-editor.psexe.infoannot
@@ -3370,7 +3370,7 @@
             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 96
-            446a30     10 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            446a30     10 FUNC INARGS    6  ARG0 0 ARG1 0 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 
diff --git a/tests/commit/save-less.psexe.infoannot b/tests/commit/save-less.psexe.infoannot
index dc6ca074f0d9055db95b8c4f0796879a82b18d02..34d808789dbde2a8a7075380d12f1439df7c275f 100644
--- a/tests/commit/save-less.psexe.infoannot
+++ b/tests/commit/save-less.psexe.infoannot
@@ -318,7 +318,7 @@
             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 96
-            4058f0     44 FUNC INARGS    4  ARG0 1 ARG1 1 ARG2 96 ARG3 0 
+            4058f0     44 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 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 
@@ -524,7 +524,7 @@
             40b730     72 FUNC RETURNTYPE RAX 4
             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 INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             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 
@@ -537,10 +537,10 @@
             40ba6c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
             40bb40    305 FUNC RETURNTYPE RAX 0
             40bb40    305 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
-            40bc80    393 FUNC RETURNTYPE RAX 1
+            40bc80    393 FUNC RETURNTYPE RAX 0
             40bc80    393 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             40bdcd      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
-            40be10    146 FUNC RETURNTYPE RAX 1
+            40be10    146 FUNC RETURNTYPE RAX 0
             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
@@ -873,13 +873,13 @@
             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 16
-            4129f0    142 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
+            4129f0    142 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 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 RETURNTYPE RAX 0
             4130e0     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4130f0    108 FUNC RETURNTYPE RAX 16
             4130f0    108 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 e2d445307ab67342a4739f561b3aa5522c6d3e3c..5970cd518d478c8335aff9b435414d3d0d9a2d0b 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -1162,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 1 
+            426500     18 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 1 ARG3 0 
             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
@@ -1182,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 96 ARG3 1 ARG4 0 ARG5 0 
+            4268f0     60 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 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
@@ -1276,7 +1276,7 @@
             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 1
-            429180    850 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            429180    850 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 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 
@@ -1297,7 +1297,7 @@
             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 1
-            42aac0   1193 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            42aac0   1193 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 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] 
@@ -2309,9 +2309,9 @@
             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 RETURNTYPE RAX 0
             46e440     16 FUNC INARGS    3  ARG0 8 ARG1 4 ARG2 4 
-            46e450     13 FUNC RETURNTYPE RAX 1
+            46e450     13 FUNC RETURNTYPE RAX 0
             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 
@@ -2353,11 +2353,11 @@
             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 RETURNTYPE RAX 0
             46f0c0     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 4 
             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 RETURNTYPE RAX 0
             46f120      7 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 4 
             46f130     96 FUNC RETURNTYPE RAX 1
             46f130     96 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
@@ -2400,9 +2400,9 @@
             470440    158 FUNC RETURNTYPE RAX 96
             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 INARGS    6  ARG0 0 ARG1 0 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] 
+            470108      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+24 ZZ 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] 
@@ -2437,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 96 ARG3 1 ARG4 0 ARG5 0 
+            470860     82 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 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 96 ARG3 1 ARG4 0 ARG5 0 
+            4709c0     46 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 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 be52442ef2d108810e5502b0b7e8ad7c6c44a92e..6cdb43a33f7483e8f4c861c70a34f7f58df8c42f 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 @@
-83fd881f2ace81c091952dfd04a61753e87c9956
\ No newline at end of file
+b523d82aaebb33fd8309b454c48e3ba09a229523
\ 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 f5805279453ff0a0b9515f8b4545a50f9509f6c7..259afcf6916ce49d78a422b68c8d6a77cc44e73c 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 @@
-6ca675f6e565aeb1ddf3d2eedc9bd30dd136d7c1
\ No newline at end of file
+055a8b05adde551c27d138bcf6db868013b85320
\ 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 5d68ceb91cd31f257864f8892e14e675438d4ad8..59e5a6dd31299644dbdd598f37104a0d37477ffe 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 @@
-225dcdc78d4d3130a9d887ad49c0cd45e21c4dce
\ No newline at end of file
+ce60bf4b088a3108cddc09987a744ffc6ae40cc0
\ 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 f1c12cc56c14e9bbc15c4f1afef1689f1b6e12ce..a71bd2d012211009ae826d3869b426fbea0c84f4 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 @@
-f4c40f9838d4c279c128d52dd239b8b39de3ecb0
\ No newline at end of file
+293789725b99ef1b95f83b6baf2a68cba5bae1b1
\ No newline at end of file
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 c5f18a12c494af13b273f0e2482a1f2cec3eac59..3682844e5ac315a006c18e55f8cb661596e2f41e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -1174,13 +1174,13 @@
             40182e      3 INSTR BELONGTO 401780 
             401831     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40185A 
             401831      2 INSTR BELONGTO 401780 
+            401833     -1 INSTR LOCAL MetadataUnused mov     rsi, [rbp+10h] 
             401833      4 INSTR BELONGTO 401780 
-            401833      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [rbp+10h] 
+            401837     -1 INSTR LOCAL MetadataUnused mov     rdi, [rbp+8] 
             401837      4 INSTR BELONGTO 401780 
-            401837      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rbp+8] 
             40183b     -1 INSTR LOCAL NoMetaUpdate call    sub_401F00 
             40183b      5 INSTR BELONGTO 401780 
-            40183b      5 INSTR DEADREGS  EFLAGS ZZ call    sub_401F00 
+            40183b      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_401F00 
             401840      5 INSTR BELONGTO 401780 
             401840      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     edi, offset qword_4020E0 
             401845      3 INSTR BELONGTO 401780 
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 a3e9b83c8c3395ea619c292d501269aa208c3dc9..84c6fe526770a8580828e7bb2843f23e076a78cf 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 @@
-dda232766ec81fece5e42a171077260284079e91
\ No newline at end of file
+181928260e98c4e7fc6bc718d99cdd23b14b0dee
\ 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 c5f18a12c494af13b273f0e2482a1f2cec3eac59..3682844e5ac315a006c18e55f8cb661596e2f41e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -1174,13 +1174,13 @@
             40182e      3 INSTR BELONGTO 401780 
             401831     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40185A 
             401831      2 INSTR BELONGTO 401780 
+            401833     -1 INSTR LOCAL MetadataUnused mov     rsi, [rbp+10h] 
             401833      4 INSTR BELONGTO 401780 
-            401833      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [rbp+10h] 
+            401837     -1 INSTR LOCAL MetadataUnused mov     rdi, [rbp+8] 
             401837      4 INSTR BELONGTO 401780 
-            401837      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rbp+8] 
             40183b     -1 INSTR LOCAL NoMetaUpdate call    sub_401F00 
             40183b      5 INSTR BELONGTO 401780 
-            40183b      5 INSTR DEADREGS  EFLAGS ZZ call    sub_401F00 
+            40183b      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_401F00 
             401840      5 INSTR BELONGTO 401780 
             401840      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     edi, offset qword_4020E0 
             401845      3 INSTR BELONGTO 401780 
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 26d6c6c08190804990d86449475b635131f59c0d..3019152489d6f834c7476764df08fd99e6b87c14 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 @@
-f3483a313da0ceee4be9df6336125d90b583a784
\ No newline at end of file
+14579558cadece27fa28e482acb0a51e9680887c
\ 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 f6c1c147dc24b4b24454528aed822d7e2ba08a09..863bcc17ee883c1ff453005066cf85066d73a507 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 @@
-1f24b286c43325ded8718006c51c29dedaac33b7
\ No newline at end of file
+c8e987f9a5bd37cbbcebab7c8aa2b8898337b624
\ 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 5d68ceb91cd31f257864f8892e14e675438d4ad8..59e5a6dd31299644dbdd598f37104a0d37477ffe 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 @@
-225dcdc78d4d3130a9d887ad49c0cd45e21c4dce
\ No newline at end of file
+ce60bf4b088a3108cddc09987a744ffc6ae40cc0
\ 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 e65fd130a7a3b5e563262cfc80c9a242dc434186..f9dc25d28b06c1dc3fa68ae5d75b3b911ad6c2e9 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 @@
-2181a983ae2549c0b159a65f863b719c7b2759a2
\ No newline at end of file
+2eacea97888d361d75cc2a03ad3e965a3e3f0ec9
\ 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 19bfec8cf1af0bb27c1ab6b3de2332f5165ca82b..644bdd09e4d1b1bd210e3024529ba03c878a14bf 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 @@
-7e6414b3c21b17384439b6b517e2528ea0d2bd3b
\ No newline at end of file
+8a78822454ea4696aa37a9fd853429ef39321280
\ No newline at end of file
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 37022485d5ff9059abc2eb6a99de5cfdb1607df7..e1a6abdc864d3383d7b4f97cc3ed4810fb064353 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 @@
-b7b7830bb1e4362d251a0dc8f6fc99e9d37d10d0
\ No newline at end of file
+b0571ec4d7c4f67f634f4b1fa064fa6014f7b11e
\ No newline at end of file