diff --git a/src/base/SMPProgram.cpp b/src/base/SMPProgram.cpp
index cbbbd26b9e28dd752197a90b893cf7e3013b9bbe..8142a9b6d2892901695e49cbd057b19ae6676be9 100644
--- a/src/base/SMPProgram.cpp
+++ b/src/base/SMPProgram.cpp
@@ -407,7 +407,7 @@ void SMPProgram::Analyze(ProfilerInformation *pi, FILE *AnnotFile, FILE *InfoAnn
 		}
 		CurrFunc->FreeUnusedMemory2(); // free memory
 		if (CurrFunc->StackPtrAnalysisSucceeded() && CurrFunc->HasGoodRTLs()
-			&& (!(CurrFunc->HasUnresolvedIndirectJumps() || CurrFunc->HasSharedChunks()))) {
+			&& (!CurrFunc->HasUnresolvedIndirectJumps())) {
 #if 0  // LVA is now performed from Func->AdvancedAnalysis() in STEP 1 above
 			if (DebugFlag) {
 				SMP_msg("Performing LVA for %s.\n", CurrFunc->GetFuncName());
@@ -420,8 +420,10 @@ void SMPProgram::Analyze(ProfilerInformation *pi, FILE *AnnotFile, FILE *InfoAnn
 			Time2 = time(NULL);
 			Analysis1 += difftime(Time2, Time1);
 			if (DebugFlag) SMP_msg("Finished SSA.\n");
-			// Find constant-valued DEFs using SCCP algorithm
-			CurrFunc->SparseConditionalConstantPropagation();
+			if (!CurrFunc->HasSharedChunks()) {
+				// Find constant-valued DEFs using SCCP algorithm
+				CurrFunc->SparseConditionalConstantPropagation();
+			}
 			Time3 = time(NULL);
 			Analysis2 += difftime(Time3, Time2);
 			CurrFunc->AliasAnalysis();
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index cb051a686ef4fcd2aa4f9d96a28dd10c5643aa1b..76b310eb6733797514775ecb1e36fb17b5213f92 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -41,7 +41,7 @@
             405a78      6 FUNC RETURNTYPE RAX 0
             405a78      6 FUNC PROBLEM .pmap_unset JUMPUNRESOLVED 
             405a88      6 FUNC RETURNTYPE RAX 0
-            405a88      6 FUNC PROBLEM .printf CHUNKS JUMPUNRESOLVED 
+            405a88      6 FUNC PROBLEM .printf JUMPUNRESOLVED 
             405a98      6 FUNC RETURNTYPE RAX 0
             405a98      6 FUNC PROBLEM .atan2 JUMPUNRESOLVED 
             405aa8      6 FUNC RETURNTYPE RAX 0
@@ -63,7 +63,7 @@
             405b28      6 FUNC RETURNTYPE RAX 0
             405b28      6 FUNC PROBLEM .getgid JUMPUNRESOLVED 
             405b38      6 FUNC RETURNTYPE RAX 0
-            405b38      6 FUNC PROBLEM .snprintf CHUNKS JUMPUNRESOLVED 
+            405b38      6 FUNC PROBLEM .snprintf JUMPUNRESOLVED 
             405b48      6 FUNC RETURNTYPE RAX 0
             405b48      6 FUNC PROBLEM .setsid JUMPUNRESOLVED 
             405b58      6 FUNC RETURNTYPE RAX 0
@@ -95,7 +95,7 @@
             405c28      6 FUNC RETURNTYPE RAX 0
             405c28      6 FUNC PROBLEM .stpcpy JUMPUNRESOLVED 
             405c38      6 FUNC RETURNTYPE RAX 0
-            405c38      6 FUNC PROBLEM .vasprintf CHUNKS JUMPUNRESOLVED 
+            405c38      6 FUNC PROBLEM .vasprintf JUMPUNRESOLVED 
             405c48      6 FUNC RETURNTYPE RAX 0
             405c48      6 FUNC PROBLEM .getpgrp JUMPUNRESOLVED 
             405c58      6 FUNC RETURNTYPE RAX 0
@@ -253,7 +253,7 @@
             406118      6 FUNC RETURNTYPE RAX 0
             406118      6 FUNC PROBLEM .setuid JUMPUNRESOLVED 
             406128      6 FUNC RETURNTYPE RAX 0
-            406128      6 FUNC PROBLEM .vfprintf CHUNKS JUMPUNRESOLVED 
+            406128      6 FUNC PROBLEM .vfprintf JUMPUNRESOLVED 
             406138      6 FUNC RETURNTYPE RAX 0
             406138      6 FUNC PROBLEM .strnlen JUMPUNRESOLVED 
             406148      6 FUNC RETURNTYPE RAX 0
@@ -285,7 +285,7 @@
             406218      6 FUNC RETURNTYPE RAX 0
             406218      6 FUNC PROBLEM .sched_getparam JUMPUNRESOLVED 
             406228      6 FUNC RETURNTYPE RAX 0
-            406228      6 FUNC PROBLEM .vsprintf CHUNKS JUMPUNRESOLVED 
+            406228      6 FUNC PROBLEM .vsprintf JUMPUNRESOLVED 
             406238      6 FUNC RETURNTYPE RAX 0
             406238      6 FUNC PROBLEM .ferror JUMPUNRESOLVED 
             406248      6 FUNC RETURNTYPE RAX 0
@@ -327,7 +327,7 @@
             406368      6 FUNC RETURNTYPE RAX 0
             406368      6 FUNC PROBLEM .link JUMPUNRESOLVED 
             406378      6 FUNC RETURNTYPE RAX 0
-            406378      6 FUNC PROBLEM .sprintf CHUNKS JUMPUNRESOLVED 
+            406378      6 FUNC PROBLEM .sprintf JUMPUNRESOLVED 
             406388      6 FUNC RETURNTYPE RAX 0
             406388      6 FUNC PROBLEM .endutent JUMPUNRESOLVED 
             406398      6 FUNC RETURNTYPE RAX 0
@@ -401,7 +401,7 @@
             4065b8      6 FUNC RETURNTYPE RAX 0
             4065b8      6 FUNC PROBLEM .semctl JUMPUNRESOLVED 
             4065c8      6 FUNC RETURNTYPE RAX 0
-            4065c8      6 FUNC PROBLEM .vprintf CHUNKS JUMPUNRESOLVED 
+            4065c8      6 FUNC PROBLEM .vprintf JUMPUNRESOLVED 
             4065d8      6 FUNC RETURNTYPE RAX 0
             4065d8      6 FUNC PROBLEM .fputs JUMPUNRESOLVED 
             4065e8      6 FUNC RETURNTYPE RAX 0
@@ -465,7 +465,7 @@
             4067b8      6 FUNC RETURNTYPE RAX 0
             4067b8      6 FUNC PROBLEM .socket JUMPUNRESOLVED 
             4067c8      6 FUNC RETURNTYPE RAX 0
-            4067c8      6 FUNC PROBLEM .vsnprintf CHUNKS JUMPUNRESOLVED 
+            4067c8      6 FUNC PROBLEM .vsnprintf JUMPUNRESOLVED 
             4067d8      6 FUNC RETURNTYPE RAX 0
             4067d8      6 FUNC PROBLEM .fread JUMPUNRESOLVED 
             4067e8      6 FUNC RETURNTYPE RAX 0
@@ -513,7 +513,7 @@
             406938      6 FUNC RETURNTYPE RAX 0
             406938      6 FUNC PROBLEM .unlockpt JUMPUNRESOLVED 
             406948      6 FUNC RETURNTYPE RAX 0
-            406948      6 FUNC PROBLEM .asprintf CHUNKS JUMPUNRESOLVED 
+            406948      6 FUNC PROBLEM .asprintf JUMPUNRESOLVED 
             406958      6 FUNC RETURNTYPE RAX 0
             406958      6 FUNC PROBLEM .strcmp JUMPUNRESOLVED 
             406968      6 FUNC RETURNTYPE RAX 0
@@ -647,7 +647,7 @@
             406d68      6 FUNC RETURNTYPE RAX 0
             406d68      6 FUNC PROBLEM .updwtmp JUMPUNRESOLVED 
             406d78      6 FUNC RETURNTYPE RAX 0
-            406d78      6 FUNC PROBLEM .fprintf CHUNKS JUMPUNRESOLVED 
+            406d78      6 FUNC PROBLEM .fprintf JUMPUNRESOLVED 
             406d88      6 FUNC RETURNTYPE RAX 0
             406d88      6 FUNC PROBLEM .adjtimex JUMPUNRESOLVED 
             406d98      6 FUNC RETURNTYPE RAX 0
@@ -697,7 +697,7 @@
             406ef8      6 FUNC RETURNTYPE RAX 0
             406ef8      6 FUNC PROBLEM .rename JUMPUNRESOLVED 
             406f08      6 FUNC RETURNTYPE RAX 0
-            406f08      6 FUNC PROBLEM .dprintf CHUNKS JUMPUNRESOLVED 
+            406f08      6 FUNC PROBLEM .dprintf JUMPUNRESOLVED 
             406f18      6 FUNC RETURNTYPE RAX 0
             406f18      6 FUNC PROBLEM .sethostname JUMPUNRESOLVED 
             406f28      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-bzip2.psexe.infoannot b/tests/commit/save-bzip2.psexe.infoannot
index f3b6ae103b6be8a559f40f4e48f42c953d2fb0a6..a1a8f0d9f6a9a9c3939aafffd62e42265f01a9f4 100644
--- a/tests/commit/save-bzip2.psexe.infoannot
+++ b/tests/commit/save-bzip2.psexe.infoannot
@@ -87,7 +87,7 @@
             401340      6 FUNC RETURNTYPE RAX 0
             401340      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
             401350      6 FUNC RETURNTYPE RAX 0
-            401350      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            401350      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             401360      6 FUNC RETURNTYPE RAX 0
             401360      6 FUNC PROBLEM .strerror JUMPUNRESOLVED 
             401370      6 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 d9c923f13d2bbdc60d405d6cac8fc515ac0f901e..c71df1a0ac6a2764b8cd7d4e2626157237a2f76f 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-ef5828c47345c5fb7ef1c6273fbf15e5b31c08b2
\ No newline at end of file
+c8e20e151ca42c5660a9feea8d86b788356249ac
\ No newline at end of file
diff --git a/tests/commit/save-firefox-bin.psexe.infoannot b/tests/commit/save-firefox-bin.psexe.infoannot
index a1b0d0d68824516d0977eb703fe5cd5f88b2928a..cdb13dc7e554dbc01f618be5f9292785e7f0699f 100644
--- a/tests/commit/save-firefox-bin.psexe.infoannot
+++ b/tests/commit/save-firefox-bin.psexe.infoannot
@@ -7,7 +7,7 @@
             403330      6 FUNC RETURNTYPE RAX 0
             403330      6 FUNC PROBLEM .memset JUMPUNRESOLVED 
             403340      6 FUNC RETURNTYPE RAX 0
-            403340      6 FUNC PROBLEM .snprintf CHUNKS JUMPUNRESOLVED 
+            403340      6 FUNC PROBLEM .snprintf JUMPUNRESOLVED 
             403350      6 FUNC RETURNTYPE RAX 0
             403350      6 FUNC PROBLEM .close JUMPUNRESOLVED 
             403360      6 FUNC RETURNTYPE RAX 0
@@ -47,7 +47,7 @@
             403470      6 FUNC RETURNTYPE RAX 0
             403470      6 FUNC PROBLEM .fgets JUMPUNRESOLVED 
             403480      6 FUNC RETURNTYPE RAX 0
-            403480      6 FUNC PROBLEM .vfprintf CHUNKS JUMPUNRESOLVED 
+            403480      6 FUNC PROBLEM .vfprintf JUMPUNRESOLVED 
             403490      6 FUNC RETURNTYPE RAX 0
             403490      6 FUNC PROBLEM ._ZNSsD1Ev JUMPUNRESOLVED 
             4034a0      6 FUNC RETURNTYPE RAX 0
@@ -63,7 +63,7 @@
             403500      6 FUNC RETURNTYPE RAX 0
             403500      6 FUNC PROBLEM .dlerror JUMPUNRESOLVED 
             403510      6 FUNC RETURNTYPE RAX 0
-            403510      6 FUNC PROBLEM .sprintf CHUNKS JUMPUNRESOLVED 
+            403510      6 FUNC PROBLEM .sprintf JUMPUNRESOLVED 
             403520      6 FUNC RETURNTYPE RAX 0
             403520      6 FUNC PROBLEM ._ZNSspLERKSs JUMPUNRESOLVED 
             403530      6 FUNC RETURNTYPE RAX 0
@@ -87,7 +87,7 @@
             4035c0      6 FUNC RETURNTYPE RAX 0
             4035c0      6 FUNC PROBLEM .strchr JUMPUNRESOLVED 
             4035d0      6 FUNC RETURNTYPE RAX 0
-            4035d0      6 FUNC PROBLEM .vsnprintf CHUNKS JUMPUNRESOLVED 
+            4035d0      6 FUNC PROBLEM .vsnprintf JUMPUNRESOLVED 
             4035e0      6 FUNC RETURNTYPE RAX 0
             4035e0      6 FUNC PROBLEM .__fxstat JUMPUNRESOLVED 
             4035f0      6 FUNC RETURNTYPE RAX 0
@@ -127,7 +127,7 @@
             403700      6 FUNC RETURNTYPE RAX 0
             403700      6 FUNC PROBLEM ._ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode JUMPUNRESOLVED 
             403710      6 FUNC RETURNTYPE RAX 0
-            403710      6 FUNC PROBLEM .fprintf CHUNKS JUMPUNRESOLVED 
+            403710      6 FUNC PROBLEM .fprintf JUMPUNRESOLVED 
             403720      6 FUNC RETURNTYPE RAX 0
             403720      6 FUNC PROBLEM .write JUMPUNRESOLVED 
             403730      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gedit.psexe.infoannot b/tests/commit/save-gedit.psexe.infoannot
index 388b12ae8a51a0a41cae346ed5ebf94345315ef5..01095f5f1555c94a2cb7431d522ad161d55652b3 100644
--- a/tests/commit/save-gedit.psexe.infoannot
+++ b/tests/commit/save-gedit.psexe.infoannot
@@ -947,7 +947,7 @@
             424980      6 FUNC RETURNTYPE RAX 0
             424980      6 FUNC PROBLEM .gtk_image_set_from_pixbuf JUMPUNRESOLVED 
             424990      6 FUNC RETURNTYPE RAX 0
-            424990      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            424990      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             4249a0      6 FUNC RETURNTYPE RAX 0
             4249a0      6 FUNC PROBLEM .gdk_display_manager_get JUMPUNRESOLVED 
             4249b0      6 FUNC RETURNTYPE RAX 0
@@ -1531,7 +1531,7 @@
             425c30      6 FUNC RETURNTYPE RAX 0
             425c30      6 FUNC PROBLEM .gtk_menu_shell_prepend JUMPUNRESOLVED 
             425c40      6 FUNC RETURNTYPE RAX 0
-            425c40      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            425c40      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             425c50      6 FUNC RETURNTYPE RAX 0
             425c50      6 FUNC PROBLEM .g_settings_delay JUMPUNRESOLVED 
             425c60      6 FUNC RETURNTYPE RAX 0
@@ -2095,7 +2095,7 @@
             426de0      6 FUNC RETURNTYPE RAX 0
             426de0      6 FUNC PROBLEM .gdk_screen_get_default JUMPUNRESOLVED 
             426df0      6 FUNC RETURNTYPE RAX 0
-            426df0      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            426df0      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             426e00      6 FUNC RETURNTYPE RAX 0
             426e00      6 FUNC PROBLEM .gtk_menu_detach JUMPUNRESOLVED 
             426e10      6 FUNC RETURNTYPE RAX 0
@@ -2235,7 +2235,7 @@
             427240      6 FUNC RETURNTYPE RAX 0
             427240      6 FUNC PROBLEM .gtk_print_operation_set_allow_async JUMPUNRESOLVED 
             427250      6 FUNC RETURNTYPE RAX 0
-            427250      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            427250      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             427260      6 FUNC RETURNTYPE RAX 0
             427260      6 FUNC PROBLEM .g_settings_set_strv JUMPUNRESOLVED 
             427270      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
index 430778170aabbbb3a9083253d00f6585de777d96..fb5b1b3a247c85decf6f45810070200697c5bca9 100644
--- a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-cc136a8a3e4244517e73435a79c64b3b1fe92938
\ No newline at end of file
+ad46a5e66b693c1a3d55fae6577c15ca04441094
\ No newline at end of file
diff --git a/tests/commit/save-gnome-calculator.psexe.infoannot b/tests/commit/save-gnome-calculator.psexe.infoannot
index f0021c506b260cfa1d647a024a7802b1d461466f..7922626f63c7113e184ade9db5e77b2841b0e22c 100644
--- a/tests/commit/save-gnome-calculator.psexe.infoannot
+++ b/tests/commit/save-gnome-calculator.psexe.infoannot
@@ -189,7 +189,7 @@
             40beb0      6 FUNC RETURNTYPE RAX 0
             40beb0      6 FUNC PROBLEM .g_unichar_to_utf8 JUMPUNRESOLVED 
             40bec0      6 FUNC RETURNTYPE RAX 0
-            40bec0      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            40bec0      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             40bed0      6 FUNC RETURNTYPE RAX 0
             40bed0      6 FUNC PROBLEM .g_get_user_cache_dir JUMPUNRESOLVED 
             40bee0      6 FUNC RETURNTYPE RAX 0
@@ -245,7 +245,7 @@
             40c070      6 FUNC RETURNTYPE RAX 0
             40c070      6 FUNC PROBLEM .gtk_text_buffer_apply_tag JUMPUNRESOLVED 
             40c080      6 FUNC RETURNTYPE RAX 0
-            40c080      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            40c080      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             40c090      6 FUNC RETURNTYPE RAX 0
             40c090      6 FUNC PROBLEM .gtk_button_new_with_label JUMPUNRESOLVED 
             40c0a0      6 FUNC RETURNTYPE RAX 0
@@ -281,7 +281,7 @@
             40c190      6 FUNC RETURNTYPE RAX 0
             40c190      6 FUNC PROBLEM .gtk_widget_get_accessible JUMPUNRESOLVED 
             40c1a0      6 FUNC RETURNTYPE RAX 0
-            40c1a0      6 FUNC PROBLEM .__vsnprintf_chk CHUNKS JUMPUNRESOLVED 
+            40c1a0      6 FUNC PROBLEM .__vsnprintf_chk JUMPUNRESOLVED 
             40c1b0      6 FUNC RETURNTYPE RAX 0
             40c1b0      6 FUNC PROBLEM .memcpy JUMPUNRESOLVED 
             40c1c0      6 FUNC RETURNTYPE RAX 0
@@ -585,7 +585,7 @@
             40cb70      6 FUNC RETURNTYPE RAX 0
             40cb70      6 FUNC PROBLEM .gtk_combo_box_new JUMPUNRESOLVED 
             40cb80      6 FUNC RETURNTYPE RAX 0
-            40cb80      6 FUNC PROBLEM .snprintf CHUNKS JUMPUNRESOLVED 
+            40cb80      6 FUNC PROBLEM .snprintf JUMPUNRESOLVED 
             40cb90      6 FUNC RETURNTYPE RAX 0
             40cb90      6 FUNC PROBLEM .gtk_label_set_use_markup JUMPUNRESOLVED 
             40cba0      6 FUNC RETURNTYPE RAX 0
@@ -603,7 +603,7 @@
             40cc10      6 FUNC RETURNTYPE RAX 0
             40cc10      6 FUNC PROBLEM .realloc JUMPUNRESOLVED 
             40cc20      6 FUNC RETURNTYPE RAX 0
-            40cc20      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            40cc20      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             40cc30      6 FUNC RETURNTYPE RAX 0
             40cc30      6 FUNC PROBLEM .gtk_cell_layout_set_cell_data_func JUMPUNRESOLVED 
             40cc40      6 FUNC RETURNTYPE RAX 0
@@ -671,7 +671,7 @@
             40ce30      6 FUNC RETURNTYPE RAX 0
             40ce30      6 FUNC PROBLEM .xmlFreeDoc JUMPUNRESOLVED 
             40ce40      6 FUNC RETURNTYPE RAX 0
-            40ce40      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            40ce40      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             40ce50      6 FUNC RETURNTYPE RAX 0
             40ce50      6 FUNC PROBLEM .g_list_sort JUMPUNRESOLVED 
             40ce60      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-control-center.psexe.infoannot b/tests/commit/save-gnome-control-center.psexe.infoannot
index 268cdc68d8a925329e46e5f90517c067fbaf8be0..036c2b5e8d501f085e2d86c16bec7e4f08432670 100644
--- a/tests/commit/save-gnome-control-center.psexe.infoannot
+++ b/tests/commit/save-gnome-control-center.psexe.infoannot
@@ -175,7 +175,7 @@
               69e0      6 FUNC RETURNTYPE RAX 0
               69e0      6 FUNC PROBLEM .g_value_peek_pointer JUMPUNRESOLVED 
               69f0      6 FUNC RETURNTYPE RAX 0
-              69f0      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+              69f0      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
               6a00      6 FUNC RETURNTYPE RAX 0
               6a00      6 FUNC PROBLEM .g_object_notify JUMPUNRESOLVED 
               6a10      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-dictionary.psexe.infoannot b/tests/commit/save-gnome-dictionary.psexe.infoannot
index d119f2e1501c6d90575187f52a2629ac5c27ba87..34adb5d6c40d0c0a87d10427be4ff95a83433415 100644
--- a/tests/commit/save-gnome-dictionary.psexe.infoannot
+++ b/tests/commit/save-gnome-dictionary.psexe.infoannot
@@ -277,7 +277,7 @@
             407fc0      6 FUNC RETURNTYPE RAX 0
             407fc0      6 FUNC PROBLEM .gdict_source_loader_new JUMPUNRESOLVED 
             407fd0      6 FUNC RETURNTYPE RAX 0
-            407fd0      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            407fd0      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             407fe0      6 FUNC RETURNTYPE RAX 0
             407fe0      6 FUNC PROBLEM .gdict_strategy_chooser_refresh JUMPUNRESOLVED 
             407ff0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-file-share-properties.psexe.infoannot b/tests/commit/save-gnome-file-share-properties.psexe.infoannot
index 48f11834cc424baa4240b7b73fa1ee60d01f3e60..3c681b62f0c0fb3df92370cafd367393a362e5fc 100644
--- a/tests/commit/save-gnome-file-share-properties.psexe.infoannot
+++ b/tests/commit/save-gnome-file-share-properties.psexe.infoannot
@@ -59,7 +59,7 @@
             401c60      6 FUNC RETURNTYPE RAX 0
             401c60      6 FUNC PROBLEM .strlen JUMPUNRESOLVED 
             401c70      6 FUNC RETURNTYPE RAX 0
-            401c70      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            401c70      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             401c80      6 FUNC RETURNTYPE RAX 0
             401c80      6 FUNC PROBLEM .gtk_cell_layout_pack_start JUMPUNRESOLVED 
             401c90      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-help.psexe.infoannot b/tests/commit/save-gnome-help.psexe.infoannot
index 330475dd857d90152b4c9ea4db108262e0fc3905..4c6e02b854ba3c6ccfcd1a61ce3889336ab2a451 100644
--- a/tests/commit/save-gnome-help.psexe.infoannot
+++ b/tests/commit/save-gnome-help.psexe.infoannot
@@ -31,7 +31,7 @@
             4042f0      6 FUNC RETURNTYPE RAX 0
             4042f0      6 FUNC PROBLEM .g_malloc0 JUMPUNRESOLVED 
             404300      6 FUNC RETURNTYPE RAX 0
-            404300      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            404300      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             404310      6 FUNC RETURNTYPE RAX 0
             404310      6 FUNC PROBLEM .g_slist_insert_sorted JUMPUNRESOLVED 
             404320      6 FUNC RETURNTYPE RAX 0
@@ -55,7 +55,7 @@
             4043c0      6 FUNC RETURNTYPE RAX 0
             4043c0      6 FUNC PROBLEM .gtk_entry_new JUMPUNRESOLVED 
             4043d0      6 FUNC RETURNTYPE RAX 0
-            4043d0      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            4043d0      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             4043e0      6 FUNC RETURNTYPE RAX 0
             4043e0      6 FUNC PROBLEM .g_signal_connect_data JUMPUNRESOLVED 
             4043f0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-keyring-3.psexe.infoannot b/tests/commit/save-gnome-keyring-3.psexe.infoannot
index defe7fc7471ef7a97f524b4f92d074b020811dae..4b6af4014b7f8812d0c8cc864169f2b458960e43 100644
--- a/tests/commit/save-gnome-keyring-3.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-3.psexe.infoannot
@@ -49,7 +49,7 @@
             401220      6 FUNC RETURNTYPE RAX 0
             401220      6 FUNC PROBLEM .g_option_context_parse JUMPUNRESOLVED 
             401230      6 FUNC RETURNTYPE RAX 0
-            401230      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            401230      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             401240      6 FUNC RETURNTYPE RAX 0
             401240      6 FUNC PROBLEM .gck_object_get_full JUMPUNRESOLVED 
             401250      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
index c7775e7e5c09cf538c9997ea3cc045156cdde9ae..0a5e984c3b9bf27ac1786a45070540ecbcf18827 100644
--- a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
@@ -169,7 +169,7 @@
             40c780      6 FUNC RETURNTYPE RAX 0
             40c780      6 FUNC PROBLEM .gcry_create_nonce JUMPUNRESOLVED 
             40c790      6 FUNC RETURNTYPE RAX 0
-            40c790      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            40c790      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             40c7a0      6 FUNC RETURNTYPE RAX 0
             40c7a0      6 FUNC PROBLEM .gck_object_get_data_full JUMPUNRESOLVED 
             40c7b0      6 FUNC RETURNTYPE RAX 0
@@ -221,7 +221,7 @@
             40c930      6 FUNC RETURNTYPE RAX 0
             40c930      6 FUNC PROBLEM .g_value_set_boolean JUMPUNRESOLVED 
             40c940      6 FUNC RETURNTYPE RAX 0
-            40c940      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            40c940      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             40c950      6 FUNC RETURNTYPE RAX 0
             40c950      6 FUNC PROBLEM .bindtextdomain JUMPUNRESOLVED 
             40c960      6 FUNC RETURNTYPE RAX 0
@@ -311,7 +311,7 @@
             40cc10      6 FUNC RETURNTYPE RAX 0
             40cc10      6 FUNC PROBLEM .g_object_class_install_property JUMPUNRESOLVED 
             40cc20      6 FUNC RETURNTYPE RAX 0
-            40cc20      6 FUNC PROBLEM .g_string_printf CHUNKS JUMPUNRESOLVED 
+            40cc20      6 FUNC PROBLEM .g_string_printf JUMPUNRESOLVED 
             40cc30      6 FUNC RETURNTYPE RAX 0
             40cc30      6 FUNC PROBLEM .g_byte_array_ref JUMPUNRESOLVED 
             40cc40      6 FUNC RETURNTYPE RAX 0
@@ -357,7 +357,7 @@
             40cd80      6 FUNC RETURNTYPE RAX 0
             40cd80      6 FUNC PROBLEM .gcry_random_bytes JUMPUNRESOLVED 
             40cd90      6 FUNC RETURNTYPE RAX 0
-            40cd90      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            40cd90      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             40cda0      6 FUNC RETURNTYPE RAX 0
             40cda0      6 FUNC PROBLEM .g_key_file_has_group JUMPUNRESOLVED 
             40cdb0      6 FUNC RETURNTYPE RAX 0
@@ -365,7 +365,7 @@
             40cdc0      6 FUNC RETURNTYPE RAX 0
             40cdc0      6 FUNC PROBLEM .dbus_bus_request_name JUMPUNRESOLVED 
             40cdd0      6 FUNC RETURNTYPE RAX 0
-            40cdd0      6 FUNC PROBLEM .__vsnprintf_chk CHUNKS JUMPUNRESOLVED 
+            40cdd0      6 FUNC PROBLEM .__vsnprintf_chk JUMPUNRESOLVED 
             40cde0      6 FUNC RETURNTYPE RAX 0
             40cde0      6 FUNC PROBLEM .g_string_sized_new JUMPUNRESOLVED 
             40cdf0      6 FUNC RETURNTYPE RAX 0
@@ -455,7 +455,7 @@
             40d0a0      6 FUNC RETURNTYPE RAX 0
             40d0a0      6 FUNC PROBLEM .g_param_spec_ulong JUMPUNRESOLVED 
             40d0c0      6 FUNC RETURNTYPE RAX 0
-            40d0c0      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            40d0c0      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             40d0e0      6 FUNC RETURNTYPE RAX 0
             40d0e0      6 FUNC PROBLEM .gcry_md_map_name JUMPUNRESOLVED 
             40d0f0      6 FUNC RETURNTYPE RAX 0
@@ -581,7 +581,7 @@
             40d4e0      6 FUNC RETURNTYPE RAX 0
             40d4e0      6 FUNC PROBLEM .dbus_message_get_interface JUMPUNRESOLVED 
             40d4f0      6 FUNC RETURNTYPE RAX 0
-            40d4f0      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            40d4f0      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             40d500      6 FUNC RETURNTYPE RAX 0
             40d500      6 FUNC PROBLEM .g_quark_try_string JUMPUNRESOLVED 
             40d510      6 FUNC RETURNTYPE RAX 0
@@ -885,7 +885,7 @@
             40de70      6 FUNC RETURNTYPE RAX 0
             40de70      6 FUNC PROBLEM .gcry_mpi_release JUMPUNRESOLVED 
             40de80      6 FUNC RETURNTYPE RAX 0
-            40de80      6 FUNC PROBLEM .dbus_message_new_error_printf CHUNKS JUMPUNRESOLVED 
+            40de80      6 FUNC PROBLEM .dbus_message_new_error_printf JUMPUNRESOLVED 
             40de90      6 FUNC RETURNTYPE RAX 0
             40de90      6 FUNC PROBLEM .g_strsplit JUMPUNRESOLVED 
             40dea0      6 FUNC RETURNTYPE RAX 0
@@ -1039,7 +1039,7 @@
             40e350      6 FUNC RETURNTYPE RAX 0
             40e350      6 FUNC PROBLEM .g_key_file_free JUMPUNRESOLVED 
             40e360      6 FUNC RETURNTYPE RAX 0
-            40e360      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            40e360      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             40e370      6 FUNC RETURNTYPE RAX 0
             40e370      6 FUNC PROBLEM .dbus_message_iter_get_basic JUMPUNRESOLVED 
             40e380      6 FUNC RETURNTYPE RAX 0
@@ -1055,7 +1055,7 @@
             40e3d0      6 FUNC RETURNTYPE RAX 0
             40e3d0      6 FUNC PROBLEM .g_node_new JUMPUNRESOLVED 
             40e3e0      6 FUNC RETURNTYPE RAX 0
-            40e3e0      6 FUNC PROBLEM .__snprintf_chk CHUNKS JUMPUNRESOLVED 
+            40e3e0      6 FUNC PROBLEM .__snprintf_chk JUMPUNRESOLVED 
             40e3f0      6 FUNC RETURNTYPE RAX 0
             40e3f0      6 FUNC PROBLEM .g_error_free JUMPUNRESOLVED 
             40e400      6 FUNC RETURNTYPE RAX 0
@@ -1187,7 +1187,7 @@
             40e800      6 FUNC RETURNTYPE RAX 0
             40e800      6 FUNC PROBLEM .pthread_kill JUMPUNRESOLVED 
             40e810      6 FUNC RETURNTYPE RAX 0
-            40e810      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            40e810      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             40e820      6 FUNC RETURNTYPE RAX 0
             40e820      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             40e830      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-keyring.psexe.infoannot b/tests/commit/save-gnome-keyring.psexe.infoannot
index defe7fc7471ef7a97f524b4f92d074b020811dae..4b6af4014b7f8812d0c8cc864169f2b458960e43 100644
--- a/tests/commit/save-gnome-keyring.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring.psexe.infoannot
@@ -49,7 +49,7 @@
             401220      6 FUNC RETURNTYPE RAX 0
             401220      6 FUNC PROBLEM .g_option_context_parse JUMPUNRESOLVED 
             401230      6 FUNC RETURNTYPE RAX 0
-            401230      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            401230      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             401240      6 FUNC RETURNTYPE RAX 0
             401240      6 FUNC PROBLEM .gck_object_get_full JUMPUNRESOLVED 
             401250      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-nettool.psexe.infoannot b/tests/commit/save-gnome-nettool.psexe.infoannot
index f83e800c5b002dd129dc7df2b2bb2bf59b4a2c79..32f4f1113b44ec0a01b9ee903c5bf7aad92b0070 100644
--- a/tests/commit/save-gnome-nettool.psexe.infoannot
+++ b/tests/commit/save-gnome-nettool.psexe.infoannot
@@ -219,7 +219,7 @@
             4074f0      6 FUNC RETURNTYPE RAX 0
             4074f0      6 FUNC PROBLEM .strlen JUMPUNRESOLVED 
             407500      6 FUNC RETURNTYPE RAX 0
-            407500      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            407500      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             407510      6 FUNC RETURNTYPE RAX 0
             407510      6 FUNC PROBLEM .gtk_entry_completion_set_text_column JUMPUNRESOLVED 
             407520      6 FUNC RETURNTYPE RAX 0
@@ -285,7 +285,7 @@
             407700      6 FUNC RETURNTYPE RAX 0
             407700      6 FUNC PROBLEM .gtk_list_store_get_type JUMPUNRESOLVED 
             407710      6 FUNC RETURNTYPE RAX 0
-            407710      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            407710      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             407720      6 FUNC RETURNTYPE RAX 0
             407720      6 FUNC PROBLEM .gethostbyname2 JUMPUNRESOLVED 
             407730      6 FUNC RETURNTYPE RAX 0
@@ -493,7 +493,7 @@
             407d80      6 FUNC RETURNTYPE RAX 0
             407d80      6 FUNC PROBLEM .bind_textdomain_codeset JUMPUNRESOLVED 
             407d90      6 FUNC RETURNTYPE RAX 0
-            407d90      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            407d90      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             407da0      6 FUNC RETURNTYPE RAX 0
             407da0      6 FUNC PROBLEM .g_strtod JUMPUNRESOLVED 
             407db0      6 FUNC RETURNTYPE RAX 0
@@ -519,7 +519,7 @@
             407e50      6 FUNC RETURNTYPE RAX 0
             407e50      6 FUNC PROBLEM .g_value_get_int JUMPUNRESOLVED 
             407e60      6 FUNC RETURNTYPE RAX 0
-            407e60      6 FUNC PROBLEM .g_sprintf CHUNKS JUMPUNRESOLVED 
+            407e60      6 FUNC PROBLEM .g_sprintf JUMPUNRESOLVED 
             407e70      6 FUNC RETURNTYPE RAX 0
             407e70      6 FUNC PROBLEM .g_slist_find_custom JUMPUNRESOLVED 
             407e80      6 FUNC RETURNTYPE RAX 0
@@ -537,7 +537,7 @@
             407ee0      6 FUNC RETURNTYPE RAX 0
             407ee0      6 FUNC PROBLEM .g_type_class_peek_parent JUMPUNRESOLVED 
             407ef0      6 FUNC RETURNTYPE RAX 0
-            407ef0      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            407ef0      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             407f00      6 FUNC RETURNTYPE RAX 0
             407f00      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             407f10      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-open.psexe.infoannot b/tests/commit/save-gnome-open.psexe.infoannot
index 59f40dc95bdb4a64b8201d9be093ae6a26f41b48..f67eaa1041b661d5d5a7e5dedc50e4c25f40d79c 100644
--- a/tests/commit/save-gnome-open.psexe.infoannot
+++ b/tests/commit/save-gnome-open.psexe.infoannot
@@ -19,7 +19,7 @@
             400a90      6 FUNC RETURNTYPE RAX 0
             400a90      6 FUNC PROBLEM .g_object_unref JUMPUNRESOLVED 
             400aa0      6 FUNC RETURNTYPE RAX 0
-            400aa0      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            400aa0      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             400ab0      6 FUNC RETURNTYPE RAX 0
             400ab0      6 FUNC PROBLEM .g_dgettext JUMPUNRESOLVED 
             400ac0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-power-statistics.psexe.infoannot b/tests/commit/save-gnome-power-statistics.psexe.infoannot
index 0aad0bde246917ecc041ee574d48e7850ab851a9..8e8bfc41b6a861d1e013a493de00bd397c5b1e39 100644
--- a/tests/commit/save-gnome-power-statistics.psexe.infoannot
+++ b/tests/commit/save-gnome-power-statistics.psexe.infoannot
@@ -95,7 +95,7 @@
             404040      6 FUNC RETURNTYPE RAX 0
             404040      6 FUNC PROBLEM .gtk_widget_get_allocation JUMPUNRESOLVED 
             404050      6 FUNC RETURNTYPE RAX 0
-            404050      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            404050      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             404060      6 FUNC RETURNTYPE RAX 0
             404060      6 FUNC PROBLEM .g_application_command_line_get_arguments JUMPUNRESOLVED 
             404070      6 FUNC RETURNTYPE RAX 0
@@ -125,7 +125,7 @@
             404130      6 FUNC RETURNTYPE RAX 0
             404130      6 FUNC PROBLEM .cairo_set_source_rgb JUMPUNRESOLVED 
             404140      6 FUNC RETURNTYPE RAX 0
-            404140      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            404140      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             404150      6 FUNC RETURNTYPE RAX 0
             404150      6 FUNC PROBLEM .cairo_restore JUMPUNRESOLVED 
             404160      6 FUNC RETURNTYPE RAX 0
@@ -363,7 +363,7 @@
             4048c0      6 FUNC RETURNTYPE RAX 0
             4048c0      6 FUNC PROBLEM .g_type_class_peek_parent JUMPUNRESOLVED 
             4048d0      6 FUNC RETURNTYPE RAX 0
-            4048d0      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            4048d0      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             4048e0      6 FUNC RETURNTYPE RAX 0
             4048e0      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             4048f0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-screensaver.psexe.infoannot b/tests/commit/save-gnome-screensaver.psexe.infoannot
index 7716c291df745a5917dec2f3c9ee128f396968cc..4d8c3c6c3e1b258326d8f1f1fe660cd89f829a7a 100644
--- a/tests/commit/save-gnome-screensaver.psexe.infoannot
+++ b/tests/commit/save-gnome-screensaver.psexe.infoannot
@@ -73,7 +73,7 @@
             407dc0      6 FUNC RETURNTYPE RAX 0
             407dc0      6 FUNC PROBLEM .g_print JUMPUNRESOLVED 
             407dd0      6 FUNC RETURNTYPE RAX 0
-            407dd0      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            407dd0      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             407de0      6 FUNC RETURNTYPE RAX 0
             407de0      6 FUNC PROBLEM .gdk_window_move_resize JUMPUNRESOLVED 
             407df0      6 FUNC RETURNTYPE RAX 0
@@ -181,7 +181,7 @@
             408130      6 FUNC RETURNTYPE RAX 0
             408130      6 FUNC PROBLEM .dbus_bus_request_name JUMPUNRESOLVED 
             408140      6 FUNC RETURNTYPE RAX 0
-            408140      6 FUNC PROBLEM .__vsnprintf_chk CHUNKS JUMPUNRESOLVED 
+            408140      6 FUNC PROBLEM .__vsnprintf_chk JUMPUNRESOLVED 
             408150      6 FUNC RETURNTYPE RAX 0
             408150      6 FUNC PROBLEM .gdk_screen_get_n_monitors JUMPUNRESOLVED 
             408160      6 FUNC RETURNTYPE RAX 0
@@ -249,7 +249,7 @@
             408350      6 FUNC RETURNTYPE RAX 0
             408350      6 FUNC PROBLEM .g_timeout_add_seconds JUMPUNRESOLVED 
             408360      6 FUNC RETURNTYPE RAX 0
-            408360      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            408360      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             408380      6 FUNC RETURNTYPE RAX 0
             408380      6 FUNC PROBLEM .g_signal_handlers_disconnect_matched JUMPUNRESOLVED 
             4083a0      6 FUNC RETURNTYPE RAX 0
@@ -319,7 +319,7 @@
             4085a0      6 FUNC RETURNTYPE RAX 0
             4085a0      6 FUNC PROBLEM .g_object_get JUMPUNRESOLVED 
             4085b0      6 FUNC RETURNTYPE RAX 0
-            4085b0      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            4085b0      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             4085c0      6 FUNC RETURNTYPE RAX 0
             4085c0      6 FUNC PROBLEM .gtk_box_new JUMPUNRESOLVED 
             4085d0      6 FUNC RETURNTYPE RAX 0
@@ -557,13 +557,13 @@
             408d20      6 FUNC RETURNTYPE RAX 0
             408d20      6 FUNC PROBLEM .bind_textdomain_codeset JUMPUNRESOLVED 
             408d30      6 FUNC RETURNTYPE RAX 0
-            408d30      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            408d30      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             408d40      6 FUNC RETURNTYPE RAX 0
             408d40      6 FUNC PROBLEM .dbus_message_iter_get_basic JUMPUNRESOLVED 
             408d50      6 FUNC RETURNTYPE RAX 0
             408d50      6 FUNC PROBLEM .XSetErrorHandler JUMPUNRESOLVED 
             408d60      6 FUNC RETURNTYPE RAX 0
-            408d60      6 FUNC PROBLEM .__snprintf_chk CHUNKS JUMPUNRESOLVED 
+            408d60      6 FUNC PROBLEM .__snprintf_chk JUMPUNRESOLVED 
             408d70      6 FUNC RETURNTYPE RAX 0
             408d70      6 FUNC PROBLEM .g_error_free JUMPUNRESOLVED 
             408d80      6 FUNC RETURNTYPE RAX 0
@@ -579,7 +579,7 @@
             408dd0      6 FUNC RETURNTYPE RAX 0
             408dd0      6 FUNC PROBLEM .gtk_init_with_args JUMPUNRESOLVED 
             408de0      6 FUNC RETURNTYPE RAX 0
-            408de0      6 FUNC PROBLEM .g_vsnprintf CHUNKS JUMPUNRESOLVED 
+            408de0      6 FUNC PROBLEM .g_vsnprintf JUMPUNRESOLVED 
             408df0      6 FUNC RETURNTYPE RAX 0
             408df0      6 FUNC PROBLEM .g_timeout_add JUMPUNRESOLVED 
             408e00      6 FUNC RETURNTYPE RAX 0
@@ -635,7 +635,7 @@
             408f90      6 FUNC RETURNTYPE RAX 0
             408f90      6 FUNC PROBLEM .gtk_label_set_markup JUMPUNRESOLVED 
             408fa0      6 FUNC RETURNTYPE RAX 0
-            408fa0      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            408fa0      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             408fb0      6 FUNC RETURNTYPE RAX 0
             408fb0      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             408fc0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-screenshot.psexe.infoannot b/tests/commit/save-gnome-screenshot.psexe.infoannot
index 20b348ce3e21b2bfa9af80f32d0750f312a91b2f..e9dc07ae954db684c62e2d95c54542fba6073668 100644
--- a/tests/commit/save-gnome-screenshot.psexe.infoannot
+++ b/tests/commit/save-gnome-screenshot.psexe.infoannot
@@ -245,7 +245,7 @@
             4068c0      6 FUNC RETURNTYPE RAX 0
             4068c0      6 FUNC PROBLEM .gtk_style_context_set_state JUMPUNRESOLVED 
             4068d0      6 FUNC RETURNTYPE RAX 0
-            4068d0      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            4068d0      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             4068e0      6 FUNC RETURNTYPE RAX 0
             4068e0      6 FUNC PROBLEM .gdk_pixbuf_scale_simple JUMPUNRESOLVED 
             4068f0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-search-tool.psexe.infoannot b/tests/commit/save-gnome-search-tool.psexe.infoannot
index be504accf6560e2f44a3a81313e4ba8e81905c93..d5e8297d18295db4896d1a1417f19838bcfa85f8 100644
--- a/tests/commit/save-gnome-search-tool.psexe.infoannot
+++ b/tests/commit/save-gnome-search-tool.psexe.infoannot
@@ -137,7 +137,7 @@
             40a580      6 FUNC RETURNTYPE RAX 0
             40a580      6 FUNC PROBLEM .gtk_tree_sortable_get_type JUMPUNRESOLVED 
             40a590      6 FUNC RETURNTYPE RAX 0
-            40a590      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            40a590      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             40a5a0      6 FUNC RETURNTYPE RAX 0
             40a5a0      6 FUNC PROBLEM .g_file_monitor_file JUMPUNRESOLVED 
             40a5b0      6 FUNC RETURNTYPE RAX 0
@@ -439,7 +439,7 @@
             40af10      6 FUNC RETURNTYPE RAX 0
             40af10      6 FUNC PROBLEM .g_log_default_handler JUMPUNRESOLVED 
             40af20      6 FUNC RETURNTYPE RAX 0
-            40af20      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            40af20      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             40af30      6 FUNC RETURNTYPE RAX 0
             40af30      6 FUNC PROBLEM .gtk_file_chooser_set_filename JUMPUNRESOLVED 
             40af40      6 FUNC RETURNTYPE RAX 0
@@ -559,7 +559,7 @@
             40b2e0      6 FUNC RETURNTYPE RAX 0
             40b2e0      6 FUNC PROBLEM .g_option_context_set_translation_domain JUMPUNRESOLVED 
             40b2f0      6 FUNC RETURNTYPE RAX 0
-            40b2f0      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            40b2f0      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             40b300      6 FUNC RETURNTYPE RAX 0
             40b300      6 FUNC PROBLEM .gtk_dialog_get_content_area JUMPUNRESOLVED 
             40b310      6 FUNC RETURNTYPE RAX 0
@@ -1029,7 +1029,7 @@
             40c1b0      6 FUNC RETURNTYPE RAX 0
             40c1b0      6 FUNC PROBLEM .g_type_class_peek_parent JUMPUNRESOLVED 
             40c1c0      6 FUNC RETURNTYPE RAX 0
-            40c1c0      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            40c1c0      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             40c1d0      6 FUNC RETURNTYPE RAX 0
             40c1d0      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             40c1e0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-session-properties.psexe.infoannot b/tests/commit/save-gnome-session-properties.psexe.infoannot
index bc4ce467f44bb1ce0e4d2a93da2707299ee9ef67..7443495289e5a46612f3c590581abc5b6302e1f9 100644
--- a/tests/commit/save-gnome-session-properties.psexe.infoannot
+++ b/tests/commit/save-gnome-session-properties.psexe.infoannot
@@ -143,7 +143,7 @@
             404a00      6 FUNC RETURNTYPE RAX 0
             404a00      6 FUNC PROBLEM .getpid JUMPUNRESOLVED 
             404a10      6 FUNC RETURNTYPE RAX 0
-            404a10      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            404a10      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             404a30      6 FUNC RETURNTYPE RAX 0
             404a30      6 FUNC PROBLEM .gtk_entry_get_text JUMPUNRESOLVED 
             404a40      6 FUNC RETURNTYPE RAX 0
@@ -183,7 +183,7 @@
             404b60      6 FUNC RETURNTYPE RAX 0
             404b60      6 FUNC PROBLEM .g_timeout_add_seconds JUMPUNRESOLVED 
             404b70      6 FUNC RETURNTYPE RAX 0
-            404b70      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            404b70      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             404b80      6 FUNC RETURNTYPE RAX 0
             404b80      6 FUNC PROBLEM .g_signal_handlers_disconnect_matched JUMPUNRESOLVED 
             404ba0      6 FUNC RETURNTYPE RAX 0
@@ -233,7 +233,7 @@
             404d00      6 FUNC RETURNTYPE RAX 0
             404d00      6 FUNC PROBLEM .g_key_file_set_locale_string JUMPUNRESOLVED 
             404d10      6 FUNC RETURNTYPE RAX 0
-            404d10      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            404d10      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             404d20      6 FUNC RETURNTYPE RAX 0
             404d20      6 FUNC PROBLEM .gtk_dialog_get_content_area JUMPUNRESOLVED 
             404d30      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-session.psexe.infoannot b/tests/commit/save-gnome-session.psexe.infoannot
index a90b9111855f86009f89fa43e72e98e9d1f7eafe..1fccf39e1e58f42aa056f64648e1f7ddb13fc2e1 100644
--- a/tests/commit/save-gnome-session.psexe.infoannot
+++ b/tests/commit/save-gnome-session.psexe.infoannot
@@ -307,7 +307,7 @@
             409d10      6 FUNC RETURNTYPE RAX 0
             409d10      6 FUNC PROBLEM .gdk_display_get_default_screen JUMPUNRESOLVED 
             409d20      6 FUNC RETURNTYPE RAX 0
-            409d20      6 FUNC PROBLEM .__vsnprintf_chk CHUNKS JUMPUNRESOLVED 
+            409d20      6 FUNC PROBLEM .__vsnprintf_chk JUMPUNRESOLVED 
             409d30      6 FUNC RETURNTYPE RAX 0
             409d30      6 FUNC PROBLEM .g_spawn_close_pid JUMPUNRESOLVED 
             409d40      6 FUNC RETURNTYPE RAX 0
@@ -383,7 +383,7 @@
             409f90      6 FUNC RETURNTYPE RAX 0
             409f90      6 FUNC PROBLEM .g_timeout_add_seconds JUMPUNRESOLVED 
             409fa0      6 FUNC RETURNTYPE RAX 0
-            409fa0      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            409fa0      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             409fb0      6 FUNC RETURNTYPE RAX 0
             409fb0      6 FUNC PROBLEM .IceLockAuthFile JUMPUNRESOLVED 
             409fc0      6 FUNC RETURNTYPE RAX 0
@@ -503,7 +503,7 @@
             40a360      6 FUNC RETURNTYPE RAX 0
             40a360      6 FUNC PROBLEM .g_object_get JUMPUNRESOLVED 
             40a370      6 FUNC RETURNTYPE RAX 0
-            40a370      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            40a370      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             40a380      6 FUNC RETURNTYPE RAX 0
             40a380      6 FUNC PROBLEM .up_client_get_can_hibernate JUMPUNRESOLVED 
             40a390      6 FUNC RETURNTYPE RAX 0
@@ -517,7 +517,7 @@
             40a3d0      6 FUNC RETURNTYPE RAX 0
             40a3d0      6 FUNC PROBLEM .dbus_message_get_interface JUMPUNRESOLVED 
             40a3e0      6 FUNC RETURNTYPE RAX 0
-            40a3e0      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            40a3e0      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             40a3f0      6 FUNC RETURNTYPE RAX 0
             40a3f0      6 FUNC PROBLEM .gtk_dialog_get_content_area JUMPUNRESOLVED 
             40a400      6 FUNC RETURNTYPE RAX 0
@@ -949,7 +949,7 @@
             40b1b0      6 FUNC RETURNTYPE RAX 0
             40b1b0      6 FUNC PROBLEM .gtk_label_set_markup JUMPUNRESOLVED 
             40b1c0      6 FUNC RETURNTYPE RAX 0
-            40b1c0      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            40b1c0      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             40b1d0      6 FUNC RETURNTYPE RAX 0
             40b1d0      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             40b1e0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-settings-daemon.psexe.infoannot b/tests/commit/save-gnome-settings-daemon.psexe.infoannot
index 39803680750ba4abc3bbdbea637361c64432f098..98867201bd97ba4a9a5965525c25e5380b6e4af8 100644
--- a/tests/commit/save-gnome-settings-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-settings-daemon.psexe.infoannot
@@ -83,7 +83,7 @@
             403120      6 FUNC RETURNTYPE RAX 0
             403120      6 FUNC PROBLEM .g_timeout_add_seconds JUMPUNRESOLVED 
             403140      6 FUNC RETURNTYPE RAX 0
-            403140      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            403140      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             403150      6 FUNC RETURNTYPE RAX 0
             403150      6 FUNC PROBLEM .g_key_file_get_integer JUMPUNRESOLVED 
             403160      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-sound-applet.psexe.infoannot b/tests/commit/save-gnome-sound-applet.psexe.infoannot
index f89a49a275fd60953e1a0c1fd71d224eef87498e..df9d57e4d004f1d785f7eef214cf8915eb87b442 100644
--- a/tests/commit/save-gnome-sound-applet.psexe.infoannot
+++ b/tests/commit/save-gnome-sound-applet.psexe.infoannot
@@ -189,7 +189,7 @@
               5f90      6 FUNC RETURNTYPE RAX 0
               5f90      6 FUNC PROBLEM .gtk_container_set_border_width JUMPUNRESOLVED 
               5fb0      6 FUNC RETURNTYPE RAX 0
-              5fb0      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+              5fb0      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
               5fc0      6 FUNC RETURNTYPE RAX 0
               5fc0      6 FUNC PROBLEM .g_app_launch_context_get_type JUMPUNRESOLVED 
               5fd0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-sound-recorder.psexe.infoannot b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
index 6fdd917114c364295c81aec00f30814975898ef9..129a9617742a5ff675d3c51f31b2e1646ec135c3 100644
--- a/tests/commit/save-gnome-sound-recorder.psexe.infoannot
+++ b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
@@ -235,7 +235,7 @@
             405c20      6 FUNC RETURNTYPE RAX 0
             405c20      6 FUNC PROBLEM .gtk_action_group_set_translation_domain JUMPUNRESOLVED 
             405c30      6 FUNC RETURNTYPE RAX 0
-            405c30      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            405c30      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             405c40      6 FUNC RETURNTYPE RAX 0
             405c40      6 FUNC PROBLEM .gst_mixer_set_record JUMPUNRESOLVED 
             405c50      6 FUNC RETURNTYPE RAX 0
@@ -473,7 +473,7 @@
             406390      6 FUNC RETURNTYPE RAX 0
             406390      6 FUNC PROBLEM .textdomain JUMPUNRESOLVED 
             4063a0      6 FUNC RETURNTYPE RAX 0
-            4063a0      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            4063a0      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             4063b0      6 FUNC RETURNTYPE RAX 0
             4063b0      6 FUNC PROBLEM .gm_audio_profile_get_id JUMPUNRESOLVED 
             4063c0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-system-log.psexe.infoannot b/tests/commit/save-gnome-system-log.psexe.infoannot
index 731d6efc1607c8a503deaeb2418369fffaafd0b3..5cb7bc3566b74fd75a229874212a5d6e895d5878 100644
--- a/tests/commit/save-gnome-system-log.psexe.infoannot
+++ b/tests/commit/save-gnome-system-log.psexe.infoannot
@@ -243,7 +243,7 @@
             4087e0      6 FUNC RETURNTYPE RAX 0
             4087e0      6 FUNC PROBLEM .g_value_peek_pointer JUMPUNRESOLVED 
             4087f0      6 FUNC RETURNTYPE RAX 0
-            4087f0      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            4087f0      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             408800      6 FUNC RETURNTYPE RAX 0
             408800      6 FUNC PROBLEM .gtk_entry_get_text JUMPUNRESOLVED 
             408810      6 FUNC RETURNTYPE RAX 0
@@ -315,7 +315,7 @@
             408a20      6 FUNC RETURNTYPE RAX 0
             408a20      6 FUNC PROBLEM .gtk_text_buffer_move_mark JUMPUNRESOLVED 
             408a30      6 FUNC RETURNTYPE RAX 0
-            408a30      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            408a30      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             408a40      6 FUNC RETURNTYPE RAX 0
             408a40      6 FUNC PROBLEM .gtk_file_chooser_set_filename JUMPUNRESOLVED 
             408a50      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-system-monitor.psexe.infoannot b/tests/commit/save-gnome-system-monitor.psexe.infoannot
index 3757760d1fbe7a700122d226cfaa89ecd4618d5f..6632fa1ddbfe275b959b601ec7dc090b9169abdd 100644
--- a/tests/commit/save-gnome-system-monitor.psexe.infoannot
+++ b/tests/commit/save-gnome-system-monitor.psexe.infoannot
@@ -131,7 +131,7 @@
             413860      6 FUNC RETURNTYPE RAX 0
             413860      6 FUNC PROBLEM .g_value_set_uint JUMPUNRESOLVED 
             413870      6 FUNC RETURNTYPE RAX 0
-            413870      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            413870      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             413880      6 FUNC RETURNTYPE RAX 0
             413880      6 FUNC PROBLEM .g_settings_sync JUMPUNRESOLVED 
             413890      6 FUNC RETURNTYPE RAX 0
@@ -171,7 +171,7 @@
             4139a0      6 FUNC RETURNTYPE RAX 0
             4139a0      6 FUNC PROBLEM .getpwuid JUMPUNRESOLVED 
             4139b0      6 FUNC RETURNTYPE RAX 0
-            4139b0      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            4139b0      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             4139c0      6 FUNC RETURNTYPE RAX 0
             4139c0      6 FUNC PROBLEM .gtk_message_dialog_format_secondary_text JUMPUNRESOLVED 
             4139d0      6 FUNC RETURNTYPE RAX 0
@@ -405,7 +405,7 @@
             4140f0      6 FUNC RETURNTYPE RAX 0
             4140f0      6 FUNC PROBLEM .cairo_append_path JUMPUNRESOLVED 
             414100      6 FUNC RETURNTYPE RAX 0
-            414100      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            414100      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             414110      6 FUNC RETURNTYPE RAX 0
             414110      6 FUNC PROBLEM .socket JUMPUNRESOLVED 
             414120      6 FUNC RETURNTYPE RAX 0
@@ -545,7 +545,7 @@
             414550      6 FUNC RETURNTYPE RAX 0
             414550      6 FUNC PROBLEM .gtk_tree_model_iter_next JUMPUNRESOLVED 
             414560      6 FUNC RETURNTYPE RAX 0
-            414560      6 FUNC PROBLEM .g_sprintf CHUNKS JUMPUNRESOLVED 
+            414560      6 FUNC PROBLEM .g_sprintf JUMPUNRESOLVED 
             414570      6 FUNC RETURNTYPE RAX 0
             414570      6 FUNC PROBLEM .gtk_notebook_new JUMPUNRESOLVED 
             414580      6 FUNC RETURNTYPE RAX 0
@@ -583,7 +583,7 @@
             414690      6 FUNC RETURNTYPE RAX 0
             414690      6 FUNC PROBLEM .gdk_cairo_set_source_color JUMPUNRESOLVED 
             4146a0      6 FUNC RETURNTYPE RAX 0
-            4146a0      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            4146a0      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             4146b0      6 FUNC RETURNTYPE RAX 0
             4146b0      6 FUNC PROBLEM ._ZSt20__throw_out_of_rangePKc JUMPUNRESOLVED 
             4146c0      6 FUNC RETURNTYPE RAX 0
@@ -1315,7 +1315,7 @@
             415d90      6 FUNC RETURNTYPE RAX 0
             415d90      6 FUNC PROBLEM .gtk_box_set_spacing JUMPUNRESOLVED 
             415da0      6 FUNC RETURNTYPE RAX 0
-            415da0      6 FUNC PROBLEM .__snprintf_chk CHUNKS JUMPUNRESOLVED 
+            415da0      6 FUNC PROBLEM .__snprintf_chk JUMPUNRESOLVED 
             415db0      6 FUNC RETURNTYPE RAX 0
             415db0      6 FUNC PROBLEM .g_param_spec_string JUMPUNRESOLVED 
             415dc0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-terminal.psexe.infoannot b/tests/commit/save-gnome-terminal.psexe.infoannot
index 160d402f4383d3ac30197bbd8c8b9883d433191e..f6e287b9dbd7354b87188cab80213759e4ed8abf 100644
--- a/tests/commit/save-gnome-terminal.psexe.infoannot
+++ b/tests/commit/save-gnome-terminal.psexe.infoannot
@@ -615,7 +615,7 @@
             410fb0      6 FUNC RETURNTYPE RAX 0
             410fb0      6 FUNC PROBLEM .g_log_default_handler JUMPUNRESOLVED 
             410fc0      6 FUNC RETURNTYPE RAX 0
-            410fc0      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            410fc0      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             410fd0      6 FUNC RETURNTYPE RAX 0
             410fd0      6 FUNC PROBLEM .gtk_file_chooser_set_filename JUMPUNRESOLVED 
             410fe0      6 FUNC RETURNTYPE RAX 0
@@ -817,7 +817,7 @@
             411610      6 FUNC RETURNTYPE RAX 0
             411610      6 FUNC PROBLEM .g_object_get JUMPUNRESOLVED 
             411620      6 FUNC RETURNTYPE RAX 0
-            411620      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            411620      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             411630      6 FUNC RETURNTYPE RAX 0
             411630      6 FUNC PROBLEM .gtk_ui_manager_ensure_update JUMPUNRESOLVED 
             411640      6 FUNC RETURNTYPE RAX 0
@@ -829,7 +829,7 @@
             411670      6 FUNC RETURNTYPE RAX 0
             411670      6 FUNC PROBLEM .g_object_newv JUMPUNRESOLVED 
             411680      6 FUNC RETURNTYPE RAX 0
-            411680      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            411680      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             4116a0      6 FUNC RETURNTYPE RAX 0
             4116a0      6 FUNC PROBLEM .g_slist_sort JUMPUNRESOLVED 
             4116b0      6 FUNC RETURNTYPE RAX 0
@@ -1607,7 +1607,7 @@
             412f70      6 FUNC RETURNTYPE RAX 0
             412f70      6 FUNC PROBLEM .gtk_radio_button_get_type JUMPUNRESOLVED 
             412f80      6 FUNC RETURNTYPE RAX 0
-            412f80      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            412f80      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             412f90      6 FUNC RETURNTYPE RAX 0
             412f90      6 FUNC PROBLEM .g_log JUMPUNRESOLVED 
             412fa0      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-text-editor.psexe.infoannot b/tests/commit/save-gnome-text-editor.psexe.infoannot
index 388b12ae8a51a0a41cae346ed5ebf94345315ef5..01095f5f1555c94a2cb7431d522ad161d55652b3 100644
--- a/tests/commit/save-gnome-text-editor.psexe.infoannot
+++ b/tests/commit/save-gnome-text-editor.psexe.infoannot
@@ -947,7 +947,7 @@
             424980      6 FUNC RETURNTYPE RAX 0
             424980      6 FUNC PROBLEM .gtk_image_set_from_pixbuf JUMPUNRESOLVED 
             424990      6 FUNC RETURNTYPE RAX 0
-            424990      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            424990      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             4249a0      6 FUNC RETURNTYPE RAX 0
             4249a0      6 FUNC PROBLEM .gdk_display_manager_get JUMPUNRESOLVED 
             4249b0      6 FUNC RETURNTYPE RAX 0
@@ -1531,7 +1531,7 @@
             425c30      6 FUNC RETURNTYPE RAX 0
             425c30      6 FUNC PROBLEM .gtk_menu_shell_prepend JUMPUNRESOLVED 
             425c40      6 FUNC RETURNTYPE RAX 0
-            425c40      6 FUNC PROBLEM .g_markup_printf_escaped CHUNKS JUMPUNRESOLVED 
+            425c40      6 FUNC PROBLEM .g_markup_printf_escaped JUMPUNRESOLVED 
             425c50      6 FUNC RETURNTYPE RAX 0
             425c50      6 FUNC PROBLEM .g_settings_delay JUMPUNRESOLVED 
             425c60      6 FUNC RETURNTYPE RAX 0
@@ -2095,7 +2095,7 @@
             426de0      6 FUNC RETURNTYPE RAX 0
             426de0      6 FUNC PROBLEM .gdk_screen_get_default JUMPUNRESOLVED 
             426df0      6 FUNC RETURNTYPE RAX 0
-            426df0      6 FUNC PROBLEM .g_strdup_vprintf CHUNKS JUMPUNRESOLVED 
+            426df0      6 FUNC PROBLEM .g_strdup_vprintf JUMPUNRESOLVED 
             426e00      6 FUNC RETURNTYPE RAX 0
             426e00      6 FUNC PROBLEM .gtk_menu_detach JUMPUNRESOLVED 
             426e10      6 FUNC RETURNTYPE RAX 0
@@ -2235,7 +2235,7 @@
             427240      6 FUNC RETURNTYPE RAX 0
             427240      6 FUNC PROBLEM .gtk_print_operation_set_allow_async JUMPUNRESOLVED 
             427250      6 FUNC RETURNTYPE RAX 0
-            427250      6 FUNC PROBLEM .g_snprintf CHUNKS JUMPUNRESOLVED 
+            427250      6 FUNC PROBLEM .g_snprintf JUMPUNRESOLVED 
             427260      6 FUNC RETURNTYPE RAX 0
             427260      6 FUNC PROBLEM .g_settings_set_strv JUMPUNRESOLVED 
             427270      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-grep.psexe.infoannot b/tests/commit/save-grep.psexe.infoannot
index ea9841cf8336fa165e6d69f9dbb5c18a0d2e1e93..9fa218a317fb85a8786214bfea81f99b67622247 100644
--- a/tests/commit/save-grep.psexe.infoannot
+++ b/tests/commit/save-grep.psexe.infoannot
@@ -171,7 +171,7 @@
             402600      6 FUNC RETURNTYPE RAX 0
             402600      6 FUNC PROBLEM ._obstack_newchunk JUMPUNRESOLVED 
             402610      6 FUNC RETURNTYPE RAX 0
-            402610      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            402610      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             402620      6 FUNC RETURNTYPE RAX 0
             402620      6 FUNC PROBLEM .iconv_close JUMPUNRESOLVED 
             402630      6 FUNC RETURNTYPE RAX 0
@@ -207,7 +207,7 @@
             402720      6 FUNC RETURNTYPE RAX 0
             402720      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
             402730      6 FUNC RETURNTYPE RAX 0
-            402730      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            402730      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             402740      6 FUNC RETURNTYPE RAX 0
             402740      6 FUNC PROBLEM .re_compile_pattern JUMPUNRESOLVED 
             402750      6 FUNC RETURNTYPE RAX 0
@@ -227,7 +227,7 @@
             4027c0      6 FUNC RETURNTYPE RAX 0
             4027c0      6 FUNC PROBLEM .iconv_open JUMPUNRESOLVED 
             4027d0      6 FUNC RETURNTYPE RAX 0
-            4027d0      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            4027d0      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             4027e0     26 FUNC RETURNTYPE RAX 0
             4027e0     26 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4027fa     26 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-httpd.psexe.infoannot b/tests/commit/save-httpd.psexe.infoannot
index 86b7f567f2247cdf96aa69ca009f0965599a805c..323ebfd241edef0530d1bd398011f42405ca9c36 100644
--- a/tests/commit/save-httpd.psexe.infoannot
+++ b/tests/commit/save-httpd.psexe.infoannot
@@ -207,7 +207,7 @@
             4256f0      6 FUNC RETURNTYPE RAX 0
             4256f0      6 FUNC PROBLEM .sigaction JUMPUNRESOLVED 
             425700      6 FUNC RETURNTYPE RAX 0
-            425700      6 FUNC PROBLEM .apr_pvsprintf CHUNKS JUMPUNRESOLVED 
+            425700      6 FUNC PROBLEM .apr_pvsprintf JUMPUNRESOLVED 
             425710      6 FUNC RETURNTYPE RAX 0
             425710      6 FUNC PROBLEM .apr_allocator_free JUMPUNRESOLVED 
             425720      6 FUNC RETURNTYPE RAX 0
@@ -455,7 +455,7 @@
             425eb0      6 FUNC RETURNTYPE RAX 0
             425eb0      6 FUNC PROBLEM .apr_xml_parser_feed JUMPUNRESOLVED 
             425ec0      6 FUNC RETURNTYPE RAX 0
-            425ec0      6 FUNC PROBLEM .apr_brigade_vprintf CHUNKS JUMPUNRESOLVED 
+            425ec0      6 FUNC PROBLEM .apr_brigade_vprintf JUMPUNRESOLVED 
             425ed0      6 FUNC RETURNTYPE RAX 0
             425ed0      6 FUNC PROBLEM .apr_ltoa JUMPUNRESOLVED 
             425ee0      6 FUNC RETURNTYPE RAX 0
@@ -611,7 +611,7 @@
             426390      6 FUNC RETURNTYPE RAX 0
             426390      6 FUNC PROBLEM .apr_base64_decode_binary JUMPUNRESOLVED 
             4263a0      6 FUNC RETURNTYPE RAX 0
-            4263a0      6 FUNC PROBLEM .apr_vsnprintf CHUNKS JUMPUNRESOLVED 
+            4263a0      6 FUNC PROBLEM .apr_vsnprintf JUMPUNRESOLVED 
             4263b0      6 FUNC RETURNTYPE RAX 0
             4263b0      6 FUNC PROBLEM .apr_queue_push JUMPUNRESOLVED 
             4263c0      6 FUNC RETURNTYPE RAX 0
@@ -833,11 +833,11 @@
             426a80      6 FUNC RETURNTYPE RAX 0
             426a80      6 FUNC PROBLEM .apr_bucket_immortal_create JUMPUNRESOLVED 
             426a90      6 FUNC RETURNTYPE RAX 0
-            426a90      6 FUNC PROBLEM .apr_snprintf CHUNKS JUMPUNRESOLVED 
+            426a90      6 FUNC PROBLEM .apr_snprintf JUMPUNRESOLVED 
             426aa0      6 FUNC RETURNTYPE RAX 0
             426aa0      6 FUNC PROBLEM .apr_file_unlock JUMPUNRESOLVED 
             426ab0      6 FUNC RETURNTYPE RAX 0
-            426ab0      6 FUNC PROBLEM .apr_psprintf CHUNKS JUMPUNRESOLVED 
+            426ab0      6 FUNC PROBLEM .apr_psprintf JUMPUNRESOLVED 
             426ac0      6 FUNC RETURNTYPE RAX 0
             426ac0      6 FUNC PROBLEM .apr_socket_recvfrom JUMPUNRESOLVED 
             426ad0      6 FUNC RETURNTYPE RAX 0
@@ -1043,7 +1043,7 @@
             427110      6 FUNC RETURNTYPE RAX 0
             427110      6 FUNC PROBLEM .apr_pool_destroy JUMPUNRESOLVED 
             427120      6 FUNC RETURNTYPE RAX 0
-            427120      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            427120      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             427130      6 FUNC RETURNTYPE RAX 0
             427130      6 FUNC PROBLEM .apr_memcache_add JUMPUNRESOLVED 
             427140      6 FUNC RETURNTYPE RAX 0
@@ -1225,7 +1225,7 @@
             4276c0      6 FUNC RETURNTYPE RAX 0
             4276c0      6 FUNC PROBLEM .apr_rmm_destroy JUMPUNRESOLVED 
             4276d0      6 FUNC RETURNTYPE RAX 0
-            4276d0      6 FUNC PROBLEM .apr_brigade_printf CHUNKS JUMPUNRESOLVED 
+            4276d0      6 FUNC PROBLEM .apr_brigade_printf JUMPUNRESOLVED 
             4276e0      6 FUNC RETURNTYPE RAX 0
             4276e0      6 FUNC PROBLEM .semctl JUMPUNRESOLVED 
             4276f0      6 FUNC RETURNTYPE RAX 0
@@ -1297,7 +1297,7 @@
             427900      6 FUNC RETURNTYPE RAX 0
             427900      6 FUNC PROBLEM .apr_socket_sendv JUMPUNRESOLVED 
             427910      6 FUNC RETURNTYPE RAX 0
-            427910      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            427910      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             427920      6 FUNC RETURNTYPE RAX 0
             427920      6 FUNC PROBLEM .apr_thread_rwlock_rdlock JUMPUNRESOLVED 
             427930      6 FUNC RETURNTYPE RAX 0
@@ -1381,7 +1381,7 @@
             427ba0      6 FUNC RETURNTYPE RAX 0
             427ba0      6 FUNC PROBLEM .apr_dbd_close JUMPUNRESOLVED 
             427bb0      6 FUNC RETURNTYPE RAX 0
-            427bb0      6 FUNC PROBLEM .apr_file_printf CHUNKS JUMPUNRESOLVED 
+            427bb0      6 FUNC PROBLEM .apr_file_printf JUMPUNRESOLVED 
             427bc0      6 FUNC RETURNTYPE RAX 0
             427bc0      6 FUNC PROBLEM .apr_getopt JUMPUNRESOLVED 
             427bd0      6 FUNC RETURNTYPE RAX 0
@@ -1950,7 +1950,7 @@
             431b00    157 FUNC RETURNTYPE RAX 0
             431b00    157 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 16 ARG4 0 ARG5 16 
             431ba0    155 FUNC RETURNTYPE RAX 0
-            431ba0    155 FUNC PROBLEM ap_fprintf CHUNKS 
+            431ba0    155 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431c40      7 FUNC RETURNTYPE RAX 4
             431c40      7 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             431c50    209 FUNC RETURNTYPE RAX 1
@@ -2106,10 +2106,10 @@
             4348f0     71 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             434940     55 FUNC RETURNTYPE RAX 1
             434940     55 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            434980    232 FUNC RETURNTYPE RAX 0
-            434980    232 FUNC PROBLEM ap_vrprintf CHUNKS 
-            434a70    164 FUNC RETURNTYPE RAX 0
-            434a70    164 FUNC PROBLEM ap_rprintf CHUNKS 
+            434980    232 FUNC RETURNTYPE RAX 1
+            434980    232 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            434a70    164 FUNC RETURNTYPE RAX 1
+            434a70    164 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             434b20    216 FUNC RETURNTYPE RAX 1
             434b20    216 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 96 ARG4 1 ARG5 16 
             434c00    127 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-less.psexe.infoannot b/tests/commit/save-less.psexe.infoannot
index 1e0f76d7d864b8ba8319ffb076f42ebf595a615b..a7a4983b2155a2220c88f10d5e8da0208f0d14b6 100644
--- a/tests/commit/save-less.psexe.infoannot
+++ b/tests/commit/save-less.psexe.infoannot
@@ -7,7 +7,7 @@
             401670      6 FUNC RETURNTYPE RAX 0
             401670      6 FUNC PROBLEM .sigprocmask JUMPUNRESOLVED 
             401680      6 FUNC RETURNTYPE RAX 0
-            401680      6 FUNC PROBLEM .__snprintf_chk CHUNKS JUMPUNRESOLVED 
+            401680      6 FUNC PROBLEM .__snprintf_chk JUMPUNRESOLVED 
             401690      6 FUNC RETURNTYPE RAX 0
             401690      6 FUNC PROBLEM .free JUMPUNRESOLVED 
             4016a0      6 FUNC RETURNTYPE RAX 0
@@ -133,7 +133,7 @@
             401a60      6 FUNC RETURNTYPE RAX 0
             401a60      6 FUNC PROBLEM .exit JUMPUNRESOLVED 
             401a70      6 FUNC RETURNTYPE RAX 0
-            401a70      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            401a70      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             401a80      6 FUNC RETURNTYPE RAX 0
             401a80      6 FUNC PROBLEM .strerror JUMPUNRESOLVED 
             401a90      6 FUNC RETURNTYPE RAX 0
@@ -143,7 +143,7 @@
             401ab0      6 FUNC RETURNTYPE RAX 0
             401ab0      6 FUNC PROBLEM .__ctype_b_loc JUMPUNRESOLVED 
             401ac0      6 FUNC RETURNTYPE RAX 0
-            401ac0      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            401ac0      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             401ad0   1150 FUNC RETURNTYPE RAX 0
             401ad0   1150 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401f50     42 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-ls-64bit.psexe.infoannot b/tests/commit/save-ls-64bit.psexe.infoannot
index 99d32e59dcda34977a216cc6aa13718225830b13..ad90f1d4d6acd5d64fcb6ed4ff3b81787362a3ba 100644
--- a/tests/commit/save-ls-64bit.psexe.infoannot
+++ b/tests/commit/save-ls-64bit.psexe.infoannot
@@ -165,7 +165,7 @@
             402510      6 FUNC RETURNTYPE RAX 0
             402510      6 FUNC PROBLEM ._obstack_newchunk JUMPUNRESOLVED 
             402520      6 FUNC RETURNTYPE RAX 0
-            402520      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            402520      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             402530      6 FUNC RETURNTYPE RAX 0
             402530      6 FUNC PROBLEM .strftime JUMPUNRESOLVED 
             402540      6 FUNC RETURNTYPE RAX 0
@@ -193,7 +193,7 @@
             4025f0      6 FUNC RETURNTYPE RAX 0
             4025f0      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
             402600      6 FUNC RETURNTYPE RAX 0
-            402600      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            402600      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             402610      6 FUNC RETURNTYPE RAX 0
             402610      6 FUNC PROBLEM .fflush_unlocked JUMPUNRESOLVED 
             402620      6 FUNC RETURNTYPE RAX 0
@@ -209,7 +209,7 @@
             402670      6 FUNC RETURNTYPE RAX 0
             402670      6 FUNC PROBLEM .__ctype_b_loc JUMPUNRESOLVED 
             402680      6 FUNC RETURNTYPE RAX 0
-            402680      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            402680      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             402690   7956 FUNC RETURNTYPE RAX 0
             402690   7956 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             403ad7      7 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK sub     rdx, cs:stru_6196C0.object_base 
diff --git a/tests/commit/save-lt-svn.psexe.infoannot b/tests/commit/save-lt-svn.psexe.infoannot
index 4fec95cf7a4ae09a8c30a912edba66c88e8a022d..970d9b45207f13dee0a8038060dbcdf683866dce 100644
--- a/tests/commit/save-lt-svn.psexe.infoannot
+++ b/tests/commit/save-lt-svn.psexe.infoannot
@@ -47,7 +47,7 @@
             405d90      6 FUNC RETURNTYPE RAX 0
             405d90      6 FUNC PROBLEM .svn_opt_push_implicit_dot_target JUMPUNRESOLVED 
             405da0      6 FUNC RETURNTYPE RAX 0
-            405da0      6 FUNC PROBLEM .svn_stream_printf CHUNKS JUMPUNRESOLVED 
+            405da0      6 FUNC PROBLEM .svn_stream_printf JUMPUNRESOLVED 
             405db0      6 FUNC RETURNTYPE RAX 0
             405db0      6 FUNC PROBLEM .svn_delta_version JUMPUNRESOLVED 
             405dc0      6 FUNC RETURNTYPE RAX 0
@@ -215,7 +215,7 @@
             4062d0      6 FUNC RETURNTYPE RAX 0
             4062d0      6 FUNC PROBLEM .svn_pool_create_ex JUMPUNRESOLVED 
             4062e0      6 FUNC RETURNTYPE RAX 0
-            4062e0      6 FUNC PROBLEM .svn_cmdline_printf CHUNKS JUMPUNRESOLVED 
+            4062e0      6 FUNC PROBLEM .svn_cmdline_printf JUMPUNRESOLVED 
             4062f0      6 FUNC RETURNTYPE RAX 0
             4062f0      6 FUNC PROBLEM .svn_io_file_readline JUMPUNRESOLVED 
             406300      6 FUNC RETURNTYPE RAX 0
@@ -267,7 +267,7 @@
             406470      6 FUNC RETURNTYPE RAX 0
             406470      6 FUNC PROBLEM .svn_dirent_get_longest_ancestor JUMPUNRESOLVED 
             406480      6 FUNC RETURNTYPE RAX 0
-            406480      6 FUNC PROBLEM .svn_cmdline_fprintf CHUNKS JUMPUNRESOLVED 
+            406480      6 FUNC PROBLEM .svn_cmdline_fprintf JUMPUNRESOLVED 
             406490      6 FUNC RETURNTYPE RAX 0
             406490      6 FUNC PROBLEM .svn_node_kind_to_word JUMPUNRESOLVED 
             4064a0      6 FUNC RETURNTYPE RAX 0
@@ -285,7 +285,7 @@
             406500      6 FUNC RETURNTYPE RAX 0
             406500      6 FUNC PROBLEM .svn_uri_skip_ancestor JUMPUNRESOLVED 
             406510      6 FUNC RETURNTYPE RAX 0
-            406510      6 FUNC PROBLEM .apr_psprintf CHUNKS JUMPUNRESOLVED 
+            406510      6 FUNC PROBLEM .apr_psprintf JUMPUNRESOLVED 
             406520      6 FUNC RETURNTYPE RAX 0
             406520      6 FUNC PROBLEM .svn_prop_get_value JUMPUNRESOLVED 
             406530      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-malloc.psexe.infoannot b/tests/commit/save-malloc.psexe.infoannot
index 546d2c84f05aade2cbdf0e704d568aa9a1124110..fa644d5f6eefa7d1c2b455ec74a204200287801d 100644
--- a/tests/commit/save-malloc.psexe.infoannot
+++ b/tests/commit/save-malloc.psexe.infoannot
@@ -14,9 +14,9 @@
            80484e0      6 FUNC RETURNTYPE EAX 0
            80484e0      6 FUNC PROBLEM .__libc_start_main JUMPUNRESOLVED 
            80484f0      6 FUNC RETURNTYPE EAX 0
-           80484f0      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+           80484f0      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
            8048500      6 FUNC RETURNTYPE EAX 0
-           8048500      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+           8048500      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
            8048510      6 FUNC RETURNTYPE EAX 0
            8048510      6 FUNC PROBLEM .strtol JUMPUNRESOLVED 
            8048520      6 FUNC RETURNTYPE EAX 0
diff --git a/tests/commit/save-nginx.psexe.infoannot b/tests/commit/save-nginx.psexe.infoannot
index b9bcff379fef166d0e46a34abe10ba22a2cb230d..9732b27173298db0a4e2115d9ddb7323a5cb2dc0 100644
--- a/tests/commit/save-nginx.psexe.infoannot
+++ b/tests/commit/save-nginx.psexe.infoannot
@@ -19,7 +19,7 @@
             4030e0      6 FUNC RETURNTYPE RAX 0
             4030e0      6 FUNC PROBLEM .localtime JUMPUNRESOLVED 
             4030f0      6 FUNC RETURNTYPE RAX 0
-            4030f0      6 FUNC PROBLEM .__vfprintf_chk CHUNKS JUMPUNRESOLVED 
+            4030f0      6 FUNC PROBLEM .__vfprintf_chk JUMPUNRESOLVED 
             403100      6 FUNC RETURNTYPE RAX 0
             403100      6 FUNC PROBLEM .abort JUMPUNRESOLVED 
             403110      6 FUNC RETURNTYPE RAX 0
@@ -259,7 +259,7 @@
             403860      6 FUNC RETURNTYPE RAX 0
             403860      6 FUNC PROBLEM .ftruncate64 JUMPUNRESOLVED 
             403870      6 FUNC RETURNTYPE RAX 0
-            403870      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            403870      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             403880      6 FUNC RETURNTYPE RAX 0
             403880      6 FUNC PROBLEM .epoll_wait JUMPUNRESOLVED 
             403890      6 FUNC RETURNTYPE RAX 0
@@ -325,7 +325,7 @@
             403a70      6 FUNC RETURNTYPE RAX 0
             403a70      6 FUNC PROBLEM .lseek64 JUMPUNRESOLVED 
             403a80      6 FUNC RETURNTYPE RAX 0
-            403a80      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            403a80      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             403a90      6 FUNC RETURNTYPE RAX 0
             403a90      6 FUNC PROBLEM .posix_fadvise64 JUMPUNRESOLVED 
             403aa0      6 FUNC RETURNTYPE RAX 0
@@ -355,7 +355,7 @@
             403b60      6 FUNC RETURNTYPE RAX 0
             403b60      6 FUNC PROBLEM .usleep JUMPUNRESOLVED 
             403b70      6 FUNC RETURNTYPE RAX 0
-            403b70      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            403b70      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             403b80      6 FUNC RETURNTYPE RAX 0
             403b80      6 FUNC PROBLEM .socket JUMPUNRESOLVED 
             403bc0     21 FUNC RETURNTYPE RAX 0
@@ -411,14 +411,14 @@
             4050f3      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*8 ZZ lea     rsi, ds:8[rax*8]; size 
             4050f3      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*8+8 ZZ lea     rsi, ds:8[rax*8]; size 
             405237    539 FUNC RETURNTYPE RAX 1
-            405237    539 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            405237    539 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             40529a      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*4 ZZ lea     rdi, ds:8[rax*4]; size 
             40529a      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*4+8 ZZ lea     rdi, ds:8[rax*4]; size 
             405452     56 FUNC RETURNTYPE RAX 0
             405452     56 FUNC INARGS    2  ARG0 0 ARG1 0 
             40548c     91 FUNC RETURNTYPE RAX 4
-            40548c     91 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4054c7      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK sub     rdx, buf        ; size 
+            40548c     91 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
+            4054c7      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, buf        ; size 
             4054e7    311 FUNC RETURNTYPE RAX 1
             4054e7    311 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 96 ARG5 4 
             4055db      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+2047 ZZ IDIOM 18 STACKMEMSINK lea     rdx, [rsi+7FFh] 
@@ -431,7 +431,7 @@
             405894      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK sub     rdx, msg        ; n 
             4058ce    287 FUNC RETURNTYPE RAX 1
             4058ce    287 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4059b3      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R8 ZZ sub     r8, rdx 
+            4059b3      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R8 ZZ IDIOM 19 sub     r8, rdx 
             4059ed    296 FUNC RETURNTYPE RAX 16
             4059ed    296 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405a55      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ lea     rdi, [r13+10h]  ; size 
@@ -554,7 +554,7 @@
             407abe      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+68h+skip]; dst 
             407ac6      5 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, [rsp+68h+skip]; n 
             407af4    110 FUNC RETURNTYPE RAX 4
-            407af4    110 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 96 ARG3 96 ARG4 4 ARG5 0 
+            407af4    110 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 96 ARG3 96 ARG4 4 ARG5 0 
             407b62     38 FUNC RETURNTYPE RAX 4
             407b62     38 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             407b88    191 FUNC RETURNTYPE RAX 0
@@ -583,21 +583,28 @@
             40897d    402 FUNC RETURNTYPE RAX 1
             40897d    402 FUNC INARGS    3  ARG0 4 ARG1 4 ARG2 4 
             408b0f    310 FUNC RETURNTYPE RAX 0
-            408b0f    310 FUNC PROBLEM ngx_sprintf_num CHUNKS 
+            408b0f    310 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 0 ARG4 1 ARG5 0 
+            408c00      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RDX ZZ IDIOM 18 MEMORYSINK lea     rax, [buf+rdx] 
+            408c0e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RBX ZZ IDIOM 19 lea     rdx, [buf+len] 
             408c45     49 FUNC RETURNTYPE RAX 1
             408c45     49 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 1 ARG3 1 
             408c76     65 FUNC RETURNTYPE RAX 4
             408c76     65 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 96 ARG3 1 
             408cb7     66 FUNC RETURNTYPE RAX 4
             408cb7     66 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            408cf9   2268 FUNC RETURNTYPE RAX 0
-            408cf9   2268 FUNC PROBLEM ngx_vslprintf CHUNKS 
-            4095d5    138 FUNC RETURNTYPE RAX 0
-            4095d5    138 FUNC PROBLEM ngx_slprintf CHUNKS 
-            40965f    141 FUNC RETURNTYPE RAX 0
-            40965f    141 FUNC PROBLEM ngx_snprintf CHUNKS 
-            4096ec    153 FUNC RETURNTYPE RAX 0
-            4096ec    153 FUNC PROBLEM ngx_sprintf CHUNKS 
+            408cf9   2268 FUNC RETURNTYPE RAX 4
+            408cf9   2268 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 4 
+            408e56      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-37 ZZ IDIOM 32 lea     eax, [rsi-25h] 
+            409438      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
+            40956c      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
+            4095ad      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
+            4095d5    138 FUNC RETURNTYPE RAX 4
+            4095d5    138 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 16 ARG4 1 ARG5 0 
+            40965f    141 FUNC RETURNTYPE RAX 4
+            40965f    141 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 96 ARG4 96 ARG5 96 
+            4096d7      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     max, buf        ; last 
+            4096ec    153 FUNC RETURNTYPE RAX 4
+            4096ec    153 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 4 ARG5 1 
             409785     71 FUNC RETURNTYPE RAX 1
             409785     71 FUNC INARGS    2  ARG0 0 ARG1 0 
             4097cc    100 FUNC RETURNTYPE RAX 1
@@ -680,10 +687,10 @@
             40aa03      4 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK add     p, 1 
             40aac0    135 FUNC RETURNTYPE RAX 1
             40aac0    135 FUNC INARGS    4  ARG0 4 ARG1 64 ARG2 0 ARG3 1 
-            40ab47    214 FUNC RETURNTYPE RAX 0
+            40ab47    214 FUNC RETURNTYPE RAX 64
             40ab47    214 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             40abf0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+2 ZZ IDIOM 18 MEMORYSINK lea     rcx, [saun+2] 
-            40ac1d     73 FUNC RETURNTYPE RAX 0
+            40ac1d     73 FUNC RETURNTYPE RAX 64
             40ac1d     73 FUNC INARGS    4  ARG0 1 ARG1 4 ARG2 8 ARG3 1 
             40ac66    243 FUNC RETURNTYPE RAX 1
             40ac66    243 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -724,7 +731,7 @@
             40b8cf    108 FUNC RETURNTYPE RAX 0
             40b8cf    108 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b93b     35 FUNC RETURNTYPE RAX 0
-            40b93b     35 FUNC INARGS    2  ARG0 1 ARG1 0 
+            40b93b     35 FUNC INARGS    2  ARG0 1 ARG1 1 
             40b95e    412 FUNC RETURNTYPE RAX 1
             40b95e    412 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 0 
             40b984      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, [path+0] 
@@ -752,7 +759,7 @@
             40c15e    518 FUNC RETURNTYPE RAX 1
             40c15e    518 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40c364    971 FUNC RETURNTYPE RAX 1
-            40c364    971 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            40c364    971 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             40c72f    900 FUNC RETURNTYPE RAX 1
             40c72f    900 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40c8e4      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch        ; size 
@@ -806,27 +813,27 @@
             40ddbc   1515 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40de0c      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax        ; pages 
             40e3a7     81 FUNC RETURNTYPE RAX 4
-            40e3a7     81 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            40e3a7     81 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             40e3f8    862 FUNC RETURNTYPE RAX 96
             40e3f8    862 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40e756     75 FUNC RETURNTYPE RAX 96
             40e756     75 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40e7a4    527 FUNC RETURNTYPE RAX 1
             40e7a4    527 FUNC INARGS    2  ARG0 0 ARG1 4 
-            40e9b3    188 FUNC RETURNTYPE RAX 0
+            40e9b3    188 FUNC RETURNTYPE RAX 4
             40e9b3    188 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            40ea6f    107 FUNC RETURNTYPE RAX 0
+            40ea6f    107 FUNC RETURNTYPE RAX 4
             40ea6f    107 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
-            40eada    276 FUNC RETURNTYPE RAX 0
+            40eada    276 FUNC RETURNTYPE RAX 4
             40eada    276 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40eb84      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 23 sub     rdi, rax 
-            40ebee   1068 FUNC RETURNTYPE RAX 0
+            40ebee   1068 FUNC RETURNTYPE RAX 4
             40ebee   1068 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ed8a      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rcx 
             40ed95      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rcx 
             40ee81      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 1 
             40ef75      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 2Bh 
-            40f01a     69 FUNC RETURNTYPE RAX 0
+            40f01a     69 FUNC RETURNTYPE RAX 4
             40f01a     69 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 1 ARG4 1 ARG5 4 
             40f05f    173 FUNC RETURNTYPE RAX 0
             40f05f    173 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
@@ -909,18 +916,18 @@
             4108c9    321 FUNC RETURNTYPE RAX 1
             4108c9    321 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             410a10     24 FUNC RETURNTYPE RAX 0
-            410a10     24 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
+            410a10     24 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             410a28    328 FUNC RETURNTYPE RAX 4
             410a28    328 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             410afe      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [ev+28h]   ; node 
             410b15      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [ev+28h]   ; node 
             410b70    422 FUNC RETURNTYPE RAX 1
             410b70    422 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            410c6e      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rbp        ; size 
+            410c6e      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rbp        ; size 
             410d16    127 FUNC RETURNTYPE RAX 1
             410d16    127 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             410d95   4837 FUNC RETURNTYPE RAX 4
-            410d95   4837 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            410d95   4837 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             410d95   4837 FUNC PROBLEM ngx_init_cycle CALLUNRESOLVED 
             410e36      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+400 ZZ IDIOM 18 MEMORYSINK lea     rsi, [old_cycle+190h]; src 
             410e73      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+416 ZZ IDIOM 18 MEMORYSINK lea     rsi, [old_cycle+1A0h]; src 
@@ -1058,11 +1065,11 @@
             4147c0     64 FUNC RETURNTYPE RAX 4
             4147c0     64 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 1 
             414800    277 FUNC RETURNTYPE RAX 4
-            414800    277 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
+            414800    277 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 1 ARG5 1 
             414834      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, n, 6Eh     ; size 
             414915    320 FUNC RETURNTYPE RAX 1
             414915    320 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            414a55    120 FUNC RETURNTYPE RAX 0
+            414a55    120 FUNC RETURNTYPE RAX 4
             414a55    120 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             414aa1      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 18h 
             414acd    959 FUNC RETURNTYPE RAX 4
@@ -1256,7 +1263,7 @@
             41a918     64 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41a918     64 FUNC PROBLEM ngx_event_process_posted CALLUNRESOLVED 
             41a958      2 FUNC RETURNTYPE RAX 96
-            41a958      2 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 4 ARG3 1 
+            41a958      2 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 1 
             41a960     56 FUNC RETURNTYPE RAX 4
             41a960     56 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             41a998     15 FUNC RETURNTYPE RAX 0
@@ -1283,7 +1290,7 @@
             41ae64    153 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41ae64    153 FUNC PROBLEM ngx_disable_accept_events CALLUNRESOLVED 
             41aefd    111 FUNC RETURNTYPE RAX 1
-            41aefd    111 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
+            41aefd    111 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             41af6c   1548 FUNC RETURNTYPE RAX 1
             41af6c   1548 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41af6c   1548 FUNC PROBLEM ngx_event_accept CALLUNRESOLVED 
@@ -1291,10 +1298,10 @@
             41b1c4      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [ev+28h]   ; node 
             41b578    171 FUNC RETURNTYPE RAX 1
             41b578    171 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            41b623     37 FUNC RETURNTYPE RAX 0
+            41b623     37 FUNC RETURNTYPE RAX 4
             41b623     37 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b650   1122 FUNC RETURNTYPE RAX 1
-            41b650   1122 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
+            41b650   1122 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             41b650   1122 FUNC PROBLEM ngx_event_connect_peer CALLUNRESOLVED 
             41b74d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+88 ZZ IDIOM 18 MEMORYSINK lea     rcx, [pc+58h]   ; optval 
             41b80d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8, 10h 
@@ -1324,9 +1331,9 @@
             41ca26      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [wev+28h]  ; node 
             41ca4f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [wev+28h]  ; node 
             41cb10     94 FUNC RETURNTYPE RAX 1
-            41cb10     94 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            41cb10     94 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             41cb6e     40 FUNC RETURNTYPE RAX 0
-            41cb6e     40 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            41cb6e     40 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             41cb96     24 FUNC RETURNTYPE RAX 0
             41cb96     24 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             41cbae     24 FUNC RETURNTYPE RAX 0
@@ -1345,7 +1352,7 @@
             41cdfc    119 FUNC RETURNTYPE RAX 0
             41cdfc    119 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             41ce73    141 FUNC RETURNTYPE RAX 1
-            41ce73    141 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            41ce73    141 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             41ce8d      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+R12 ZZ IDIOM 18 STACKMEMSINK lea     rsi, [buf+written]; buf 
             41cf00     93 FUNC RETURNTYPE RAX 0
             41cf00     93 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1355,20 +1362,20 @@
             41d1dd     67 FUNC RETURNTYPE RAX 1
             41d1dd     67 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41d220    353 FUNC RETURNTYPE RAX 1
-            41d220    353 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            41d220    353 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             41d381    155 FUNC RETURNTYPE RAX 1
             41d381    155 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             41d41c     44 FUNC RETURNTYPE RAX 1
             41d41c     44 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             41d448     47 FUNC RETURNTYPE RAX 1
-            41d448     47 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            41d448     47 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             41d477     61 FUNC RETURNTYPE RAX 1
             41d477     61 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41d47b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+8 ZZ IDIOM 18 MEMORYSINK lea     rcx, [gl+8]     ; pglob 
             41d4b4     77 FUNC RETURNTYPE RAX 1
             41d4b4     77 FUNC INARGS    2  ARG0 4 ARG1 4 
             41d501     18 FUNC RETURNTYPE RAX 0
-            41d501     18 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
+            41d501     18 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             41d505      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     gl, 8           ; pglob 
             41d513     87 FUNC RETURNTYPE RAX 0
             41d513     87 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1379,11 +1386,11 @@
             41d618     48 FUNC RETURNTYPE RAX 1
             41d618     48 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41d648     60 FUNC RETURNTYPE RAX 1
-            41d648     60 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
+            41d648     60 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
             41d684     60 FUNC RETURNTYPE RAX 1
             41d684     60 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             41d6c0     58 FUNC RETURNTYPE RAX 1
-            41d6c0     58 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            41d6c0     58 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             41d6fc     37 FUNC RETURNTYPE RAX 0
             41d6fc     37 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             41d721     37 FUNC RETURNTYPE RAX 0
@@ -1411,7 +1418,7 @@
             41e113    243 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 2 ARG4 0 ARG5 0 
             41e113    243 FUNC PROBLEM ngx_add_channel_event CALLUNRESOLVED 
             41e206    134 FUNC RETURNTYPE RAX 1
-            41e206    134 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            41e206    134 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             41e28c    144 FUNC RETURNTYPE RAX 1
             41e28c    144 FUNC INARGS    1  ARG0 4 
             41e31c     97 FUNC RETURNTYPE RAX 1
@@ -1437,7 +1444,7 @@
             41f04c    147 FUNC RETURNTYPE RAX 1
             41f04c    147 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             41f0e0    518 FUNC RETURNTYPE RAX 1
-            41f0e0    518 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
+            41f0e0    518 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             41f2e8    181 FUNC RETURNTYPE RAX 1
             41f2e8    181 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41f3a0    330 FUNC RETURNTYPE RAX 1
@@ -1449,13 +1456,13 @@
             41f51b      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, p          ; n 
             41f535      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, p          ; n 
             41f548    261 FUNC RETURNTYPE RAX 1
-            41f548    261 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
+            41f548    261 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             41f64d    130 FUNC RETURNTYPE RAX 1
             41f64d    130 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41f6d0    288 FUNC RETURNTYPE RAX 1
             41f6d0    288 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             41f7f0    288 FUNC RETURNTYPE RAX 0
-            41f7f0    288 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            41f7f0    288 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             41f7f0    288 FUNC PROBLEM ngx_master_process_exit CALLUNRESOLVED 
             41f910    118 FUNC RETURNTYPE RAX 0
             41f910    118 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1463,7 +1470,7 @@
             41f986    105 FUNC RETURNTYPE RAX 1
             41f986    105 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41f9ef   1262 FUNC RETURNTYPE RAX 1
-            41f9ef   1262 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
+            41f9ef   1262 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
             41f9ef   1262 FUNC PROBLEM ngx_worker_process_init CALLUNRESOLVED 
             41fedd    351 FUNC RETURNTYPE RAX 96
             41fedd    351 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1495,7 +1502,7 @@
             4209c5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [ev+28h]   ; node 
             4209dc      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [ev+28h]   ; node 
             4209fa   2394 FUNC RETURNTYPE RAX 0
-            4209fa   2394 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
+            4209fa   2394 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             420b7d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1]    ; dst 
             420c71      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, 3E8h 
             420d95      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 GLOBALMEMSINK add     rdi, 85E188h    ; fd 
@@ -1503,10 +1510,10 @@
             420ec0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RAX*2 ZZ lea     rdx, [rax+rax*2] 
             421110      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbp+20h] 
             421354    353 FUNC RETURNTYPE RAX 0
-            421354    353 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
+            421354    353 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             421354    353 FUNC PROBLEM ngx_single_process_cycle CALLUNRESOLVED 
             4214b8    265 FUNC RETURNTYPE RAX 1
-            4214b8    265 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
+            4214b8    265 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             4215c1     55 FUNC RETURNTYPE RAX 1
             4215c1     55 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4215f8     34 FUNC RETURNTYPE RAX 1
@@ -1573,7 +1580,7 @@
             422e7b     64 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             422ebb    476 FUNC RETURNTYPE RAX 1
             422ebb    476 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 0 ARG4 4 ARG5 0 
-            422f8c      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 STACKMEMSINK sub     rdx, p          ; n 
+            422f8c      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, p          ; n 
             422fd7      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, p 
             422ff2      4 INSTR CHECK OVERFLOW UNSIGNED 64  RBX ZZ IDIOM 18 MEMORYSINK add     p, 1 
             423014      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [p+1]      ; dst 
@@ -1603,7 +1610,7 @@
             423a2a      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, size       ; n 
             423ac2      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ cdqe 
             423b62    582 FUNC RETURNTYPE RAX 1
-            423b62    582 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
+            423b62    582 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             423da8     54 FUNC RETURNTYPE RAX 1
             423da8     54 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             423da8     54 FUNC PROBLEM ngx_ssl_handshake_handler CALLUNRESOLVED 
@@ -1615,7 +1622,7 @@
             4241e8     73 FUNC RETURNTYPE RAX 1
             4241e8     73 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             424231    314 FUNC RETURNTYPE RAX 1
-            424231    314 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            424231    314 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             42436b    212 FUNC RETURNTYPE RAX 1
             42436b    212 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             42443f    492 FUNC RETURNTYPE RAX 1
@@ -1642,7 +1649,7 @@
             42522c      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 20h        ; size 
             425244      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [shm_zone+18h] 
             425287     51 FUNC RETURNTYPE RAX 96
-            425287     51 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            425287     51 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             4252ba    942 FUNC RETURNTYPE RAX 1
             4252ba    942 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             425668     17 FUNC RETURNTYPE RAX 0
@@ -1670,7 +1677,7 @@
             425cdf    140 FUNC RETURNTYPE RAX 1
             425cdf    140 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             425d70     26 FUNC RETURNTYPE RAX 0
-            425d70     26 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
+            425d70     26 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             425d70     26 FUNC PROBLEM ngx_ssl_ocsp_error CALLUNRESOLVED 
             425d8a      2 FUNC RETURNTYPE RAX 0
             425d8a      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
@@ -1686,7 +1693,7 @@
             42606b    860 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4262df      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RAX ZZ sub     rc, rdi 
             426329      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R8 ZZ sub     r8, rc 
-            4263c7    120 FUNC RETURNTYPE RAX 0
+            4263c7    120 FUNC RETURNTYPE RAX 4
             4263c7    120 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             426413      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 20h 
             42643f    256 FUNC RETURNTYPE RAX 96
@@ -1705,7 +1712,7 @@
             426a70     34 FUNC RETURNTYPE RAX 96
             426a70     34 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             426a92    472 FUNC RETURNTYPE RAX 96
-            426a92    472 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
+            426a92    472 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             426afb      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+128 ZZ IDIOM 18 MEMORYSINK lea     ctx, [ctx+80h]  ; pc 
             426baa      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+28h]  ; node 
             426bc4      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+28h]  ; node 
@@ -1744,8 +1751,8 @@
             427c37    207 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427d06     34 FUNC RETURNTYPE RAX 4
             427d06     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            427d28     23 FUNC RETURNTYPE RAX 0
-            427d28     23 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
+            427d28     23 FUNC RETURNTYPE RAX 4
+            427d28     23 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 96 
             427d3f    475 FUNC RETURNTYPE RAX 1
             427d3f    475 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 1 
             427dc5      4 INSTR CHECK OVERFLOW SIGNED 64  R9 ZZ add     r9, [rc+8] 
@@ -2036,12 +2043,12 @@
             431c3a    158 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431ca7      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 68h        ; uri 
             431cbc      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     clcf, 68h       ; name 
-            431cd8    187 FUNC RETURNTYPE RAX 0
+            431cd8    187 FUNC RETURNTYPE RAX 4
             431cd8    187 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431cd8    187 FUNC PROBLEM ngx_http_log_error CALLUNRESOLVED 
             431d22      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 70h 
             431d67      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 20h 
-            431d93    462 FUNC RETURNTYPE RAX 0
+            431d93    462 FUNC RETURNTYPE RAX 4
             431d93    462 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431dba      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 30h 
             431e4b      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+816 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r+330h] 
@@ -2281,20 +2288,20 @@
             439690      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, edx        ; size 
             43969d    216 FUNC RETURNTYPE RAX 4
             43969d    216 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            439775     37 FUNC RETURNTYPE RAX 0
+            439775     37 FUNC RETURNTYPE RAX 4
             439775     37 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43979a     59 FUNC RETURNTYPE RAX 4
             43979a     59 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4397d5     38 FUNC RETURNTYPE RAX 0
+            4397d5     38 FUNC RETURNTYPE RAX 4
             4397d5     38 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4397fb     71 FUNC RETURNTYPE RAX 0
+            4397fb     71 FUNC RETURNTYPE RAX 4
             4397fb     71 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            439842    117 FUNC RETURNTYPE RAX 0
+            439842    117 FUNC RETURNTYPE RAX 4
             439842    117 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             439854      7 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RCX ZZ sub     rcx, [r+318h] 
             439893      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rax 
             43989d      3 INSTR CHECK UNDERFLOW SIGNED 64  RCX ZZ sub     ms, rax 
-            4398b7     41 FUNC RETURNTYPE RAX 0
+            4398b7     41 FUNC RETURNTYPE RAX 4
             4398b7     41 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4398e0     84 FUNC RETURNTYPE RAX 1
             4398e0     84 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3066,9 +3073,9 @@
             44c01f    326 FUNC RETURNTYPE RAX 96
             44c01f    326 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44c165     98 FUNC RETURNTYPE RAX 1
-            44c165     98 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            44c165     98 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             44c1c7     42 FUNC RETURNTYPE RAX 0
-            44c1c7     42 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            44c1c7     42 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             44c1cb      7 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [cache+48h], 3E8h; useconds 
             44c1f1    343 FUNC RETURNTYPE RAX 4
             44c1f1    343 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3089,7 +3096,7 @@
             44c3e2      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 21h        ; len 
             44c437      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
             44c4b0    214 FUNC RETURNTYPE RAX 1
-            44c4b0    214 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+            44c4b0    214 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             44c4cf      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, [rbx+10h] 
             44c4d3      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 22h        ; size 
             44c501      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
@@ -3476,7 +3483,7 @@
             456ff8     65 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45700e      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 1B8h       ; a 
             457039     91 FUNC RETURNTYPE RAX 1
-            457039     91 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
+            457039     91 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             457094    244 FUNC RETURNTYPE RAX 1
             457094    244 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             4570b2      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+464 ZZ IDIOM 18 MEMORYSINK lea     r, [r+1D0h]     ; l 
@@ -3542,7 +3549,7 @@
             458287      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [r12] 
             45828b      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rax 
             4584a7    123 FUNC RETURNTYPE RAX 96
-            4584a7    123 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
+            4584a7    123 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             458522    947 FUNC RETURNTYPE RAX 1
             458522    947 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4585ed      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [ctx_0+10h] 
@@ -4185,7 +4192,7 @@
             46afcc   2000 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46afcc   2000 FUNC PROBLEM ngx_http_scgi_create_request CALLUNRESOLVED 
             46b1b9      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*8 ZZ lea     rsi, ds:0[rdx*8]; size 
-            46b336      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 16h        ; size 
+            46b336      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 19 add     rsi, 16h        ; size 
             46b5fa      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1          ; dest 
             46b79c   3436 FUNC RETURNTYPE RAX 1
             46b79c   3436 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -4778,7 +4785,7 @@
             479390     27 FUNC RETURNTYPE RAX 0
             479390     27 FUNC INARGS    3  ARG0 4 ARG1 4 ARG2 4 
             4793b0     15 FUNC RETURNTYPE RAX 1
-            4793b0     15 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 0 
+            4793b0     15 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 4 
             4793c0     15 FUNC RETURNTYPE RAX 0
             4793c0     15 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4793d0     38 FUNC RETURNTYPE RAX 0
@@ -5026,7 +5033,7 @@
             47cc10    370 FUNC RETURNTYPE RAX 96
             47cc10    370 FUNC INARGS    6  ARG0 0 ARG1 16 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             47cd90    309 FUNC RETURNTYPE RAX 1
-            47cd90    309 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            47cd90    309 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             47ced0    445 FUNC RETURNTYPE RAX 1
             47ced0    445 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47cf33      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX ZZ lea     rax, [r13+rax+2] 
@@ -5055,7 +5062,7 @@
             47d600      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+272 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+110h] 
             47d607      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+264 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+108h] 
             47d620      8 FUNC RETURNTYPE RAX 0
-            47d620      8 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 4 ARG3 1 
+            47d620      8 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 4 
             47d630     78 FUNC RETURNTYPE RAX 4
             47d630     78 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47d680     25 FUNC RETURNTYPE RAX 0
@@ -7944,21 +7951,21 @@
             4c56d0    243 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 1 ARG5 0 
             4c5704      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 400h 
             4c57d0    814 FUNC RETURNTYPE RAX 1
-            4c57d0    814 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 8 ARG3 4 ARG4 1 ARG5 0 
+            4c57d0    814 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 8 ARG3 4 ARG4 1 ARG5 0 
             4c58d4      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
             4c5970      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
             4c5b00   3833 FUNC RETURNTYPE RAX 0
-            4c5b00   3833 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 4 
+            4c5b00   3833 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 4 ARG3 8 ARG4 8 ARG5 4 
             4c5d41      4 INSTR CHECK TRUNCATION SIGNED 32 EDX 8 DL ZZ IDIOM 14 movsx   r8d, dl 
             4c6241      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
-            4c6a00    260 FUNC RETURNTYPE RAX 0
-            4c6a00    260 FUNC PROBLEM BIO_vprintf CHUNKS 
-            4c6b10    143 FUNC RETURNTYPE RAX 0
-            4c6b10    143 FUNC PROBLEM BIO_printf CHUNKS 
-            4c6ba0    214 FUNC RETURNTYPE RAX 0
-            4c6ba0    214 FUNC PROBLEM BIO_snprintf CHUNKS 
-            4c6c80     81 FUNC RETURNTYPE RAX 0
-            4c6c80     81 FUNC PROBLEM BIO_vsnprintf CHUNKS 
+            4c6a00    260 FUNC RETURNTYPE RAX 1
+            4c6a00    260 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 8 ARG3 96 ARG4 96 ARG5 96 
+            4c6b10    143 FUNC RETURNTYPE RAX 1
+            4c6b10    143 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 96 ARG5 96 
+            4c6ba0    214 FUNC RETURNTYPE RAX 1
+            4c6ba0    214 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 96 ARG4 96 ARG5 96 
+            4c6c80     81 FUNC RETURNTYPE RAX 1
+            4c6c80     81 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4c6ce0    187 FUNC RETURNTYPE RAX 1
             4c6ce0    187 FUNC INARGS    5  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
             4c6da0     21 FUNC RETURNTYPE RAX 0
@@ -10252,7 +10259,7 @@
             4ebc50    178 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ebc50    178 FUNC PROBLEM X509_STORE_CTX_cleanup CALLUNRESOLVED 
             4ebd10     18 FUNC RETURNTYPE RAX 0
-            4ebd10     18 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 1 ARG4 0 ARG5 0 
+            4ebd10     18 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
             4ebd30    869 FUNC RETURNTYPE RAX 1
             4ebd30    869 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ebd30    869 FUNC PROBLEM check_crl CALLUNRESOLVED 
@@ -10649,7 +10656,7 @@
             4ef440    251 FUNC RETURNTYPE RAX 4
             4ef440    251 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ef540      6 FUNC RETURNTYPE RAX 16
-            4ef540      6 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 1 ARG3 96 
+            4ef540      6 FUNC INARGS    4  ARG0 0 ARG1 96 ARG2 1 ARG3 96 
             4ef550    464 FUNC RETURNTYPE RAX 1
             4ef550    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ef720    199 FUNC RETURNTYPE RAX 1
@@ -11640,11 +11647,11 @@
             501880     10 FUNC RETURNTYPE RAX 0
             501880     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             501890     10 FUNC RETURNTYPE RAX 4
-            501890     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
+            501890     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 96 
             5018a0     10 FUNC RETURNTYPE RAX 0
             5018a0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             5018b0     10 FUNC RETURNTYPE RAX 96
-            5018b0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 1 
+            5018b0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 96 
             5018c0     10 FUNC RETURNTYPE RAX 0
             5018c0     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 1 
             5018d0     10 FUNC RETURNTYPE RAX 1
@@ -11692,7 +11699,7 @@
             501a20     10 FUNC RETURNTYPE RAX 0
             501a20     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             501a30     10 FUNC RETURNTYPE RAX 1
-            501a30     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 1 
+            501a30     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             501a40     10 FUNC RETURNTYPE RAX 0
             501a40     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             501a50     10 FUNC RETURNTYPE RAX 0
@@ -12615,7 +12622,7 @@
             532570   2206 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             532c8f      2 INSTR CHECK TRUNCATION SIGNED 64 RBX 32 EBX ZZ mov     esi, ebx 
             532e10     92 FUNC RETURNTYPE RAX 1
-            532e10     92 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 1 
+            532e10     92 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 1 
             532e70    136 FUNC RETURNTYPE RAX 1
             532e70    136 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             532f00    234 FUNC RETURNTYPE RAX 1
@@ -13539,7 +13546,7 @@
             54ada1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             54adc0     16 FUNC RETURNTYPE RAX 0
             54adc0     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            54add0     71 FUNC RETURNTYPE RAX 0
+            54add0     71 FUNC RETURNTYPE RAX 1
             54add0     71 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54ae20    310 FUNC RETURNTYPE RAX 1
             54ae20    310 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -13547,7 +13554,7 @@
             54af60     13 FUNC RETURNTYPE RAX 0
             54af60     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             54af70     13 FUNC RETURNTYPE RAX 0
-            54af70     13 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            54af70     13 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             54af80     21 FUNC RETURNTYPE RAX 1
             54af80     21 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 96 
             54afa0    316 FUNC RETURNTYPE RAX 0
@@ -15205,7 +15212,7 @@
             56dde0     22 FUNC INARGS    1  ARG0 4 
             56de00     33 FUNC RETURNTYPE RAX 1
             56de00     33 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            56de30     96 FUNC RETURNTYPE RAX 0
+            56de30     96 FUNC RETURNTYPE RAX 1
             56de30     96 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             56de90      7 FUNC RETURNTYPE RAX 0
             56de90      7 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -16622,7 +16629,7 @@
             59d5b0     55 FUNC RETURNTYPE RAX 1
             59d5b0     55 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             59d5f0      6 FUNC RETURNTYPE RAX 16
-            59d5f0      6 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 4 ARG3 0 
+            59d5f0      6 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 1 ARG3 0 
             59d600     19 FUNC RETURNTYPE RAX 1
             59d600     19 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             59d620     92 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-openssl.psexe.infoannot b/tests/commit/save-openssl.psexe.infoannot
index c426c1b79f5b8a06e0c0a3b46de58172ced5373b..63001deafd26a7f0a4eda2fdab59bea73ab8e0c5 100644
--- a/tests/commit/save-openssl.psexe.infoannot
+++ b/tests/commit/save-openssl.psexe.infoannot
@@ -15,7 +15,7 @@
             402090      6 FUNC RETURNTYPE RAX 0
             402090      6 FUNC PROBLEM .localtime JUMPUNRESOLVED 
             4020a0      6 FUNC RETURNTYPE RAX 0
-            4020a0      6 FUNC PROBLEM .__vfprintf_chk CHUNKS JUMPUNRESOLVED 
+            4020a0      6 FUNC PROBLEM .__vfprintf_chk JUMPUNRESOLVED 
             4020b0      6 FUNC RETURNTYPE RAX 0
             4020b0      6 FUNC PROBLEM .abort JUMPUNRESOLVED 
             4020c0      6 FUNC RETURNTYPE RAX 0
@@ -167,7 +167,7 @@
             402550      6 FUNC RETURNTYPE RAX 0
             402550      6 FUNC PROBLEM .fdopen JUMPUNRESOLVED 
             402560      6 FUNC RETURNTYPE RAX 0
-            402560      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            402560      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             402570      6 FUNC RETURNTYPE RAX 0
             402570      6 FUNC PROBLEM .setvbuf JUMPUNRESOLVED 
             402580      6 FUNC RETURNTYPE RAX 0
@@ -213,7 +213,7 @@
             4026c0      6 FUNC RETURNTYPE RAX 0
             4026c0      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
             4026d0      6 FUNC RETURNTYPE RAX 0
-            4026d0      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            4026d0      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             4026e0      6 FUNC RETURNTYPE RAX 0
             4026e0      6 FUNC PROBLEM .__strncat_chk JUMPUNRESOLVED 
             4026f0      6 FUNC RETURNTYPE RAX 0
@@ -233,7 +233,7 @@
             402760      6 FUNC RETURNTYPE RAX 0
             402760      6 FUNC PROBLEM .__ctype_b_loc JUMPUNRESOLVED 
             402770      6 FUNC RETURNTYPE RAX 0
-            402770      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            402770      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             402780      6 FUNC RETURNTYPE RAX 0
             402780      6 FUNC PROBLEM .socket JUMPUNRESOLVED 
             4027c0     70 FUNC RETURNTYPE RAX 1
@@ -332,7 +332,7 @@
             409665      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+8 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r15+8] 
             4097a4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
             4097d0    138 FUNC RETURNTYPE RAX 1
-            4097d0    138 FUNC INARGS    6  ARG0 0 ARG1 16 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
+            4097d0    138 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             409860    189 FUNC RETURNTYPE RAX 1
             409860    189 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             409920    832 FUNC RETURNTYPE RAX 1
@@ -834,7 +834,7 @@
             43715f      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBP 32 EBP ZZ mov     edx, ebp 
             437190    282 FUNC RETURNTYPE RAX 96
             437190    282 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4372b0   1332 FUNC RETURNTYPE RAX 0
+            4372b0   1332 FUNC RETURNTYPE RAX 1
             4372b0   1332 FUNC INARGS    5  ARG0 1 ARG1 1 ARG2 1 ARG3 4 ARG4 0 
             43743f      4 INSTR CHECK OVERFLOW UNSIGNED 64  R13 ZZ add     r13, 1 
             4377f0    442 FUNC RETURNTYPE RAX 0
@@ -896,7 +896,7 @@
             43cfa0     67 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43cff0    126 FUNC RETURNTYPE RAX 1
             43cff0    126 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            43d070     72 FUNC RETURNTYPE RAX 0
+            43d070     72 FUNC RETURNTYPE RAX 1
             43d070     72 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43d0c0   3184 FUNC RETURNTYPE RAX 1
             43d0c0   3184 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2475,7 +2475,7 @@
             47c010      8 FUNC RETURNTYPE RAX 0
             47c010      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             47c020      8 FUNC RETURNTYPE RAX 0
-            47c020      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            47c020      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             47c030     25 FUNC RETURNTYPE RAX 0
             47c030     25 FUNC INARGS    5  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
             47c050     12 FUNC RETURNTYPE RAX 0
@@ -2518,7 +2518,7 @@
             47c3a0     43 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             47c3d0      8 FUNC RETURNTYPE RAX 0
             47c3d0      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
-            47c3e0      8 FUNC RETURNTYPE RAX 0
+            47c3e0      8 FUNC RETURNTYPE RAX 1
             47c3e0      8 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 1 
             47c3f0      8 FUNC RETURNTYPE RAX 0
             47c3f0      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -2596,7 +2596,7 @@
             47d7b0    370 FUNC RETURNTYPE RAX 96
             47d7b0    370 FUNC INARGS    6  ARG0 0 ARG1 2 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             47d930    309 FUNC RETURNTYPE RAX 1
-            47d930    309 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            47d930    309 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             47da70    445 FUNC RETURNTYPE RAX 1
             47da70    445 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47dad3      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX ZZ lea     rax, [r13+rax+2] 
@@ -4414,7 +4414,7 @@
             4c2680   2206 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c2d9f      2 INSTR CHECK TRUNCATION SIGNED 64 RBX 32 EBX ZZ mov     esi, ebx 
             4c2f20     92 FUNC RETURNTYPE RAX 1
-            4c2f20     92 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 1 
+            4c2f20     92 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 1 
             4c2f80    143 FUNC RETURNTYPE RAX 1
             4c2f80    143 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c3010    224 FUNC RETURNTYPE RAX 1
@@ -5256,7 +5256,7 @@
             4d5210     80 FUNC RETURNTYPE RAX 1
             4d5210     80 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4d5260    136 FUNC RETURNTYPE RAX 1
-            4d5260    136 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            4d5260    136 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4d52f0     88 FUNC RETURNTYPE RAX 96
             4d52f0     88 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             4d5350     10 FUNC RETURNTYPE RAX 0
@@ -5374,7 +5374,7 @@
             4d5b80     89 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4d5b80     89 FUNC PROBLEM ENGINE_get_cipher CALLUNRESOLVED 
             4d5be0      5 FUNC RETURNTYPE RAX 0
-            4d5be0      5 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 1 
+            4d5be0      5 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 96 ARG3 1 
             4d5bf0     10 FUNC RETURNTYPE RAX 1
             4d5bf0     10 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 1 
             4d5c00     10 FUNC RETURNTYPE RAX 0
@@ -5396,7 +5396,7 @@
             4d5d70     89 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4d5d70     89 FUNC PROBLEM ENGINE_get_digest CALLUNRESOLVED 
             4d5dd0      5 FUNC RETURNTYPE RAX 0
-            4d5dd0      5 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 1 
+            4d5dd0      5 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 96 ARG3 1 
             4d5de0     10 FUNC RETURNTYPE RAX 1
             4d5de0     10 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 1 
             4d5df0     10 FUNC RETURNTYPE RAX 0
@@ -5418,7 +5418,7 @@
             4d5f60     89 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4d5f60     89 FUNC PROBLEM ENGINE_get_pkey_meth CALLUNRESOLVED 
             4d5fc0      5 FUNC RETURNTYPE RAX 0
-            4d5fc0      5 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 1 
+            4d5fc0      5 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 96 ARG3 1 
             4d5fd0     10 FUNC RETURNTYPE RAX 1
             4d5fd0     10 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 1 
             4d5fe0    115 FUNC RETURNTYPE RAX 0
@@ -5559,7 +5559,7 @@
             4da090      6 FUNC RETURNTYPE RAX 0
             4da090      6 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 96 
             4da0a0      4 FUNC RETURNTYPE RAX 96
-            4da0a0      4 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 1 
+            4da0a0      4 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 96 
             4da0b0      5 FUNC RETURNTYPE RAX 0
             4da0b0      5 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 1 ARG3 1 
             4da0c0      5 FUNC RETURNTYPE RAX 96
@@ -5742,7 +5742,7 @@
             4dc910      6 FUNC RETURNTYPE RAX 16
             4dc910      6 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4dc920     82 FUNC RETURNTYPE RAX 4
-            4dc920     82 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
+            4dc920     82 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             4dc980    108 FUNC RETURNTYPE RAX 1
             4dc980    108 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4dc9f0     74 FUNC RETURNTYPE RAX 1
@@ -5807,21 +5807,21 @@
             4de280    243 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 1 ARG5 0 
             4de2b4      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 400h 
             4de380    814 FUNC RETURNTYPE RAX 1
-            4de380    814 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 8 ARG3 4 ARG4 1 ARG5 0 
+            4de380    814 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 8 ARG3 4 ARG4 1 ARG5 0 
             4de484      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
             4de520      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
             4de6b0   3833 FUNC RETURNTYPE RAX 0
-            4de6b0   3833 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 4 
+            4de6b0   3833 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 4 ARG3 8 ARG4 8 ARG5 4 
             4de8f1      4 INSTR CHECK TRUNCATION SIGNED 32 EDX 8 DL ZZ IDIOM 14 movsx   r8d, dl 
             4dedf1      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
-            4df5b0    260 FUNC RETURNTYPE RAX 0
-            4df5b0    260 FUNC PROBLEM BIO_vprintf CHUNKS 
-            4df6c0    143 FUNC RETURNTYPE RAX 0
-            4df6c0    143 FUNC PROBLEM BIO_printf CHUNKS 
-            4df750    214 FUNC RETURNTYPE RAX 0
-            4df750    214 FUNC PROBLEM BIO_snprintf CHUNKS 
-            4df830     81 FUNC RETURNTYPE RAX 0
-            4df830     81 FUNC PROBLEM BIO_vsnprintf CHUNKS 
+            4df5b0    260 FUNC RETURNTYPE RAX 1
+            4df5b0    260 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 8 ARG3 96 ARG4 96 ARG5 96 
+            4df6c0    143 FUNC RETURNTYPE RAX 1
+            4df6c0    143 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 96 ARG5 96 
+            4df750    214 FUNC RETURNTYPE RAX 1
+            4df750    214 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 96 ARG4 96 ARG5 96 
+            4df830     81 FUNC RETURNTYPE RAX 1
+            4df830     81 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4df890     16 FUNC RETURNTYPE RAX 0
             4df890     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4df8a0     22 FUNC RETURNTYPE RAX 0
@@ -6003,7 +6003,7 @@
             4e35c0    335 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e3710    123 FUNC RETURNTYPE RAX 4
             4e3710    123 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4e3790     90 FUNC RETURNTYPE RAX 0
+            4e3790     90 FUNC RETURNTYPE RAX 1
             4e3790     90 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e37f0    281 FUNC RETURNTYPE RAX 1
             4e37f0    281 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -6161,7 +6161,7 @@
             4e75e0     24 FUNC INARGS    4  ARG0 8 ARG1 8 ARG2 8 ARG3 8 
             4e7600     24 FUNC RETURNTYPE RAX 0
             4e7600     24 FUNC INARGS    2  ARG0 0 ARG1 0 
-            4e7620     22 FUNC RETURNTYPE RAX 0
+            4e7620     22 FUNC RETURNTYPE RAX 1
             4e7640   1581 FUNC RETURNTYPE RAX 16
             4e7640   1581 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 1 ARG5 1 
             4e7c70    285 FUNC RETURNTYPE RAX 4
@@ -6184,13 +6184,13 @@
             4e81b0    158 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 96 ARG5 1 
             4e8250     16 FUNC RETURNTYPE RAX 0
             4e8250     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            4e8260     71 FUNC RETURNTYPE RAX 0
+            4e8260     71 FUNC RETURNTYPE RAX 1
             4e8260     71 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e82b0    310 FUNC RETURNTYPE RAX 1
             4e82b0    310 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e82b0    310 FUNC PROBLEM ERR_print_errors_cb CALLUNRESOLVED 
             4e83f0     13 FUNC RETURNTYPE RAX 0
-            4e83f0     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
+            4e83f0     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 0 
             4e8400     13 FUNC RETURNTYPE RAX 0
             4e8400     13 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 96 ARG3 96 
             4e8410    135 FUNC RETURNTYPE RAX 1
@@ -7198,7 +7198,7 @@
             4f5a40      5 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 1 
             4f5a50      5 FUNC RETURNTYPE RAX 0
             4f5a50      5 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 1 
-            4f5a60      5 FUNC RETURNTYPE RAX 4
+            4f5a60      5 FUNC RETURNTYPE RAX 96
             4f5a60      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 1 
             4f5a70      5 FUNC RETURNTYPE RAX 0
             4f5a70      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -7278,7 +7278,7 @@
             4f68f0    259 FUNC RETURNTYPE RAX 1
             4f68f0    259 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4f68f0    259 FUNC PROBLEM EVP_PKEY_keygen CALLUNRESOLVED 
-            4f6a00      5 FUNC RETURNTYPE RAX 4
+            4f6a00      5 FUNC RETURNTYPE RAX 96
             4f6a00      5 FUNC INARGS    4  ARG0 4 ARG1 2 ARG2 1 ARG3 1 
             4f6a10      5 FUNC RETURNTYPE RAX 0
             4f6a10      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -7822,7 +7822,7 @@
             500700     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             500710     10 FUNC RETURNTYPE RAX 0
             500710     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            500720     10 FUNC RETURNTYPE RAX 16
+            500720     10 FUNC RETURNTYPE RAX 96
             500720     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 1 
             500730     10 FUNC RETURNTYPE RAX 96
             500730     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
@@ -8407,7 +8407,7 @@
             50c830    106 FUNC RETURNTYPE RAX 4
             50c830    106 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             50c8a0    106 FUNC RETURNTYPE RAX 4
-            50c8a0    106 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 1 ARG4 4 ARG5 4 
+            50c8a0    106 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 96 ARG4 4 ARG5 4 
             50c910     66 FUNC RETURNTYPE RAX 0
             50c910     66 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             50c960     69 FUNC RETURNTYPE RAX 1
@@ -8659,7 +8659,7 @@
             5117a0     55 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
             5117e0     55 FUNC RETURNTYPE RAX 1
             5117e0     55 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            511820     27 FUNC RETURNTYPE RAX 0
+            511820     27 FUNC RETURNTYPE RAX 1
             511820     27 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 1 ARG3 1 
             511840     27 FUNC RETURNTYPE RAX 0
             511840     27 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -9008,7 +9008,7 @@
             518f50      7 FUNC RETURNTYPE RAX 0
             518f50      7 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             518f60      7 FUNC RETURNTYPE RAX 0
-            518f60      7 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            518f60      7 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 4 
             518f70      8 FUNC RETURNTYPE RAX 0
             518f70      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             518f80      8 FUNC RETURNTYPE RAX 0
@@ -9021,7 +9021,7 @@
             519010      8 FUNC RETURNTYPE RAX 0
             519010      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             519020      8 FUNC RETURNTYPE RAX 0
-            519020      8 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            519020      8 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 4 
             519030      5 FUNC RETURNTYPE RAX 1
             519030      5 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 1 ARG3 1 
             519040      5 FUNC RETURNTYPE RAX 0
@@ -9462,11 +9462,11 @@
             51e120     21 FUNC INARGS    2  ARG0 0 ARG1 0 
             51e140     16 FUNC RETURNTYPE RAX 0
             51e140     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            51e150     21 FUNC RETURNTYPE RAX 0
+            51e150     21 FUNC RETURNTYPE RAX 1
             51e150     21 FUNC INARGS    2  ARG0 4 ARG1 1 
             51e170     16 FUNC RETURNTYPE RAX 1
             51e170     16 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 0 
-            51e180     21 FUNC RETURNTYPE RAX 0
+            51e180     21 FUNC RETURNTYPE RAX 1
             51e180     21 FUNC INARGS    2  ARG0 4 ARG1 1 
             51e1a0     16 FUNC RETURNTYPE RAX 1
             51e1a0     16 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 0 ARG3 1 
@@ -9791,7 +9791,7 @@
             523bc0    117 FUNC RETURNTYPE RAX 96
             523bc0    117 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             523c40     10 FUNC RETURNTYPE RAX 0
-            523c40     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 96 
+            523c40     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             523c50    193 FUNC RETURNTYPE RAX 96
             523c50    193 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
             523d20    459 FUNC RETURNTYPE RAX 96
@@ -10325,7 +10325,7 @@
             52ddd0     99 FUNC RETURNTYPE RAX 1
             52ddd0     99 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             52de40    188 FUNC RETURNTYPE RAX 0
-            52de40    188 FUNC INARGS    6  ARG0 1 ARG1 96 ARG2 4 ARG3 1 ARG4 4 ARG5 96 
+            52de40    188 FUNC INARGS    6  ARG0 1 ARG1 96 ARG2 4 ARG3 96 ARG4 4 ARG5 96 
             52df00    288 FUNC RETURNTYPE RAX 1
             52df00    288 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             52df00    288 FUNC PROBLEM NCONF_get_number_e CALLUNRESOLVED 
@@ -11451,7 +11451,7 @@
             542660     71 FUNC RETURNTYPE RAX 1
             542660     71 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             5426b0    215 FUNC RETURNTYPE RAX 96
-            5426b0    215 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            5426b0    215 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             542790     98 FUNC RETURNTYPE RAX 1
             542790     98 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5427a1      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+28 ZZ lea     rdi, [rsi+1Ch] 
@@ -11638,7 +11638,7 @@
             547470     11 FUNC RETURNTYPE RAX 1
             547470     11 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 0 ARG3 1 
             547480      5 FUNC RETURNTYPE RAX 0
-            547480      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 96 ARG3 96 
+            547480      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 96 
             547490     33 FUNC RETURNTYPE RAX 0
             547490     33 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5474c0      9 FUNC RETURNTYPE RAX 0
@@ -11685,27 +11685,27 @@
             5478b0    124 FUNC RETURNTYPE RAX 1
             5478b0    124 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             547930      5 FUNC RETURNTYPE RAX 0
-            547930      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            547930      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             547940    124 FUNC RETURNTYPE RAX 1
             547940    124 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5479c0      5 FUNC RETURNTYPE RAX 0
-            5479c0      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            5479c0      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             5479d0    124 FUNC RETURNTYPE RAX 1
             5479d0    124 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             547a50      5 FUNC RETURNTYPE RAX 0
-            547a50      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            547a50      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             547a60    116 FUNC RETURNTYPE RAX 1
             547a60    116 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             547ae0      4 FUNC RETURNTYPE RAX 0
-            547ae0      4 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            547ae0      4 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             547af0    131 FUNC RETURNTYPE RAX 1
             547af0    131 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             547b80      5 FUNC RETURNTYPE RAX 0
-            547b80      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            547b80      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             547b90    131 FUNC RETURNTYPE RAX 1
             547b90    131 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             547c20      5 FUNC RETURNTYPE RAX 0
-            547c20      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
+            547c20      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             547c30     21 FUNC RETURNTYPE RAX 1
             547c30     21 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 1 ARG3 1 
             547c50     11 FUNC RETURNTYPE RAX 1
@@ -11740,7 +11740,7 @@
             547e40      9 FUNC RETURNTYPE RAX 0
             547e40      9 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             547e50    404 FUNC RETURNTYPE RAX 1
-            547e50    404 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            547e50    404 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             547ff0    804 FUNC RETURNTYPE RAX 1
             547ff0    804 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             548320    139 FUNC RETURNTYPE RAX 1
@@ -11831,7 +11831,7 @@
             54b240    630 FUNC RETURNTYPE RAX 4
             54b240    630 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54b4c0    151 FUNC RETURNTYPE RAX 1
-            54b4c0    151 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+            54b4c0    151 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             54b560    117 FUNC RETURNTYPE RAX 1
             54b560    117 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54b5e0    244 FUNC RETURNTYPE RAX 1
@@ -12250,7 +12250,7 @@
             554c80     22 FUNC INARGS    1  ARG0 4 
             554ca0     33 FUNC RETURNTYPE RAX 1
             554ca0     33 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            554cd0     96 FUNC RETURNTYPE RAX 0
+            554cd0     96 FUNC RETURNTYPE RAX 1
             554cd0     96 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             554d30      7 FUNC RETURNTYPE RAX 0
             554d30      7 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
diff --git a/tests/commit/save-synaptic.psexe.infoannot b/tests/commit/save-synaptic.psexe.infoannot
index cfecf1a0868dd1223a635dd7a857d39212614936..5679f1e84872a611cb357845b5ebb46b1e353414 100644
--- a/tests/commit/save-synaptic.psexe.infoannot
+++ b/tests/commit/save-synaptic.psexe.infoannot
@@ -449,7 +449,7 @@
             413540      6 FUNC RETURNTYPE RAX 0
             413540      6 FUNC PROBLEM .gtk_spin_button_get_value_as_int JUMPUNRESOLVED 
             413550      6 FUNC RETURNTYPE RAX 0
-            413550      6 FUNC PROBLEM .__snprintf_chk CHUNKS JUMPUNRESOLVED 
+            413550      6 FUNC PROBLEM .__snprintf_chk JUMPUNRESOLVED 
             413560      6 FUNC RETURNTYPE RAX 0
             413560      6 FUNC PROBLEM .g_list_free JUMPUNRESOLVED 
             413570      6 FUNC RETURNTYPE RAX 0
@@ -577,7 +577,7 @@
             413940      6 FUNC RETURNTYPE RAX 0
             413940      6 FUNC PROBLEM .gtk_image_set_from_pixbuf JUMPUNRESOLVED 
             413950      6 FUNC RETURNTYPE RAX 0
-            413950      6 FUNC PROBLEM .g_strdup_printf CHUNKS JUMPUNRESOLVED 
+            413950      6 FUNC PROBLEM .g_strdup_printf JUMPUNRESOLVED 
             413960      6 FUNC RETURNTYPE RAX 0
             413960      6 FUNC PROBLEM .gtk_list_store_move_before JUMPUNRESOLVED 
             413970      6 FUNC RETURNTYPE RAX 0
@@ -749,7 +749,7 @@
             413ea0      6 FUNC RETURNTYPE RAX 0
             413ea0      6 FUNC PROBLEM .gtk_container_get_children JUMPUNRESOLVED 
             413eb0      6 FUNC RETURNTYPE RAX 0
-            413eb0      6 FUNC PROBLEM ._Z8ioprintfRSoPKcz CHUNKS JUMPUNRESOLVED 
+            413eb0      6 FUNC PROBLEM ._Z8ioprintfRSoPKcz JUMPUNRESOLVED 
             413ec0      6 FUNC RETURNTYPE RAX 0
             413ec0      6 FUNC PROBLEM .time JUMPUNRESOLVED 
             413ed0      6 FUNC RETURNTYPE RAX 0
@@ -1493,7 +1493,7 @@
             415600      6 FUNC RETURNTYPE RAX 0
             415600      6 FUNC PROBLEM .gtk_tree_model_get JUMPUNRESOLVED 
             415610      6 FUNC RETURNTYPE RAX 0
-            415610      6 FUNC PROBLEM .g_string_append_printf CHUNKS JUMPUNRESOLVED 
+            415610      6 FUNC PROBLEM .g_string_append_printf JUMPUNRESOLVED 
             415620      6 FUNC RETURNTYPE RAX 0
             415620      6 FUNC PROBLEM ._ZNSt12__basic_fileIcED1Ev JUMPUNRESOLVED 
             415630      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-toy.exe.infoannot b/tests/commit/save-toy.exe.infoannot
index 78679302fbd065be0a887cf405b2127f90022938..26ba0861cd1d1e42e7eb2c01ecec781b6f12b3d1 100644
--- a/tests/commit/save-toy.exe.infoannot
+++ b/tests/commit/save-toy.exe.infoannot
@@ -6,7 +6,7 @@
            80482d8      6 FUNC RETURNTYPE EAX 0
            80482d8      6 FUNC PROBLEM .scanf JUMPUNRESOLVED 
            80482e8      6 FUNC RETURNTYPE EAX 0
-           80482e8      6 FUNC PROBLEM .printf CHUNKS JUMPUNRESOLVED 
+           80482e8      6 FUNC PROBLEM .printf JUMPUNRESOLVED 
            80482f8      6 FUNC RETURNTYPE EAX 0
            80482f8      6 FUNC PROBLEM .puts JUMPUNRESOLVED 
            8048310     34 FUNC RETURNTYPE EAX 0
diff --git a/tests/commit/save-xcalc.psexe.infoannot b/tests/commit/save-xcalc.psexe.infoannot
index 1d52e649758800ea77ea92e1899ff56b055670e8..e60735ca6e314a47743b1e545ab075ab8f9334a6 100644
--- a/tests/commit/save-xcalc.psexe.infoannot
+++ b/tests/commit/save-xcalc.psexe.infoannot
@@ -107,11 +107,11 @@
             4017d0      6 FUNC RETURNTYPE RAX 0
             4017d0      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
             4017e0      6 FUNC RETURNTYPE RAX 0
-            4017e0      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            4017e0      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             4017f0      6 FUNC RETURNTYPE RAX 0
             4017f0      6 FUNC PROBLEM .sqrt JUMPUNRESOLVED 
             401800      6 FUNC RETURNTYPE RAX 0
-            401800      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            401800      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             401810   1234 FUNC RETURNTYPE RAX 1
             401810   1234 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401ce4     42 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-xedit.psexe.infoannot b/tests/commit/save-xedit.psexe.infoannot
index 2349c6e71144ee96e54cc7c9edbebe3366c7a350..7bc005a38e959b5ff56d992f0cab499c8702d891 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -9,7 +9,7 @@
             403d60      6 FUNC RETURNTYPE RAX 0
             403d60      6 FUNC PROBLEM .getenv JUMPUNRESOLVED 
             403d70      6 FUNC RETURNTYPE RAX 0
-            403d70      6 FUNC PROBLEM .__snprintf_chk CHUNKS JUMPUNRESOLVED 
+            403d70      6 FUNC PROBLEM .__snprintf_chk JUMPUNRESOLVED 
             403d80      6 FUNC RETURNTYPE RAX 0
             403d80      6 FUNC PROBLEM .free JUMPUNRESOLVED 
             403d90      6 FUNC RETURNTYPE RAX 0
@@ -111,7 +111,7 @@
             404090      6 FUNC RETURNTYPE RAX 0
             404090      6 FUNC PROBLEM .__stack_chk_fail JUMPUNRESOLVED 
             4040a0      6 FUNC RETURNTYPE RAX 0
-            4040a0      6 FUNC PROBLEM .XmuSnprintf CHUNKS JUMPUNRESOLVED 
+            4040a0      6 FUNC PROBLEM .XmuSnprintf JUMPUNRESOLVED 
             4040b0      6 FUNC RETURNTYPE RAX 0
             4040b0      6 FUNC PROBLEM .getuid JUMPUNRESOLVED 
             4040c0      6 FUNC RETURNTYPE RAX 0
@@ -125,7 +125,7 @@
             404100      6 FUNC RETURNTYPE RAX 0
             404100      6 FUNC PROBLEM .pclose JUMPUNRESOLVED 
             404110      6 FUNC RETURNTYPE RAX 0
-            404110      6 FUNC PROBLEM .snprintf CHUNKS JUMPUNRESOLVED 
+            404110      6 FUNC PROBLEM .snprintf JUMPUNRESOLVED 
             404120      6 FUNC RETURNTYPE RAX 0
             404120      6 FUNC PROBLEM .modf JUMPUNRESOLVED 
             404130      6 FUNC RETURNTYPE RAX 0
@@ -271,7 +271,7 @@
             404590      6 FUNC RETURNTYPE RAX 0
             404590      6 FUNC PROBLEM .XPutBackEvent JUMPUNRESOLVED 
             4045a0      6 FUNC RETURNTYPE RAX 0
-            4045a0      6 FUNC PROBLEM .__vsnprintf_chk CHUNKS JUMPUNRESOLVED 
+            4045a0      6 FUNC PROBLEM .__vsnprintf_chk JUMPUNRESOLVED 
             4045b0      6 FUNC RETURNTYPE RAX 0
             4045b0      6 FUNC PROBLEM .__strncpy_chk JUMPUNRESOLVED 
             4045c0      6 FUNC RETURNTYPE RAX 0
@@ -293,7 +293,7 @@
             404640      6 FUNC RETURNTYPE RAX 0
             404640      6 FUNC PROBLEM .XtIsManaged JUMPUNRESOLVED 
             404650      6 FUNC RETURNTYPE RAX 0
-            404650      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+            404650      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
             404660      6 FUNC RETURNTYPE RAX 0
             404660      6 FUNC PROBLEM .__wctomb_chk JUMPUNRESOLVED 
             404670      6 FUNC RETURNTYPE RAX 0
@@ -359,7 +359,7 @@
             404850      6 FUNC RETURNTYPE RAX 0
             404850      6 FUNC PROBLEM .XmuOptimizeScanline JUMPUNRESOLVED 
             404860      6 FUNC RETURNTYPE RAX 0
-            404860      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            404860      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             404870      6 FUNC RETURNTYPE RAX 0
             404870      6 FUNC PROBLEM .XrmStringToQuark JUMPUNRESOLVED 
             404880      6 FUNC RETURNTYPE RAX 0
@@ -397,7 +397,7 @@
             404980      6 FUNC RETURNTYPE RAX 0
             404980      6 FUNC PROBLEM .usleep JUMPUNRESOLVED 
             404990      6 FUNC RETURNTYPE RAX 0
-            404990      6 FUNC PROBLEM .__sprintf_chk CHUNKS JUMPUNRESOLVED 
+            404990      6 FUNC PROBLEM .__sprintf_chk JUMPUNRESOLVED 
             4049a0      6 FUNC RETURNTYPE RAX 0
             4049a0      6 FUNC PROBLEM .XCheckIfEvent JUMPUNRESOLVED 
             4049b0      6 FUNC RETURNTYPE RAX 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 235faeff13b81fcdf274688958a353b44b781eb2..a0d4cec7def4ee2fa3c40bf4546a9fc47d8d6aea 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 @@
-b2dc2595edb765cb3b9e6bfdf6d7dc7af5b28601
\ No newline at end of file
+83e9b864731cfa10173995ea6887524772e05b4c
\ 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 a995467c3c6ed3d5147df3ca2f637444144f9f0b..efd172bd32886b39f5484843f41a48bba472a67d 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 @@
-d60a15cc27dffe6d3a63c766895a2a009e593215
\ No newline at end of file
+e46f27c003c5a274a1558f1cb096e77706bf788c
\ 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 a9bb9109a5feef5b212e1da6e32d4a0cc1c1b19e..911dbb719b1ea84df9911606b3c3ebfc22c37ddb 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 @@
-829a93b07010d87f7f85a62c199a8260d668b739
\ No newline at end of file
+fbc006187569d1012c5f638fd63f47fa782379bd
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id
index acaee2e9d43d438bbc5b2071f80cc0b40b18175e..7e1df006fec89c9444375cc9cbf972179aef3cc6 100644
--- a/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-1f7eadd983a631ec252e51d41c72c93e208edca4
\ No newline at end of file
+41bb609e7bd0b3701f58ae64e8d365f18d66e4d9
\ 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 9f2a54e6af8db365563edf1a59ea8eec11929832..16cb921950ea70c10b6bab30c824085e60717cda 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 @@
-12fa289d20c5f335229118732d52878fd8fe01ba
\ No newline at end of file
+9c318cdafb76f5594d275e49e43fc37868481f06
\ 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 978d0b16e2e3eb9c62514ee91585b620c02aafb6..bdc199f9f94373e9926f38cec1b7e214902d490d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -4129,17 +4129,23 @@
             407ce2     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             407ce6     -1 INSTR LOCAL NoMetaUpdate jmp     _g_value_set_boxed 
             407cf0      1 INSTR BELONGTO 40aa50 
+            407cf0      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             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 
             407cf8      7 INSTR BELONGTO 40aa50 
             407cff     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_407D50 
             407cff      2 INSTR BELONGTO 40aa50 
             407d01      4 INSTR BELONGTO 40aa50 
+            407d01      4 INSTR DEADREGS  EFLAGS ZZ mov     rdi, [rdi+60h] 
             407d05      5 INSTR BELONGTO 40aa50 
+            407d05      5 INSTR DEADREGS  EFLAGS ZZ movss   [rsp+18h+var_18], xmm0 
             407d05      5 PTRIMMEDESP STACK 0 displ movss   [rsp+18h+var_18], xmm0
             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      5 INSTR BELONGTO 40aa50 
             407d14     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, [rsp+18h+var_18] 
@@ -4147,12 +4153,14 @@
             407d14      5 PTRIMMEDESP STACK 0 displ movss   xmm0, [rsp+18h+var_18]
             407d19     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM 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      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      8 INSTR BELONGTO 40aa50 
             407d30     -1 INSTR LOCAL NoMetaUpdate ucomiss xmm0, xmm1 
@@ -4168,33 +4176,46 @@
             407d3d     -1 INSTR LOCAL NoMetaUpdate cmp     esi, eax 
             407d3d      2 INSTR BELONGTO 40aa50 
             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      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 
             407d4a      5 INSTR BELONGTO 40aa50 
+            407d4a      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ jmp     sub_407010 
             407d50     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             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      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      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      3 INSTR BELONGTO 40aa50 
             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      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
             407d7f      1 INSTR BELONGTO 40aa50 
+            407d7f      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ pop     rbx 
             407d80     -1 INSTR LOCAL NoMetaUpdate jmp     sub_407010 
             407d80      5 INSTR BELONGTO 40aa50 
+            407d80      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ jmp     sub_407010 
             407d90      1 INSTR BELONGTO 40aa00 
             407d90      1 INSTR DEADREGS  EFLAGS RSI ZZ push    rbx 
             407d91      3 INSTR BELONGTO 40aa00 
@@ -7756,68 +7777,100 @@
             409dc4      5 INSTR BELONGTO 409d70 
             409dc4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _gtk_widget_set_sensitive 
             409dd0      5 INSTR BELONGTO 40b2d0 
+            409dd0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ mov     [rsp+var_18], rbx 
             409dd0      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], rbx
             409dd5      5 INSTR BELONGTO 40b2d0 
+            409dd5      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     [rsp+var_10], rbp 
             409dd5      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], rbp
             409dda      3 INSTR BELONGTO 40b2d0 
+            409dda      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
             409ddd      5 INSTR BELONGTO 40b2d0 
+            409ddd      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     [rsp+var_8], r12 
             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      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 
             409ded      3 INSTR BELONGTO 40b2d0 
+            409ded      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rbx 
             409df0      3 INSTR BELONGTO 40b2d0 
+            409df0      3 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     rsi, rax 
             409df3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             409df3      5 INSTR BELONGTO 40b2d0 
+            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      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 
             409e02      5 INSTR BELONGTO 40b2d0 
+            409e02      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_entry_get_type 
             409e07      5 INSTR BELONGTO 40b2d0 
+            409e07      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [r12+8] 
             409e0c      3 INSTR BELONGTO 40b2d0 
+            409e0c      3 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     rsi, rax 
             409e0f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409e0f      5 INSTR BELONGTO 40b2d0 
+            409e0f      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
             409e14      3 INSTR BELONGTO 40b2d0 
+            409e14      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             409e17     -1 INSTR LOCAL NoMetaUpdate call    sub_408590 
             409e17      5 INSTR BELONGTO 40b2d0 
+            409e17      5 INSTR DEADREGS  EFLAGS R12 ZZ call    sub_408590 
             409e1c     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             409e1c      2 INSTR BELONGTO 40b2d0 
             409e1e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409E50 
             409e1e      2 INSTR BELONGTO 40b2d0 
             409e20     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             409e20      5 INSTR BELONGTO 40b2d0 
+            409e20      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_window_get_type 
             409e25      3 INSTR BELONGTO 40b2d0 
+            409e25      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rbx 
             409e28      3 INSTR BELONGTO 40b2d0 
+            409e28      3 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     rsi, rax 
             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      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      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      3 INSTR BELONGTO 40b2d0 
+            409e39      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     rdi, rax 
             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      2 INSTR BELONGTO 40b2d0 
+            409e50      2 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 R12 ZZ mov     esi, ebp 
             409e52      3 INSTR BELONGTO 40b2d0 
+            409e52      3 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 R12 ZZ mov     rdi, rbx 
             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      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      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
             409e67     -1 INSTR LOCAL NoMetaUpdate jmp     sub_4088B0 
             409e67      5 INSTR BELONGTO 40b2d0 
+            409e67      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     sub_4088B0 
             409e70      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
             409e70      0 FUNC MMSAFENESS SAFE
             409e70    199 FUNC GLOBAL sub_409E70 FUNC_UNSAFE NOFP RET             409f36 
@@ -9339,22 +9392,31 @@
             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 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      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 
             40aa59      4 INSTR BELONGTO 40aa50 
+            40aa59      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+50h] 
             40aa5d      3 INSTR BELONGTO 40aa50 
+            40aa5d      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, rax 
             40aa60     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40aa60      5 INSTR BELONGTO 40aa50 
+            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      8 INSTR BELONGTO 40aa50 
             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 
             40aa80      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
             40aa80      0 FUNC MMSAFENESS SAFE
             40aa80    196 FUNC GLOBAL sub_40AA80 FUNC_UNSAFE NOFP RET             40ab43 
@@ -10122,29 +10184,41 @@
             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 MMSAFENESS UNSAFE
             40b2d0      1 INSTR BELONGTO 40b2d0 
+            40b2d0      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             40b2d0     54 FUNC GLOBAL sub_40B2D0 FUNC_UNSAFE NOFP RET             40b305 
             40b2d0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             40b2d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40b2d1     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsi+70h], 0 
             40b2d1      5 INSTR BELONGTO 40b2d0 
             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 
             40b2db      5 INSTR BELONGTO 40b2d0 
+            40b2db      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_408830 
             40b2e0      4 INSTR BELONGTO 40b2d0 
+            40b2e0      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+70h] 
             40b2e4      3 INSTR BELONGTO 40b2d0 
+            40b2e4      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, rax 
             40b2e7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b2e7      5 INSTR BELONGTO 40b2d0 
+            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      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 
             40b2f5      5 INSTR BELONGTO 40b2d0 
+            40b2f5      5 INSTR DEADREGS  EFLAGS ZZ jmp     loc_409DD0 
             40b300      1 INSTR BELONGTO 40b2d0 
+            40b300      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ pop     rbx 
             40b301     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40B1D0 
             40b301      5 INSTR BELONGTO 40b2d0 
+            40b301      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     sub_40B1D0 
             40b310      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
             40b310      0 FUNC MMSAFENESS SAFE
             40b310      1 INSTR BELONGTO 40b310 
diff --git a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
index 2f5200e7e6ab741380049d7ab75b5a41c4995c6f..3c421612e7cb22f9bb2423c46038b1763e56d758 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3721,62 +3721,92 @@
             409110      1 INSTR BELONGTO 4090f0 
             409111      1 INSTR BELONGTO 4090f0 
             409120      5 INSTR BELONGTO 40f660 
+            409120      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     [rsp+var_28], rbp 
             409120      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
             409125      5 INSTR BELONGTO 40f660 
+            409125      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     [rsp+var_20], r12 
             409125      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
             40912a      3 INSTR BELONGTO 40f660 
+            40912a      3 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     rbp, rdi 
             40912d      5 INSTR BELONGTO 40f660 
+            40912d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     [rsp+var_18], r13 
             40912d      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
             409132      2 INSTR BELONGTO 40f660 
+            409132      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edi, edi        ; domainname 
             409132     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409134      5 INSTR BELONGTO 40f660 
+            409134      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ mov     [rsp+var_30], rbx 
             409134      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             409139      5 INSTR BELONGTO 40f660 
+            409139      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 ZZ mov     [rsp+var_10], r14 
             409139      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
             40913e      5 INSTR BELONGTO 40f660 
+            40913e      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 ZZ mov     [rsp+var_8], r15 
             40913e      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
             409143     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409143      5 INSTR BELONGTO 40f660 
+            409143      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             409148      7 INSTR BELONGTO 40f660 
+            409148      7 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ sub     rsp, 108h 
             40914f      5 INSTR BELONGTO 40f660 
+            40914f      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ mov     esi, offset aTranslatorCred; "translator-credits" 
             409154     12 INSTR BELONGTO 40f660 
+            409154     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_88], offset aMikeHughesMfh@; "Mike Hughes <mfh@psilord.com>" 
             409154     12 PTRIMMEDESP STACK 128 displ mov     [rsp+108h+var_88], offset aMikeHughesMfh@; "Mike Hughes <mfh@psilord.com>"
             409160     12 INSTR BELONGTO 40f660 
+            409160     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_80], offset aSpirosPapadimi; "Spiros Papadimitriou <spapadim+@cs.cmu."... 
             409160     12 PTRIMMEDESP STACK 136 displ mov     [rsp+108h+var_80], offset aSpirosPapadimi; "Spiros Papadimitriou <spapadim+@cs.cmu."...
             40916c     12 INSTR BELONGTO 40f660 
+            40916c     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_78], offset aBradfordHovine; "Bradford Hovinen <hovinen@udel.edu>" 
             40916c     12 PTRIMMEDESP STACK 144 displ mov     [rsp+108h+var_78], offset aBradfordHovine; "Bradford Hovinen <hovinen@udel.edu>"
             409178     12 INSTR BELONGTO 40f660 
+            409178     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_70], offset aVincentNoelVno; "Vincent Noel <vnoel@cox.net>" 
             409178     12 PTRIMMEDESP STACK 152 displ mov     [rsp+108h+var_70], offset aVincentNoelVno; "Vincent Noel <vnoel@cox.net>"
             409184     12 INSTR BELONGTO 40f660 
+            409184     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_68], offset aEmmanueleBassi; "Emmanuele Bassi <ebassi@gmail.com>" 
             409184     12 PTRIMMEDESP STACK 160 displ mov     [rsp+108h+var_68], offset aEmmanueleBassi; "Emmanuele Bassi <ebassi@gmail.com>"
             409190     12 INSTR BELONGTO 40f660 
+            409190     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_60], 0 
             409190     12 PTRIMMEDESP STACK 168 displ mov     [rsp+108h+var_60], 0
             40919c     12 INSTR BELONGTO 40f660 
+            40919c     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_58], offset aSunGnomeDocume; "Sun GNOME Documentation Team <gdocteam@"... 
             40919c     12 PTRIMMEDESP STACK 176 displ mov     [rsp+108h+var_58], offset aSunGnomeDocume; "Sun GNOME Documentation Team <gdocteam@"...
             4091a8     12 INSTR BELONGTO 40f660 
+            4091a8     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_50], offset aJohnFleckJflec; "John Fleck <jfleck@inkstain.net>" 
             4091a8     12 PTRIMMEDESP STACK 184 displ mov     [rsp+108h+var_50], offset aJohnFleckJflec; "John Fleck <jfleck@inkstain.net>"
             4091b4     12 INSTR BELONGTO 40f660 
+            4091b4     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_48], offset aEmmanueleBassi; "Emmanuele Bassi <ebassi@gmail.com>" 
             4091b4     12 PTRIMMEDESP STACK 192 displ mov     [rsp+108h+var_48], offset aEmmanueleBassi; "Emmanuele Bassi <ebassi@gmail.com>"
             4091c0     12 INSTR BELONGTO 40f660 
+            4091c0     12 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_40], 0 
             4091c0     12 PTRIMMEDESP STACK 200 displ mov     [rsp+108h+var_40], 0
             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      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 
             4091d8      5 INSTR BELONGTO 40f660 
+            4091d8      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ mov     esi, offset aLookUpWordsInD; "Look up words in dictionaries" 
             4091dd      3 INSTR BELONGTO 40f660 
+            4091dd      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     r13, rax 
             4091e0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4091e0      5 INSTR BELONGTO 40f660 
+            4091e0      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _dcgettext 
             4091e5      3 INSTR BELONGTO 40f660 
+            4091e5      3 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ mov     r12, rax 
             4091e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             4091e8      5 INSTR BELONGTO 40f660 
+            4091e8      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _gtk_widget_get_type 
             4091ed     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
             4091ed      3 INSTR BELONGTO 40f660 
             4091f0     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40920F 
             4091f0      2 INSTR BELONGTO 40f660 
             4091f2      4 INSTR BELONGTO 40f660 
+            4091f2      4 INSTR DEADREGS  EFLAGS RDX RBX RDI R14 R15 ZZ mov     rdx, [rbp+0] 
             4091f6     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
             4091f6      3 INSTR BELONGTO 40f660 
             4091f9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409200 
@@ -3786,51 +3816,76 @@
             4091fe     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409260 
             4091fe      2 INSTR BELONGTO 40f660 
             409200      3 INSTR BELONGTO 40f660 
+            409200      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 R15 ZZ mov     rsi, rax 
             409203      3 INSTR BELONGTO 40f660 
+            409203      3 INSTR DEADREGS  EFLAGS RBX RDI R14 R15 ZZ mov     rdi, rbp 
             409206     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             409206      5 INSTR BELONGTO 40f660 
+            409206      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_type_check_instance_is_a 
             40920b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40920b      2 INSTR BELONGTO 40f660 
             40920d     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409260 
             40920d      2 INSTR BELONGTO 40f660 
             40920f      5 INSTR BELONGTO 40f660 
+            40920f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, offset aGtk_is_widgetP; "GTK_IS_WIDGET (parent)" 
             409214      5 INSTR BELONGTO 40f660 
+            409214      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGdict_show_abo; "gdict_show_about_dialog" 
             409219      2 INSTR BELONGTO 40f660 
+            409219      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
             409219     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
             40921b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40921b      5 INSTR BELONGTO 40f660 
+            40921b      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
             409220      8 INSTR BELONGTO 40f660 
+            409220      8 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+108h+var_30] 
             409220      8 PTRIMMEDESP STACK 216 displ mov     rbx, [rsp+108h+var_30]
             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      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      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      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      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
             409257      1 INSTR BELONGTO 40f660 
+            409257      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             409260      3 INSTR BELONGTO 40f660 
+            409260      3 INSTR DEADREGS  EFLAGS RBX RDI R14 R15 ZZ mov     rdi, rbp 
             409263     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_screen 
             409263      5 INSTR BELONGTO 40f660 
+            409263      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _gtk_widget_get_screen 
             409268      2 INSTR BELONGTO 40f660 
+            409268      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 R15 ZZ xor     edi, edi        ; domainname 
             409268     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40926a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40926a      5 INSTR BELONGTO 40f660 
+            40926a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 R15 ZZ mov     edx, 5          ; category 
             40926f      5 INSTR BELONGTO 40f660 
+            40926f      5 INSTR DEADREGS  EFLAGS RBX RSI R14 R15 ZZ mov     esi, offset msgid; "Dictionary" 
             409274      3 INSTR BELONGTO 40f660 
+            409274      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rax 
             409277     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409277      5 INSTR BELONGTO 40f660 
+            409277      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ call    _dcgettext 
             40927c      3 INSTR BELONGTO 40f660 
+            40927c      3 INSTR DEADREGS  EFLAGS RBX R15 ZZ mov     rbx, rax 
             40927f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40927f      5 INSTR BELONGTO 40f660 
+            40927f      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_window_get_type 
             409284      3 INSTR BELONGTO 40f660 
+            409284      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     r15, rax 
             409287      4 INSTR BELONGTO 40f660 
+            409287      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbp+0] 
             40928b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40928b      3 INSTR BELONGTO 40f660 
             40928e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409299 
@@ -3840,68 +3895,102 @@
             409293     -1 INSTR LOCAL NoMetaUpdate jz      loc_409368 
             409293      6 INSTR BELONGTO 40f660 
             409299      3 INSTR BELONGTO 40f660 
+            409299      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
             40929c      3 INSTR BELONGTO 40f660 
+            40929c      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbp 
             40929f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             40929f      5 INSTR BELONGTO 40f660 
+            40929f      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_is_a 
             4092a4     -2 INSTR LOCAL n R10 ZZ  AlwaysNUM xor     r10d, r10d 
             4092a4      3 INSTR BELONGTO 40f660 
+            4092a4      3 INSTR DEADREGS  EFLAGS RSI RDI R10 ZZ xor     r10d, r10d 
             4092a7     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4092a7      2 INSTR BELONGTO 40f660 
             4092a9     -1 INSTR LOCAL NoMetaUpdate jnz     loc_409368 
             4092a9      6 INSTR BELONGTO 40f660 
             4092af      8 INSTR BELONGTO 40f660 
+            4092af      8 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R15 ZZ lea     rax, [rsp+108h+var_58] 
             4092af      8 PTRIMMEDESP STACK 176 displ lea     rax, [rsp+108h+var_58]
             4092b7      6 INSTR BELONGTO 40f660 
+            4092b7      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R15 ZZ mov     r9d, offset aCopyright; "copyright" 
             4092bd      6 INSTR BELONGTO 40f660 
+            4092bd      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ mov     r8d, offset a3_4_0; "3.4.0" 
             4092c3      5 INSTR BELONGTO 40f660 
+            4092c3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ mov     ecx, offset aVersion; "version" 
             4092c8      3 INSTR BELONGTO 40f660 
+            4092c8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rdx, rbx 
             4092cb      5 INSTR BELONGTO 40f660 
+            4092cb      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R15 ZZ mov     esi, offset aName; "name" 
             4092d0      5 INSTR BELONGTO 40f660 
+            4092d0      5 INSTR DEADREGS  EFLAGS RBX RDI R15 ZZ mov     [rsp+108h+var_D8], rax 
             4092d0      5 PTRIMMEDESP STACK 48 displ mov     [rsp+108h+var_D8], rax
             4092d5      8 INSTR BELONGTO 40f660 
+            4092d5      8 INSTR DEADREGS  EFLAGS RAX RBX RDI R15 ZZ lea     rax, [rsp+108h+var_88] 
             4092d5      8 PTRIMMEDESP STACK 128 displ lea     rax, [rsp+108h+var_88]
             4092dd      3 INSTR BELONGTO 40f660 
+            4092dd      3 INSTR DEADREGS  EFLAGS RBX RDI R15 ZZ mov     rdi, r10 
             4092e0      9 INSTR BELONGTO 40f660 
+            4092e0      9 INSTR DEADREGS  EFLAGS RBX R15 ZZ mov     [rsp+108h+var_90], 0 
             4092e0      9 PTRIMMEDESP STACK 120 displ mov     [rsp+108h+var_90], 0
             4092e9      5 INSTR BELONGTO 40f660 
+            4092e9      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ mov     [rsp+108h+var_98], r14 
             4092e9      5 PTRIMMEDESP STACK 112 displ mov     [rsp+108h+var_98], r14
             4092ee      5 INSTR BELONGTO 40f660 
+            4092ee      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_E8], rax 
             4092ee      5 PTRIMMEDESP STACK 32 displ mov     [rsp+108h+var_E8], rax
             4092f3      2 INSTR BELONGTO 40f660 
+            4092f3      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
             4092f3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
             4092f5      9 INSTR BELONGTO 40f660 
+            4092f5      9 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_A0], offset aScreen; "screen" 
             4092f5      9 PTRIMMEDESP STACK 104 displ mov     [rsp+108h+var_A0], offset aScreen; "screen"
             4092fe      8 INSTR BELONGTO 40f660 
+            4092fe      8 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_A8], 2 
             4092fe      8 PTRIMMEDESP STACK 96 displ mov     [rsp+108h+var_A8], 2
             409306      9 INSTR BELONGTO 40f660 
+            409306      9 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_B0], offset aLicenseType; "license-type" 
             409306      9 PTRIMMEDESP STACK 88 displ mov     [rsp+108h+var_B0], offset aLicenseType; "license-type"
             40930f      9 INSTR BELONGTO 40f660 
+            40930f      9 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_B8], offset aAccessoriesDic; "accessories-dictionary" 
             40930f      9 PTRIMMEDESP STACK 80 displ mov     [rsp+108h+var_B8], offset aAccessoriesDic; "accessories-dictionary"
             409318      9 INSTR BELONGTO 40f660 
+            409318      9 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_C0], offset aLogoIconName; "logo-icon-name" 
             409318      9 PTRIMMEDESP STACK 72 displ mov     [rsp+108h+var_C0], offset aLogoIconName; "logo-icon-name"
             409321      5 INSTR BELONGTO 40f660 
+            409321      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_C8], r13 
             409321      5 PTRIMMEDESP STACK 64 displ mov     [rsp+108h+var_C8], r13
             409326      9 INSTR BELONGTO 40f660 
+            409326      9 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     [rsp+108h+var_D0], offset aTranslatorCred; "translator-credits" 
             409326      9 PTRIMMEDESP STACK 56 displ mov     [rsp+108h+var_D0], offset aTranslatorCred; "translator-credits"
             40932f      9 INSTR BELONGTO 40f660 
+            40932f      9 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     [rsp+108h+var_E0], offset aDocumenters; "documenters" 
             40932f      9 PTRIMMEDESP STACK 40 displ mov     [rsp+108h+var_E0], offset aDocumenters; "documenters"
             409338      9 INSTR BELONGTO 40f660 
+            409338      9 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     [rsp+108h+var_F0], offset aAuthors; "authors" 
             409338      9 PTRIMMEDESP STACK 24 displ mov     [rsp+108h+var_F0], offset aAuthors; "authors"
             409341      5 INSTR BELONGTO 40f660 
+            409341      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     [rsp+108h+var_F8], r12 
             409341      5 PTRIMMEDESP STACK 16 displ mov     [rsp+108h+var_F8], r12
             409346      9 INSTR BELONGTO 40f660 
+            409346      9 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_100], offset aComments; "comments" 
             409346      9 PTRIMMEDESP STACK 8 displ mov     [rsp+108h+var_100], offset aComments; "comments"
             40934f      8 INSTR BELONGTO 40f660 
+            40934f      8 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+108h+var_108], offset aCopyrightI2005; "Copyright © 2005-2006 Emmanuele Bassi" 
             40934f      8 PTRIMMEDESP STACK 0 displ mov     [rsp+108h+var_108], offset aCopyrightI2005; "Copyright © 2005-2006 Emmanuele Bassi"
             409357     -1 INSTR LOCAL NoMetaUpdate call    _gtk_show_about_dialog 
             409357      5 INSTR BELONGTO 40f660 
+            409357      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _gtk_show_about_dialog 
             40935c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409220 
             40935c      5 INSTR BELONGTO 40f660 
             409368      3 INSTR BELONGTO 40f660 
+            409368      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
             40936b      3 INSTR BELONGTO 40f660 
+            40936b      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     rdi, rbp 
             40936e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40936e      5 INSTR BELONGTO 40f660 
+            40936e      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_type_check_instance_cast 
             409373      3 INSTR BELONGTO 40f660 
+            409373      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R15 ZZ mov     r10, rax 
             409376     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4092AF 
             409376      5 INSTR BELONGTO 40f660 
             409380      0 FUNC FRAMERESTORE 0 0 0 1 0 1 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
@@ -13933,16 +14022,20 @@
             40f660      0 FUNC MMSAFENESS UNSAFE
             40f660    105 FUNC GLOBAL sub_40F660 FUNC_UNSAFE NOFP RET             40f6c8 
             40f660      1 INSTR BELONGTO 40f660 
+            40f660      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ push    rbx 
             40f660      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             40f660      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40f661      3 INSTR BELONGTO 40f660 
+            40f661      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
             40f664     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
             40f664      5 INSTR BELONGTO 40f660 
+            40f664      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_40F220 
             40f669     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             40f669      3 INSTR BELONGTO 40f660 
             40f66c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F68A 
             40f66c      2 INSTR BELONGTO 40f660 
             40f66e      3 INSTR BELONGTO 40f660 
+            40f66e      3 INSTR DEADREGS  EFLAGS RDX ZZ mov     rdx, [rbx] 
             40f671     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
             40f671      3 INSTR BELONGTO 40f660 
             40f674     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F67B 
@@ -13952,33 +14045,49 @@
             40f679     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F6B0 
             40f679      2 INSTR BELONGTO 40f660 
             40f67b      3 INSTR BELONGTO 40f660 
+            40f67b      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
             40f67e      3 INSTR BELONGTO 40f660 
+            40f67e      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbx 
             40f681     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             40f681      5 INSTR BELONGTO 40f660 
+            40f681      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_is_a 
             40f686     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40f686      2 INSTR BELONGTO 40f660 
             40f688     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40F6B0 
             40f688      2 INSTR BELONGTO 40f660 
             40f68a      6 INSTR BELONGTO 40f660 
+            40f68a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f690      5 INSTR BELONGTO 40f660 
+            40f690      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_3; "gdict_window_cmd_help_about" 
             40f695     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4E7h 
             40f695      5 INSTR BELONGTO 40f660 
+            40f695      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4E7h 
             40f69a      5 INSTR BELONGTO 40f660 
+            40f69a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f69f      2 INSTR BELONGTO 40f660 
+            40f69f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
             40f69f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
             40f6a1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f6a1      5 INSTR BELONGTO 40f660 
+            40f6a1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
             40f6a6     10 INSTR BELONGTO 40f660 
             40f6b0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             40f6b0      5 INSTR BELONGTO 40f660 
+            40f6b0      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_get_type 
             40f6b5      3 INSTR BELONGTO 40f660 
+            40f6b5      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
             40f6b8      3 INSTR BELONGTO 40f660 
+            40f6b8      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, rax 
             40f6bb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40f6bb      5 INSTR BELONGTO 40f660 
+            40f6bb      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
             40f6c0      1 INSTR BELONGTO 40f660 
+            40f6c0      1 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ pop     rbx 
             40f6c1      3 INSTR BELONGTO 40f660 
+            40f6c1      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rax 
             40f6c4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409120 
             40f6c4      5 INSTR BELONGTO 40f660 
+            40f6c4      5 INSTR DEADREGS  EFLAGS RSI ZZ jmp     loc_409120 
             40f6d0      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
             40f6d0      0 FUNC MMSAFENESS SAFE
             40f6d0    238 FUNC GLOBAL sub_40F6D0 FUNC_UNSAFE NOFP RET             40f7bd 
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 e6d92422c26269806033e4b03fa17eabf8ecd381..a718dbc9cb9a33218a9313a13152af2c6d3ee78a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -1744,19 +1744,30 @@
             401d18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
             401d1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B20 
             401d20      2 INSTR BELONGTO 401f00 
+            401d20      2 INSTR DEADREGS  EFLAGS ZZ push    r15 
             401d22      2 INSTR BELONGTO 401f00 
+            401d22      2 INSTR DEADREGS  EFLAGS R15 ZZ push    r14 
             401d24      2 INSTR BELONGTO 401f00 
+            401d24      2 INSTR DEADREGS  EFLAGS R14 R15 ZZ push    r13 
             401d26      2 INSTR BELONGTO 401f00 
+            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      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 
+            401d2d      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rsi 
             401d30      4 INSTR BELONGTO 401f00 
+            401d30      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 18h 
             401d34     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
             401d34      3 INSTR BELONGTO 401f00 
             401d37      5 INSTR BELONGTO 401f00 
+            401d37      5 INSTR DEADREGS  R12 R13 R14 R15 ZZ mov     [rsp+48h+var_44], r8d 
             401d37      5 PTRIMMEDESP STACK 4 displ mov     [rsp+48h+var_44], r8d
             401d3c      4 INSTR BELONGTO 401f00 
+            401d3c      4 INSTR DEADREGS  R12 R13 R14 R15 ZZ mov     [rsp+48h+var_3D], cl 
             401d3c      4 PTRIMMEDESP STACK 11 displ mov     [rsp+48h+var_3D], cl
             401d40     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401D70 
             401d40      2 INSTR BELONGTO 401f00 
@@ -1765,74 +1776,117 @@
             401d45     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401D70 
             401d45      2 INSTR BELONGTO 401f00 
             401d47      7 INSTR BELONGTO 401f00 
+            401d47      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ lea     rdx, aDataN_data; "data || !n_data" 
             401d4e      7 INSTR BELONGTO 401f00 
+            401d4e      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ lea     rsi, aEgg_hex_encode; "egg_hex_encode_full" 
             401d55      2 INSTR BELONGTO 401f00 
+            401d55      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
             401d55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
             401d57     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401d57      5 INSTR BELONGTO 401f00 
+            401d57      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
             401d5c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             401d5c      4 INSTR BELONGTO 401f00 
             401d60      2 INSTR BELONGTO 401f00 
+            401d60      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
             401d60     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
             401d62      1 INSTR BELONGTO 401f00 
+            401d62      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             401d63      1 INSTR BELONGTO 401f00 
+            401d63      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbp 
             401d64      2 INSTR BELONGTO 401f00 
+            401d64      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r12 
             401d66      2 INSTR BELONGTO 401f00 
+            401d66      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r13 
             401d68      2 INSTR BELONGTO 401f00 
+            401d68      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r14 
             401d6a      2 INSTR BELONGTO 401f00 
+            401d6a      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r15 
             401d6c      1 INSTR BELONGTO 401f00 
+            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      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      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      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      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]
             401d96     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             401d96      3 INSTR BELONGTO 401f00 
             401d99      3 INSTR BELONGTO 401f00 
+            401d99      3 INSTR DEADREGS  RSI RDI R12 R15 ZZ mov     r12, rax 
             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      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      3 INSTR BELONGTO 401f00 
+            401db6      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ shr     al, 4 
             401db9      3 INSTR BELONGTO 401f00 
+            401db9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   eax, al 
             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 
+            401dc1      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rax, [r12+8] 
             401dc6      4 INSTR BELONGTO 401f00 
+            401dc6      4 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rcx, [rax+1] 
             401dca     -1 INSTR LOCAL NoMetaUpdate cmp     rcx, [r12+10h] 
             401dca      5 INSTR BELONGTO 401f00 
             401dcf     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EC0 
             401dcf      6 INSTR BELONGTO 401f00 
             401dd5      4 INSTR BELONGTO 401f00 
+            401dd5      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [r12] 
             401dd9      3 INSTR BELONGTO 401f00 
+            401dd9      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rsi+rax], dl 
             401ddc      4 INSTR BELONGTO 401f00 
+            401ddc      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, [r12] 
             401de0      5 INSTR BELONGTO 401f00 
+            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      6 INSTR BELONGTO 401f00 
+            401dea      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbp+r13+0] 
             401df0      3 INSTR BELONGTO 401f00 
+            401df0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ and     eax, 0Fh 
             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 
+            401df8      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rax, [r12+8] 
             401dfd      4 INSTR BELONGTO 401f00 
+            401dfd      4 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rcx, [rax+1] 
             401e01     -1 INSTR LOCAL NoMetaUpdate cmp     rcx, [r12+10h] 
             401e01      5 INSTR BELONGTO 401f00 
             401e06     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EA0 
             401e06      6 INSTR BELONGTO 401f00 
             401e0c      4 INSTR BELONGTO 401f00 
+            401e0c      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [r12] 
             401e10      3 INSTR BELONGTO 401f00 
+            401e10      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rsi+rax], dl 
             401e13      4 INSTR BELONGTO 401f00 
+            401e13      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, [r12] 
             401e17      5 INSTR BELONGTO 401f00 
+            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      4 INSTR BELONGTO 401f00 
             401e25     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401E80 
@@ -1842,72 +1896,105 @@
             401e2b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401DB0 
             401e2b      2 INSTR BELONGTO 401f00 
             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      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      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      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 
             401e44      6 INSTR BELONGTO 401f00 
             401e4a      5 INSTR BELONGTO 401f00 
+            401e4a      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, [r12+8] 
             401e4f      4 INSTR BELONGTO 401f00 
+            401e4f      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ lea     rdx, [rax+1] 
             401e53     -1 INSTR LOCAL NoMetaUpdate cmp     rdx, [r12+10h] 
             401e53      5 INSTR BELONGTO 401f00 
             401e58     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EE0 
             401e58      6 INSTR BELONGTO 401f00 
             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]
             401e63      4 INSTR BELONGTO 401f00 
+            401e63      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [r12] 
             401e67      3 INSTR BELONGTO 401f00 
+            401e67      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rsi+rax], cl 
             401e6a      5 INSTR BELONGTO 401f00 
+            401e6a      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     [r12+8], rdx 
             401e6f      4 INSTR BELONGTO 401f00 
+            401e6f      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rdx, [r12] 
             401e73      5 INSTR BELONGTO 401f00 
+            401e73      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
             401e78     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DB0 
             401e78      5 INSTR BELONGTO 401f00 
             401e80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             401e80      4 INSTR BELONGTO 401f00 
             401e84      0 DEALLOC STACK esp - 0 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      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 
+            401e8a      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbp 
             401e8b      2 INSTR BELONGTO 401f00 
+            401e8b      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r12 
             401e8d      2 INSTR BELONGTO 401f00 
+            401e8d      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r13 
             401e8f      2 INSTR BELONGTO 401f00 
+            401e8f      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r14 
             401e91      2 INSTR BELONGTO 401f00 
+            401e91      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r15 
             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      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 
             401ea3      7 INSTR BELONGTO 401f00 
+            401ea3      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401eaa      3 INSTR BELONGTO 401f00 
+            401eaa      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             401ead     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             401ead      5 INSTR BELONGTO 401f00 
+            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      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 
             401ec3      7 INSTR BELONGTO 401f00 
+            401ec3      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401eca      3 INSTR BELONGTO 401f00 
+            401eca      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             401ecd     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             401ecd      5 INSTR BELONGTO 401f00 
+            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      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]
             401ee4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401ee4      7 INSTR BELONGTO 401f00 
+            401ee4      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401eeb      3 INSTR BELONGTO 401f00 
+            401eeb      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             401eee     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             401eee      5 INSTR BELONGTO 401f00 
+            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
@@ -1915,13 +2002,17 @@
             401f00     15 FUNC GLOBAL sub_401F00 FUNC_UNSAFE NOFP RET             401f0e 
             401f00     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             401f00      3 INSTR BELONGTO 401f00 
+            401f00      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
             401f00      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             401f03      2 INSTR BELONGTO 401f00 
+            401f03      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
             401f03     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
             401f05     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401f05      5 INSTR BELONGTO 401f00 
+            401f05      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             401f0a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401D20 
             401f0a      5 INSTR BELONGTO 401f00 
+            401f0a      5 INSTR DEADREGS  EFLAGS ZZ jmp     loc_401D20 
             401f10      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
             401f10      0 FUNC MMSAFENESS SPECSAFE
             401f10    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET             401f98 
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 97246027ed7d8a2538858acb88e94c0a66965ede..81b51f8769a58aefe69f83331f1a71e23f6c362f 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 @@
-b4e3874d7a8a852bc97e241d85700cb159a1c222
\ No newline at end of file
+2da9570d7d4f85d0e666924bd078979f7c685103
\ 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 e6d92422c26269806033e4b03fa17eabf8ecd381..a718dbc9cb9a33218a9313a13152af2c6d3ee78a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -1744,19 +1744,30 @@
             401d18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
             401d1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B20 
             401d20      2 INSTR BELONGTO 401f00 
+            401d20      2 INSTR DEADREGS  EFLAGS ZZ push    r15 
             401d22      2 INSTR BELONGTO 401f00 
+            401d22      2 INSTR DEADREGS  EFLAGS R15 ZZ push    r14 
             401d24      2 INSTR BELONGTO 401f00 
+            401d24      2 INSTR DEADREGS  EFLAGS R14 R15 ZZ push    r13 
             401d26      2 INSTR BELONGTO 401f00 
+            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      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 
+            401d2d      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rsi 
             401d30      4 INSTR BELONGTO 401f00 
+            401d30      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 18h 
             401d34     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
             401d34      3 INSTR BELONGTO 401f00 
             401d37      5 INSTR BELONGTO 401f00 
+            401d37      5 INSTR DEADREGS  R12 R13 R14 R15 ZZ mov     [rsp+48h+var_44], r8d 
             401d37      5 PTRIMMEDESP STACK 4 displ mov     [rsp+48h+var_44], r8d
             401d3c      4 INSTR BELONGTO 401f00 
+            401d3c      4 INSTR DEADREGS  R12 R13 R14 R15 ZZ mov     [rsp+48h+var_3D], cl 
             401d3c      4 PTRIMMEDESP STACK 11 displ mov     [rsp+48h+var_3D], cl
             401d40     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401D70 
             401d40      2 INSTR BELONGTO 401f00 
@@ -1765,74 +1776,117 @@
             401d45     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401D70 
             401d45      2 INSTR BELONGTO 401f00 
             401d47      7 INSTR BELONGTO 401f00 
+            401d47      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ lea     rdx, aDataN_data; "data || !n_data" 
             401d4e      7 INSTR BELONGTO 401f00 
+            401d4e      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ lea     rsi, aEgg_hex_encode; "egg_hex_encode_full" 
             401d55      2 INSTR BELONGTO 401f00 
+            401d55      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
             401d55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
             401d57     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401d57      5 INSTR BELONGTO 401f00 
+            401d57      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
             401d5c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             401d5c      4 INSTR BELONGTO 401f00 
             401d60      2 INSTR BELONGTO 401f00 
+            401d60      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
             401d60     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
             401d62      1 INSTR BELONGTO 401f00 
+            401d62      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             401d63      1 INSTR BELONGTO 401f00 
+            401d63      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbp 
             401d64      2 INSTR BELONGTO 401f00 
+            401d64      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r12 
             401d66      2 INSTR BELONGTO 401f00 
+            401d66      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r13 
             401d68      2 INSTR BELONGTO 401f00 
+            401d68      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r14 
             401d6a      2 INSTR BELONGTO 401f00 
+            401d6a      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r15 
             401d6c      1 INSTR BELONGTO 401f00 
+            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      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      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      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      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]
             401d96     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             401d96      3 INSTR BELONGTO 401f00 
             401d99      3 INSTR BELONGTO 401f00 
+            401d99      3 INSTR DEADREGS  RSI RDI R12 R15 ZZ mov     r12, rax 
             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      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      3 INSTR BELONGTO 401f00 
+            401db6      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ shr     al, 4 
             401db9      3 INSTR BELONGTO 401f00 
+            401db9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   eax, al 
             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 
+            401dc1      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rax, [r12+8] 
             401dc6      4 INSTR BELONGTO 401f00 
+            401dc6      4 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rcx, [rax+1] 
             401dca     -1 INSTR LOCAL NoMetaUpdate cmp     rcx, [r12+10h] 
             401dca      5 INSTR BELONGTO 401f00 
             401dcf     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EC0 
             401dcf      6 INSTR BELONGTO 401f00 
             401dd5      4 INSTR BELONGTO 401f00 
+            401dd5      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [r12] 
             401dd9      3 INSTR BELONGTO 401f00 
+            401dd9      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rsi+rax], dl 
             401ddc      4 INSTR BELONGTO 401f00 
+            401ddc      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, [r12] 
             401de0      5 INSTR BELONGTO 401f00 
+            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      6 INSTR BELONGTO 401f00 
+            401dea      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbp+r13+0] 
             401df0      3 INSTR BELONGTO 401f00 
+            401df0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ and     eax, 0Fh 
             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 
+            401df8      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rax, [r12+8] 
             401dfd      4 INSTR BELONGTO 401f00 
+            401dfd      4 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rcx, [rax+1] 
             401e01     -1 INSTR LOCAL NoMetaUpdate cmp     rcx, [r12+10h] 
             401e01      5 INSTR BELONGTO 401f00 
             401e06     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EA0 
             401e06      6 INSTR BELONGTO 401f00 
             401e0c      4 INSTR BELONGTO 401f00 
+            401e0c      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [r12] 
             401e10      3 INSTR BELONGTO 401f00 
+            401e10      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rsi+rax], dl 
             401e13      4 INSTR BELONGTO 401f00 
+            401e13      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, [r12] 
             401e17      5 INSTR BELONGTO 401f00 
+            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      4 INSTR BELONGTO 401f00 
             401e25     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401E80 
@@ -1842,72 +1896,105 @@
             401e2b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401DB0 
             401e2b      2 INSTR BELONGTO 401f00 
             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      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      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      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 
             401e44      6 INSTR BELONGTO 401f00 
             401e4a      5 INSTR BELONGTO 401f00 
+            401e4a      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, [r12+8] 
             401e4f      4 INSTR BELONGTO 401f00 
+            401e4f      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ lea     rdx, [rax+1] 
             401e53     -1 INSTR LOCAL NoMetaUpdate cmp     rdx, [r12+10h] 
             401e53      5 INSTR BELONGTO 401f00 
             401e58     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EE0 
             401e58      6 INSTR BELONGTO 401f00 
             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]
             401e63      4 INSTR BELONGTO 401f00 
+            401e63      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, [r12] 
             401e67      3 INSTR BELONGTO 401f00 
+            401e67      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rsi+rax], cl 
             401e6a      5 INSTR BELONGTO 401f00 
+            401e6a      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     [r12+8], rdx 
             401e6f      4 INSTR BELONGTO 401f00 
+            401e6f      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rdx, [r12] 
             401e73      5 INSTR BELONGTO 401f00 
+            401e73      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
             401e78     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DB0 
             401e78      5 INSTR BELONGTO 401f00 
             401e80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             401e80      4 INSTR BELONGTO 401f00 
             401e84      0 DEALLOC STACK esp - 0 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      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 
+            401e8a      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbp 
             401e8b      2 INSTR BELONGTO 401f00 
+            401e8b      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r12 
             401e8d      2 INSTR BELONGTO 401f00 
+            401e8d      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r13 
             401e8f      2 INSTR BELONGTO 401f00 
+            401e8f      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r14 
             401e91      2 INSTR BELONGTO 401f00 
+            401e91      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     r15 
             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      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 
             401ea3      7 INSTR BELONGTO 401f00 
+            401ea3      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401eaa      3 INSTR BELONGTO 401f00 
+            401eaa      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             401ead     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             401ead      5 INSTR BELONGTO 401f00 
+            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      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 
             401ec3      7 INSTR BELONGTO 401f00 
+            401ec3      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401eca      3 INSTR BELONGTO 401f00 
+            401eca      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             401ecd     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             401ecd      5 INSTR BELONGTO 401f00 
+            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      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]
             401ee4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401ee4      7 INSTR BELONGTO 401f00 
+            401ee4      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             401eeb      3 INSTR BELONGTO 401f00 
+            401eeb      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             401eee     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             401eee      5 INSTR BELONGTO 401f00 
+            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
@@ -1915,13 +2002,17 @@
             401f00     15 FUNC GLOBAL sub_401F00 FUNC_UNSAFE NOFP RET             401f0e 
             401f00     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             401f00      3 INSTR BELONGTO 401f00 
+            401f00      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
             401f00      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             401f03      2 INSTR BELONGTO 401f00 
+            401f03      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
             401f03     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
             401f05     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401f05      5 INSTR BELONGTO 401f00 
+            401f05      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             401f0a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401D20 
             401f0a      5 INSTR BELONGTO 401f00 
+            401f0a      5 INSTR DEADREGS  EFLAGS ZZ jmp     loc_401D20 
             401f10      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
             401f10      0 FUNC MMSAFENESS SPECSAFE
             401f10    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET             401f98 
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 6d9d34eea21ab60c2229e0155e6051c76e34568d..3a7c14208e75761c8a281750831b6ea5453acfa3 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 @@
-44593d396ed4d7c82fd60ab2f2db453da0371a1a
\ No newline at end of file
+507e740bf760949be6062abf58829bc1d49edc25
\ 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 db498d4ff69ac0d9d75c1ad712f27632ae45b566..130b00e28276d27c73ff93ee9dbe400ad42b3844 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 @@
-68acb886daa6f84215aa8bbeff44e326ca1cf162
\ No newline at end of file
+b6a83281e1c8691fb04fc50c2dac8e147b80be29
\ 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 6f17ba002a336ee1d6dcfc615c2354106dffcfdf..60b4c66f699a960889646d6f4392a46f3670fc8d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
@@ -11553,33 +11553,51 @@
               87c7      5 INSTR BELONGTO 8780 
               87c7      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_type_class_add_private 
               87d0      1 INSTR BELONGTO 8890 
+              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      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 
               87dc      5 INSTR BELONGTO 8890 
+              87dc      5 INSTR DEADREGS  EFLAGS ZZ call    sub_F020 
               87e1     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               87e1      3 INSTR BELONGTO 8890 
               87e4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8800 
               87e4      2 INSTR BELONGTO 8890 
               87e6      4 INSTR BELONGTO 8890 
+              87e6      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, [rbx+18h] 
               87ea      3 INSTR BELONGTO 8890 
+              87ea      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
               87ed      3 INSTR BELONGTO 8890 
+              87ed      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rdx] 
               87f0     -1 INSTR LOCAL NoMetaUpdate call    sub_8300 
               87f0      5 INSTR BELONGTO 8890 
+              87f0      5 INSTR DEADREGS  EFLAGS ZZ call    sub_8300 
               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 
               87f9      5 INSTR BELONGTO 8890 
+              87f9      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ jmp     sub_8660 
               8800      1 INSTR BELONGTO 8890 
+              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      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      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 
               8816     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               8816      5 INSTR BELONGTO 8890 
+              8816      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_log 
               8820      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
               8820      0 FUNC MMSAFENESS SAFE
               8820     -1 INSTR LOCAL MetadataUnused mov     rdi, rdx 
@@ -11652,6 +11670,7 @@
               8890      0 FUNC MMSAFENESS UNSAFE
               8890     24 DATAREF STACK 1094 esp + 0 PARENT LocalFrame LOCALFRAME
               8890      4 INSTR BELONGTO 8890 
+              8890      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
               8890     86 FUNC GLOBAL sub_8890 FUNC_UNSAFE NOFP RET               88e5 
               8890      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
               8894     -1 INSTR LOCAL NoMetaUpdate cmp     esi, 1 
@@ -11665,29 +11684,41 @@
               889e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               889e      4 INSTR BELONGTO 8890 
               88a2      1 INSTR BELONGTO 8890 
+              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      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      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 
               88bb     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               88bb      4 INSTR BELONGTO 8890 
               88bf     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               88bf      5 INSTR BELONGTO 8890 
+              88bf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_log 
               88c8      3 INSTR BELONGTO 8890 
+              88c8      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rdx 
               88cb      5 INSTR BELONGTO 8890 
+              88cb      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     [rsp+18h+var_10], rdx 
               88cb      5 PTRIMMEDESP STACK 8 displ mov     [rsp+18h+var_10], rdx
               88d0     -1 INSTR LOCAL NoMetaUpdate call    sub_8830 
               88d0      5 INSTR BELONGTO 8890 
+              88d0      5 INSTR DEADREGS  EFLAGS RAX ZZ call    sub_8830 
               88d5      5 INSTR BELONGTO 8890 
+              88d5      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdx, [rsp+18h+var_10] 
               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     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 
               88f0      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
               88f0      0 FUNC MMSAFENESS SAFE
               88f0    122 FUNC GLOBAL sub_88F0 FUNC_UNSAFE NOFP RET               8969 
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 e53b06046c883e4dac1e30925e08246916edc4ae..ec668cd1b34f99026df9eaa44444feedd1fd87fb 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 @@
-40216a9a1865338542126b68e33d28847ec86901
\ No newline at end of file
+0f30f13e717e5d0b67db9a167536a0e2b1e7d815
\ 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 7a1c52d4f925840c32510174d07ea17c6075edfe..368b54cda864e6de72f943807807ae43414569ae 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 @@
-884391846456a42b56e0c276638bbd85c1a11bd4
\ No newline at end of file
+96718cf4f5d540aea929aa860baa2279cc60bd01
\ 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 a9bb9109a5feef5b212e1da6e32d4a0cc1c1b19e..911dbb719b1ea84df9911606b3c3ebfc22c37ddb 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 @@
-829a93b07010d87f7f85a62c199a8260d668b739
\ No newline at end of file
+fbc006187569d1012c5f638fd63f47fa782379bd
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id
index 0eadb94014ede8af0c5f76bdc8365a62ad735ec7..4e6a6037450c937ca1479980b34091876023ccf6 100644
--- a/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-956230162437e12e5bc805d586620748e25b9bb8
\ No newline at end of file
+b1bc989488ad9fe7bf38336e5588c9a1d25de49c
\ 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 7ad8232d08eed4fb9e57318ae143d31af5dc5676..1149e16ed7746152752de95c7148ffeaa8981fc2 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 @@
-71348d28cbad3cc6a7c5e4a4f502f2aef0d2ea07
\ No newline at end of file
+3cf0ebde5b0360caaa721327e7d3bb78c0a87275
\ 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 416b703a685da5d1c106922ce0c03436818c54ec..28dece040d174db3e7e3ccd07cde4580d4855621 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 @@
-12224a7df970cfa7e4550bc27bee690fb8bc27fb
\ No newline at end of file
+8ed50bae7303c79d94f31aa10ca4b777e670b15d
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
index 492ae9544b2de60fd1d0113df51251b50d8743ff..0bffc4cb88da8a21dcb7647c80e4c26c0b6b75ec 100644
--- a/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-9d1acf8d25ff0689b7a3211816c1f673b84854c4
\ No newline at end of file
+078579aa4fa967aa930b58ee149416271636ec78
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id
index c81df73f3db754996160fcd217509d41bd295098..360f6501b6517cbb6959ded3f7132f0dfa4e5684 100644
--- a/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-2efb0ff9a9b3cb592176ae3a969a388e396cc512
\ No newline at end of file
+e087b1c61ebc9e3fe4a4341f89031337da9d9eae
\ 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 40ed2cce1e002463321e3bcbb205610177b5c3f7..9f6b3c6307ea7bb0a95005bc4d0c78809f9261a2 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 @@
-a83ce7d7e40d5bf011274918b68a2219b5a3679f
\ No newline at end of file
+e9a36095239293b09d649753c0cf306d175b560f
\ 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 d770cc18dbfff5c8f459e94e19837b267c65b1e9..0e3460674400f9583ebc8f3a5df9b85c8483c51e 100644
--- a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
@@ -2833,10 +2833,12 @@
             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 MMSAFENESS UNSAFE
             4026e0      4 INSTR BELONGTO 4026e0 
+            4026e0      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rsi+38h] 
             4026e0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             4026e0      9 FUNC GLOBAL sub_4026E0 FUNC_UNSAFE NOFP RET             4026e8 
             4026e4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_404D50 
             4026e4      5 INSTR BELONGTO 4026e0 
+            4026e4      5 INSTR DEADREGS  EFLAGS RSI ZZ jmp     loc_404D50 
             4026f0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 1 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
             4026f0      0 FUNC MMSAFENESS SAFE
             4026f0      4 INSTR BELONGTO 4026f0 
@@ -7174,45 +7176,67 @@
             404d42      5 INSTR BELONGTO 404d30 
             404d42      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
             404d50      1 INSTR BELONGTO 4026e0 
+            404d50      1 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ push    rbx 
             404d51      3 INSTR BELONGTO 4026e0 
+            404d51      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     rbx, rdi 
             404d54     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             404d54      5 INSTR BELONGTO 4026e0 
+            404d54      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, 1 
             404d59      4 INSTR BELONGTO 4026e0 
+            404d59      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ sub     rsp, 20h 
             404d5d      7 INSTR BELONGTO 4026e0 
+            404d5d      7 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rdi, cs:qword_608860 
             404d64      5 INSTR BELONGTO 4026e0 
+            404d64      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ lea     rax, [rsp+28h+var_9] 
             404d64      5 PTRIMMEDESP STACK 31 displ lea     rax, [rsp+28h+var_9]
             404d69      3 INSTR BELONGTO 4026e0 
+            404d69      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rsp 
             404d69      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             404d6c      8 INSTR BELONGTO 4026e0 
+            404d6c      8 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_28], offset aState; "state" 
             404d6c      8 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], offset aState; "state"
             404d74      5 INSTR BELONGTO 4026e0 
+            404d74      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_20], rax 
             404d74      5 PTRIMMEDESP STACK 8 displ mov     [rsp+28h+var_20], rax
             404d79     -1 INSTR LOCAL NoMetaUpdate call    _XtGetValues 
             404d79      5 INSTR BELONGTO 4026e0 
+            404d79      5 INSTR DEADREGS  EFLAGS ZZ call    _XtGetValues 
             404d7e     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+28h+var_9], 0 
             404d7e      5 INSTR BELONGTO 4026e0 
             404d7e      5 PTRIMMEDESP STACK 31 displ cmp     [rsp+28h+var_9], 0
             404d83     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_404D98 
             404d83      2 INSTR BELONGTO 4026e0 
             404d85      7 INSTR BELONGTO 4026e0 
+            404d85      7 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     cs:byte_6088C0, 0 
             404d8c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             404d8c      4 INSTR BELONGTO 4026e0 
             404d90      1 INSTR BELONGTO 4026e0 
+            404d90      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             404d91      1 INSTR BELONGTO 4026e0 
+            404d91      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             404d98      7 INSTR BELONGTO 4026e0 
+            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      6 INSTR BELONGTO 4026e0 
+            404da2      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 R9 ZZ mov     r9d, offset sub_404BB0 
             404da8      6 INSTR BELONGTO 4026e0 
+            404da8      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 ZZ mov     r8d, offset sub_404BC0 
             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 
             404db3      5 INSTR BELONGTO 4026e0 
+            404db3      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             404db8     -1 INSTR LOCAL NoMetaUpdate call    _XtOwnSelection 
             404db8      5 INSTR BELONGTO 4026e0 
+            404db8      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _XtOwnSelection 
             404dbd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             404dbd      4 INSTR BELONGTO 4026e0 
             404dc1      0 DEALLOC STACK esp - 0 pop     rbx
             404dc1      1 INSTR BELONGTO 4026e0 
+            404dc1      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             404dc2      1 INSTR BELONGTO 4026e0 
+            404dc2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             404dd0      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
             404dd0      0 FUNC MMSAFENESS SPECSAFE
             404dd0    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET             404e58 
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 996b2f5021f7d3e620817a718c3e7fbb4c71eae1..7f8132dca39a8dc19dad0a29a5b02bb3f64a6097 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 @@
-5595333f8b31073007d50a4489cc7668c7d7ea30
\ No newline at end of file
+50d136049a8a73373a6bbf251f4eb313fc781ef6
\ No newline at end of file
diff --git a/tests/quick/save-bzip2.psexe.infoannot b/tests/quick/save-bzip2.psexe.infoannot
index f3b6ae103b6be8a559f40f4e48f42c953d2fb0a6..a1a8f0d9f6a9a9c3939aafffd62e42265f01a9f4 100644
--- a/tests/quick/save-bzip2.psexe.infoannot
+++ b/tests/quick/save-bzip2.psexe.infoannot
@@ -87,7 +87,7 @@
             401340      6 FUNC RETURNTYPE RAX 0
             401340      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
             401350      6 FUNC RETURNTYPE RAX 0
-            401350      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+            401350      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
             401360      6 FUNC RETURNTYPE RAX 0
             401360      6 FUNC PROBLEM .strerror JUMPUNRESOLVED 
             401370      6 FUNC RETURNTYPE RAX 0
diff --git a/tests/quick/save-malloc.psexe.infoannot b/tests/quick/save-malloc.psexe.infoannot
index 546d2c84f05aade2cbdf0e704d568aa9a1124110..fa644d5f6eefa7d1c2b455ec74a204200287801d 100644
--- a/tests/quick/save-malloc.psexe.infoannot
+++ b/tests/quick/save-malloc.psexe.infoannot
@@ -14,9 +14,9 @@
            80484e0      6 FUNC RETURNTYPE EAX 0
            80484e0      6 FUNC PROBLEM .__libc_start_main JUMPUNRESOLVED 
            80484f0      6 FUNC RETURNTYPE EAX 0
-           80484f0      6 FUNC PROBLEM .__printf_chk CHUNKS JUMPUNRESOLVED 
+           80484f0      6 FUNC PROBLEM .__printf_chk JUMPUNRESOLVED 
            8048500      6 FUNC RETURNTYPE EAX 0
-           8048500      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
+           8048500      6 FUNC PROBLEM .__fprintf_chk JUMPUNRESOLVED 
            8048510      6 FUNC RETURNTYPE EAX 0
            8048510      6 FUNC PROBLEM .strtol JUMPUNRESOLVED 
            8048520      6 FUNC RETURNTYPE EAX 0